Revision d47e59b8 hw/usb-ohci.c

b/hw/usb-ohci.c
367 367
        ohci_set_interrupt(s, OHCI_INTR_RHSC);
368 368
}
369 369

  
370
static void ohci_wakeup(USBDevice *dev)
370
static void ohci_wakeup(USBPort *port1)
371 371
{
372
    USBBus *bus = usb_bus_from_device(dev);
373
    OHCIState *s = container_of(bus, OHCIState, bus);
374
    int portnum = dev->port->index;
375
    OHCIPort *port = &s->rhport[portnum];
372
    OHCIState *s = port1->opaque;
373
    OHCIPort *port = &s->rhport[port1->index];
376 374
    uint32_t intr = 0;
377 375
    if (port->ctrl & OHCI_PORT_PSS) {
378
        DPRINTF("usb-ohci: port %d: wakeup\n", portnum);
376
        DPRINTF("usb-ohci: port %d: wakeup\n", port1->index);
379 377
        port->ctrl |= OHCI_PORT_PSSC;
380 378
        port->ctrl &= ~OHCI_PORT_PSS;
381 379
        intr = OHCI_INTR_RHSC;
......
602 600

  
603 601
static void ohci_process_lists(OHCIState *ohci, int completion);
604 602

  
605
static void ohci_async_complete_packet(USBDevice *dev, USBPacket *packet)
603
static void ohci_async_complete_packet(USBPort *port, USBPacket *packet)
606 604
{
607 605
    OHCIState *ohci = container_of(packet, OHCIState, usb_packet);
608 606
#ifdef DEBUG_PACKET

Also available in: Unified diff