ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb-ohci: switch to usb_find_device() 

Switch over OHCI to use the new usb_find_device()
function for device lookup.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-01-10 17:56:17 +01:00
parent 828143c621
commit 993048bb6b
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
hw/usb-ohci.c
View File

@ -408,6 +408,23 @@ static void ohci_child_detach(USBPort *port1, USBDevice *child)
ohci_async_cancel_device(s, child); ohci_async_cancel_device(s, child);
} }
static USBDevice *ohci_find_device(OHCIState *ohci, uint8_t addr)
{
USBDevice *dev;
int i;
for (i = 0; i < ohci->num_ports; i++) {
if ((ohci->rhport[i].ctrl & OHCI_PORT_PES) == 0) {
continue;
}
dev = usb_find_device(&ohci->rhport[i].port, addr);
if (dev != NULL) {
return dev;
}
}
return NULL;
}
/* Reset the controller */ /* Reset the controller */
static void ohci_reset(void *opaque) static void ohci_reset(void *opaque)
{ {
@ -779,20 +796,12 @@ static int ohci_service_iso_td(OHCIState *ohci, struct ohci_ed *ed,
if (completion) { if (completion) {
ret = ohci->usb_packet.result; ret = ohci->usb_packet.result;
} else { } else {
ret = USB_RET_NODEV; usb_packet_setup(&ohci->usb_packet, pid,
for (i = 0; i < ohci->num_ports; i++) { OHCI_BM(ed->flags, ED_FA),
dev = ohci->rhport[i].port.dev; OHCI_BM(ed->flags, ED_EN));
if ((ohci->rhport[i].ctrl & OHCI_PORT_PES) == 0) usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, len);
continue; dev = ohci_find_device(ohci, ohci->usb_packet.devaddr);
usb_packet_setup(&ohci->usb_packet, pid, ret = usb_handle_packet(dev, &ohci->usb_packet);
OHCI_BM(ed->flags, ED_FA),
OHCI_BM(ed->flags, ED_EN));
usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, len);
ret = usb_handle_packet(dev, &ohci->usb_packet);
if (ret != USB_RET_NODEV)
break;
}
if (ret == USB_RET_ASYNC) { if (ret == USB_RET_ASYNC) {
return 1; return 1;
} }
@ -972,31 +981,23 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
ohci->async_td = 0; ohci->async_td = 0;
ohci->async_complete = 0; ohci->async_complete = 0;
} else { } else {
ret = USB_RET_NODEV; if (ohci->async_td) {
for (i = 0; i < ohci->num_ports; i++) { /* ??? The hardware should allow one active packet per
dev = ohci->rhport[i].port.dev; endpoint. We only allow one active packet per controller.
if ((ohci->rhport[i].ctrl & OHCI_PORT_PES) == 0) This should be sufficient as long as devices respond in a
continue; timely manner.
*/
if (ohci->async_td) {
/* ??? The hardware should allow one active packet per
endpoint. We only allow one active packet per controller.
This should be sufficient as long as devices respond in a
timely manner.
*/
#ifdef DEBUG_PACKET #ifdef DEBUG_PACKET
DPRINTF("Too many pending packets\n"); DPRINTF("Too many pending packets\n");
#endif #endif
return 1; return 1;
}
usb_packet_setup(&ohci->usb_packet, pid,
OHCI_BM(ed->flags, ED_FA),
OHCI_BM(ed->flags, ED_EN));
usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, pktlen);
ret = usb_handle_packet(dev, &ohci->usb_packet);
if (ret != USB_RET_NODEV)
break;
} }
usb_packet_setup(&ohci->usb_packet, pid,
OHCI_BM(ed->flags, ED_FA),
OHCI_BM(ed->flags, ED_EN));
usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, pktlen);
dev = ohci_find_device(ohci, ohci->usb_packet.devaddr);
ret = usb_handle_packet(dev, &ohci->usb_packet);
#ifdef DEBUG_PACKET #ifdef DEBUG_PACKET
DPRINTF("ret=%d\n", ret); DPRINTF("ret=%d\n", ret);
#endif #endif