usb-hid: add hid_has_events()
Add hid_has_events function, use it to figure whenever there are pending events instead of checking and updating USBHIDState->changed. Setting ->changed to 1 on init is removed, that should have absolutely no effect as the initial state of ->idle is 0 so we report hid state anyway until the guest configures some idle time. Also should clear ->idle on reset. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
8bde680541
commit
38931fa8cf
16
hw/usb-hid.c
16
hw/usb-hid.c
|
@ -88,7 +88,6 @@ typedef struct USBHIDState {
|
||||||
int32_t protocol;
|
int32_t protocol;
|
||||||
uint8_t idle;
|
uint8_t idle;
|
||||||
int64_t next_idle_clock;
|
int64_t next_idle_clock;
|
||||||
int changed;
|
|
||||||
void *datain_opaque;
|
void *datain_opaque;
|
||||||
void (*datain)(void *);
|
void (*datain)(void *);
|
||||||
} USBHIDState;
|
} USBHIDState;
|
||||||
|
@ -444,12 +443,15 @@ static const uint8_t usb_hid_usage_keys[0x100] = {
|
||||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static bool hid_has_events(HIDState *hs)
|
||||||
|
{
|
||||||
|
return hs->n > 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void usb_hid_changed(HIDState *hs)
|
static void usb_hid_changed(HIDState *hs)
|
||||||
{
|
{
|
||||||
USBHIDState *us = container_of(hs, USBHIDState, hid);
|
USBHIDState *us = container_of(hs, USBHIDState, hid);
|
||||||
|
|
||||||
us->changed = 1;
|
|
||||||
|
|
||||||
if (us->datain) {
|
if (us->datain) {
|
||||||
us->datain(us->datain_opaque);
|
us->datain(us->datain_opaque);
|
||||||
}
|
}
|
||||||
|
@ -742,6 +744,7 @@ static void usb_hid_handle_reset(USBDevice *dev)
|
||||||
|
|
||||||
hid_handle_reset(&us->hid);
|
hid_handle_reset(&us->hid);
|
||||||
us->protocol = 1;
|
us->protocol = 1;
|
||||||
|
us->idle = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void usb_hid_set_next_idle(USBHIDState *s, int64_t curtime)
|
static void usb_hid_set_next_idle(USBHIDState *s, int64_t curtime)
|
||||||
|
@ -798,7 +801,6 @@ static int usb_hid_handle_control(USBDevice *dev, USBPacket *p,
|
||||||
} else if (hs->kind == HID_KEYBOARD) {
|
} else if (hs->kind == HID_KEYBOARD) {
|
||||||
ret = hid_keyboard_poll(hs, data, length);
|
ret = hid_keyboard_poll(hs, data, length);
|
||||||
}
|
}
|
||||||
us->changed = hs->n > 0;
|
|
||||||
break;
|
break;
|
||||||
case SET_REPORT:
|
case SET_REPORT:
|
||||||
if (hs->kind == HID_KEYBOARD) {
|
if (hs->kind == HID_KEYBOARD) {
|
||||||
|
@ -849,7 +851,7 @@ static int usb_hid_handle_data(USBDevice *dev, USBPacket *p)
|
||||||
case USB_TOKEN_IN:
|
case USB_TOKEN_IN:
|
||||||
if (p->devep == 1) {
|
if (p->devep == 1) {
|
||||||
int64_t curtime = qemu_get_clock_ns(vm_clock);
|
int64_t curtime = qemu_get_clock_ns(vm_clock);
|
||||||
if (!us->changed &&
|
if (!hid_has_events(hs) &&
|
||||||
(!us->idle || us->next_idle_clock - curtime > 0)) {
|
(!us->idle || us->next_idle_clock - curtime > 0)) {
|
||||||
return USB_RET_NAK;
|
return USB_RET_NAK;
|
||||||
}
|
}
|
||||||
|
@ -860,7 +862,6 @@ static int usb_hid_handle_data(USBDevice *dev, USBPacket *p)
|
||||||
ret = hid_keyboard_poll(hs, buf, p->iov.size);
|
ret = hid_keyboard_poll(hs, buf, p->iov.size);
|
||||||
}
|
}
|
||||||
usb_packet_copy(p, buf, ret);
|
usb_packet_copy(p, buf, ret);
|
||||||
us->changed = hs->n > 0;
|
|
||||||
} else {
|
} else {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
@ -914,9 +915,6 @@ static int usb_hid_initfn(USBDevice *dev, int kind)
|
||||||
|
|
||||||
usb_desc_init(dev);
|
usb_desc_init(dev);
|
||||||
hid_init(&us->hid, kind, usb_hid_changed);
|
hid_init(&us->hid, kind, usb_hid_changed);
|
||||||
|
|
||||||
/* Force poll routine to be run and grab input the first time. */
|
|
||||||
us->changed = 1;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue