[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] usb-hid: remove usb_hid_datain_cb
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 6/6] usb-hid: remove usb_hid_datain_cb |
Date: |
Thu, 11 Aug 2011 09:03:45 +0200 |
No users left, all migrated over to hw/hid.[ch].
Yea! Zap it!
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-hid.c | 14 --------------
hw/usb.h | 3 ---
2 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index 6a75147..ba79466 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 84d04df..d784448 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);
--
1.7.1
- [Qemu-devel] [PULL] usb patch queue, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 4/6] usb-hid: use hid vmstate macro, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 3/6] hid: introduce hid vmstate macros, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 1/6] usb/hid: add hid_pointer_activate, use it, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 5/6] milkymist-softusb: use hid code directly, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 2/6] hid: register kbd hander in init(), Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 6/6] usb-hid: remove usb_hid_datain_cb,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL] usb patch queue, Michael Tokarev, 2011/08/12
- Re: [Qemu-devel] [PULL] usb patch queue, Anthony Liguori, 2011/08/12