From f3aaaa242e701e4516594bc9fb5845ef07783a6d Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 10 Aug 2011 10:53:50 +0200 Subject: [PATCH] usb-hid: remove usb_hid_datain_cb No users left, all migrated over to hw/hid.[ch]. Yea! Zap it! Signed-off-by: Gerd Hoffmann --- hw/usb-hid.c | 14 -------------- hw/usb.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/hw/usb-hid.c b/hw/usb-hid.c index 6a75147a84..ba79466401 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -45,8 +45,6 @@ typedef struct USBHIDState { USBDevice dev; HIDState hid; - void *datain_opaque; - void (*datain)(void *); } USBHIDState; enum { @@ -362,10 +360,6 @@ static void usb_hid_changed(HIDState *hs) { USBHIDState *us = container_of(hs, USBHIDState, hid); - if (us->datain) { - us->datain(us->datain_opaque); - } - usb_wakeup(&us->dev); } @@ -533,14 +527,6 @@ static int usb_keyboard_initfn(USBDevice *dev) return usb_hid_initfn(dev, HID_KEYBOARD); } -void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *)) -{ - USBHIDState *s = (USBHIDState *)dev; - - s->datain_opaque = opaque; - s->datain = datain; -} - static const VMStateDescription vmstate_usb_ptr = { .name = "usb-ptr", .version_id = 1, diff --git a/hw/usb.h b/hw/usb.h index 84d04df2e1..d784448290 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -316,9 +316,6 @@ USBDevice *usb_host_device_open(const char *devname); int usb_host_device_close(const char *devname); void usb_host_info(Monitor *mon); -/* usb-hid.c */ -void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *)); - /* usb-bt.c */ USBDevice *usb_bt_init(HCIInfo *hci);