diff options
author | Anthony Liguori | 2012-03-13 19:55:02 +0100 |
---|---|---|
committer | Anthony Liguori | 2012-03-13 19:55:02 +0100 |
commit | 684e1e047950938be259e7d02033f44c427e6ba5 (patch) | |
tree | 67ff0b0f138e9d70bf3f44d1ef47c15dc716fc41 /hw/usb.h | |
parent | qom: Add QOM support to user emulators (diff) | |
parent | Endian fix an assertion in usb-msd (diff) | |
download | qemu-684e1e047950938be259e7d02033f44c427e6ba5.tar.gz qemu-684e1e047950938be259e7d02033f44c427e6ba5.tar.xz qemu-684e1e047950938be259e7d02033f44c427e6ba5.zip |
Merge remote-tracking branch 'kraxel/usb.44' into staging
* kraxel/usb.44:
Endian fix an assertion in usb-msd
uhci: alloc can't fail, drop check.
uhci: new uhci_handle_td return code for tds still in flight
uhci: renumber uhci_handle_td return codes
uhci: use enum for uhci_handle_td return codes
uhci: tracing support
uhci: cancel on schedule stop.
uhci: fix uhci_async_cancel_all
uhci: pass addr to uhci_async_alloc
usb: improve packet state sanity checks
usb-ohci: DMA writeback bug fixes
usb-ehci: drop unused isoch_pause variable
usb: zap hw/ush-{ohic,uhci}.h + init wrappers
usb: the big rename
Diffstat (limited to 'hw/usb.h')
-rw-r--r-- | hw/usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -336,6 +336,7 @@ struct USBPacket { void usb_packet_init(USBPacket *p); void usb_packet_set_state(USBPacket *p, USBPacketState state); +void usb_packet_check_state(USBPacket *p, USBPacketState expected); void usb_packet_setup(USBPacket *p, int pid, USBEndpoint *ep); void usb_packet_addbuf(USBPacket *p, void *ptr, size_t len); int usb_packet_map(USBPacket *p, QEMUSGList *sgl); |