diff options
author | Anthony Liguori | 2013-01-08 17:36:20 +0100 |
---|---|---|
committer | Anthony Liguori | 2013-01-08 17:36:20 +0100 |
commit | 560c30b1db1d40fe45c5104185367c4de43399d3 (patch) | |
tree | d3fff38fd167ad08c8d45136c4095263f5d6d1da /hw/hid.h | |
parent | Merge remote-tracking branch 'stefanha/net' into staging (diff) | |
parent | uhci: stop using portio lists (diff) | |
download | qemu-560c30b1db1d40fe45c5104185367c4de43399d3.tar.gz qemu-560c30b1db1d40fe45c5104185367c4de43399d3.tar.xz qemu-560c30b1db1d40fe45c5104185367c4de43399d3.zip |
Merge remote-tracking branch 'kraxel/usb.75' into staging
* kraxel/usb.75: (32 commits)
uhci: stop using portio lists
usbredir: Add support for buffered bulk input (v2)
exynos4210: Add EHCI support
usb/ehci: Add SysBus EHCI device for Exynos4210
usb/ehci: Move capsbase and opregbase into SysBus EHCI class
usb/ehci: Clean up SysBus and PCI EHCI split
xhci: call set-address with dummy usbpacket
usb-redir: Add debugging to bufpq save / restore
usbredir: Add usbredir_init_endpoints() helper
usbredir: Verify we have 32 bits bulk length cap when redirecting to xhci
usbredir: Add ep_stopped USBDevice method
usbredir: Add USBEP2I and I2USBEP helper macros
usbredir: Add an usbredir_stop_ep helper function
usb: Add an usb_device_ep_stopped USBDevice method
usb: Fix usb_ep_find_packet_by_id
hid: Change idle handling to use a timer
uhci: Maximize how many frames we catch up when behind
uhci: Limit amount of frames processed in one go
uhci: Add a QH_VALID define
uhci: Fix pending interrupts getting lost on migration
...
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/hid.h')
-rw-r--r-- | hw/hid.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -43,7 +43,8 @@ struct HIDState { int kind; int32_t protocol; uint8_t idle; - int64_t next_idle_clock; + bool idle_pending; + QEMUTimer *idle_timer; HIDEventFunc event; }; @@ -52,7 +53,7 @@ void hid_reset(HIDState *hs); void hid_free(HIDState *hs); bool hid_has_events(HIDState *hs); -void hid_set_next_idle(HIDState *hs, int64_t curtime); +void hid_set_next_idle(HIDState *hs); void hid_pointer_activate(HIDState *hs); int hid_pointer_poll(HIDState *hs, uint8_t *buf, int len); int hid_keyboard_poll(HIDState *hs, uint8_t *buf, int len); |