diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2014-03-24 17:20:54 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2014-12-12 17:44:10 +0100 |
| commit | ea4b4999673d157b2ce63ec10f9a8616fb2fe1ff (patch) | |
| tree | 9016ba28a71728e319ad4d97efc414f1a53a914f /hw | |
| parent | ced8e2b10fcf0e8c25412d415fd4727498f4d217 (diff) | |
| download | qemu-ea4b4999673d157b2ce63ec10f9a8616fb2fe1ff.tar.gz | |
unifying: make Get_Report provide sane mouse reports
...and ignore Get_Report for HID++ queries. 0x20 and 0x21 already
return EPIPE on real hw, but even querying 0x10 and 0x11 does not make
sense as the device index is not known.
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/dev-unifying.c | 6 | ||||
| -rw-r--r-- | hw/usb/hid-logitech-dj.c | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/hw/usb/dev-unifying.c b/hw/usb/dev-unifying.c index 409f983934..9f6abf8c0d 100644 --- a/hw/usb/dev-unifying.c +++ b/hw/usb/dev-unifying.c @@ -379,11 +379,7 @@ static void usb_ltunify_handle_control_hid(USBDevice *dev, USBPacket *p, switch (request) { case HID_GET_REPORT: - if (hs->kind == HID_KEYBOARD) { - p->actual_length = hid_keyboard_poll(hs, data, length); - } else if (hs->kind == HID_MOUSE) { - p->actual_length = hid_pointer_poll(hs, data, length); - } + p->actual_length = usb_ltunify_poll_hid(hs, data, length); break; case HID_SET_REPORT: if (hs->kind == HID_KEYBOARD) { diff --git a/hw/usb/hid-logitech-dj.c b/hw/usb/hid-logitech-dj.c index 91277b00fe..5eea52fe81 100644 --- a/hw/usb/hid-logitech-dj.c +++ b/hw/usb/hid-logitech-dj.c @@ -457,16 +457,15 @@ fail: void usb_ltunify_handle_control_hidpp(USBDevice *dev, USBPacket *p, int request, int value, int index, int length, uint8_t *data) { - //USBLtunifyState *s = (USBLtunifyState *) dev; - switch (request) { case HID_GET_REPORT: - /* FIXME */ - break; + /* not implemented, please use the interrupt endpoint */ + goto fail; case HID_SET_REPORT: hidpp_set_report(dev, p, data, length); break; default: + fail: p->status = USB_RET_STALL; break; } |