]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'kraxel/usb.38' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Feb 2012 23:25:25 +0000 (17:25 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Feb 2012 23:25:25 +0000 (17:25 -0600)
* kraxel/usb.38: (28 commits)
  xhci: handle USB_RET_NAK
  xhci: remote wakeup support
  xhci: kill port arg from xhci_setup_packet
  xhci: stop on errors
  xhci: add trb type name lookup support.
  xhci: signal low- and fullspeed support
  usb: add USBBusOps->wakeup_endpoint
  usb: pass USBEndpoint to usb_wakeup
  usb: maintain async packet list per endpoint
  usb: Set USBEndpoint in usb_packet_setup().
  usb: add USBEndpoint->{nr,pid}
  usb: USBPacket: add status, rename owner -> ep
  usb: fold usb_generic_handle_packet into usb_handle_packet
  usb: kill handle_packet callback
  usb-xhci: switch to usb_find_device()
  usb-musb: switch to usb_find_device()
  usb-ohci: switch to usb_find_device()
  usb-ehci: switch to usb_find_device()
  usb-uhci: switch to usb_find_device()
  usb: handle dev == NULL in usb_handle_packet()
  ...

17 files changed:
1  2 
hw/usb-audio.c
hw/usb-bt.c
hw/usb-bus.c
hw/usb-ccid.c
hw/usb-ehci.c
hw/usb-hid.c
hw/usb-hub.c
hw/usb-msd.c
hw/usb-net.c
hw/usb-ohci.c
hw/usb-serial.c
hw/usb-uhci.c
hw/usb-wacom.c
hw/usb-xhci.c
usb-bsd.c
usb-linux.c
usb-redir.c

diff --cc hw/usb-audio.c
Simple merge
diff --cc hw/usb-bt.c
Simple merge
diff --cc hw/usb-bus.c
Simple merge
diff --cc hw/usb-ccid.c
Simple merge
diff --cc hw/usb-ehci.c
Simple merge
diff --cc hw/usb-hid.c
Simple merge
diff --cc hw/usb-hub.c
Simple merge
diff --cc hw/usb-msd.c
Simple merge
diff --cc hw/usb-net.c
Simple merge
diff --cc hw/usb-ohci.c
Simple merge
diff --cc hw/usb-serial.c
Simple merge
diff --cc hw/usb-uhci.c
Simple merge
diff --cc hw/usb-wacom.c
Simple merge
diff --cc hw/usb-xhci.c
Simple merge
diff --cc usb-bsd.c
Simple merge
diff --cc usb-linux.c
Simple merge
diff --cc usb-redir.c
Simple merge