diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2011-06-21 11:52:28 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-07-05 15:09:02 +0200 |
| commit | d47e59b8b8adc96a2052f7e004cb12b6ff62edd9 (patch) | |
| tree | 301cdacdde8bff6220c9405499ea925a92ea7a26 /hw/usb-musb.c | |
| parent | ae60fea97c78e7f855794f2770517244d93def73 (diff) | |
usb: Make port wakeup and complete ops take a USBPort instead of a Device
This makes them consistent with the attach and detach ops, and in general
it makes sense to make portops take a port as argument. This also makes
adding support for a companion controller easier / cleaner.
[ kraxel: fix usb-musb.c build ]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb-musb.c')
| -rw-r--r-- | hw/usb-musb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/usb-musb.c b/hw/usb-musb.c index 84e601762c..580bdc815a 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -261,7 +261,7 @@ static void musb_attach(USBPort *port); static void musb_detach(USBPort *port); -static void musb_schedule_cb(USBDevice *dev, USBPacket *p); +static void musb_schedule_cb(USBPort *port, USBPacket *p); static void musb_device_destroy(USBBus *bus, USBDevice *dev); static USBPortOps musb_port_ops = { @@ -517,7 +517,7 @@ static void musb_cb_tick1(void *opaque) #define musb_cb_tick (dir ? musb_cb_tick1 : musb_cb_tick0) -static void musb_schedule_cb(USBDevice *dev, USBPacket *packey) +static void musb_schedule_cb(USBPort *port, USBPacket *packey) { MUSBPacket *p = container_of(packey, MUSBPacket, p); MUSBEndPoint *ep = p->ep; @@ -615,7 +615,7 @@ static void musb_packet(MUSBState *s, MUSBEndPoint *ep, } ep->status[dir] = ret; - musb_schedule_cb(s->port.dev, &ep->packey[dir].p); + musb_schedule_cb(&s->port, &ep->packey[dir].p); } static void musb_tx_packet_complete(USBPacket *packey, void *opaque) |