diff options
| -rw-r--r-- | hw/usb-bus.c | 6 | ||||
| -rw-r--r-- | hw/usb-hub.c | 6 | ||||
| -rw-r--r-- | hw/usb-musb.c | 6 | ||||
| -rw-r--r-- | hw/usb-ohci.c | 6 | ||||
| -rw-r--r-- | hw/usb-uhci.c | 6 | ||||
| -rw-r--r-- | hw/usb.c | 2 | ||||
| -rw-r--r-- | hw/usb.h | 8 |
7 files changed, 30 insertions, 10 deletions
diff --git a/hw/usb-bus.c b/hw/usb-bus.c index af537c238f..9dc8793148 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -113,12 +113,14 @@ USBDevice *usb_create_simple(USBBus *bus, const char *name) } void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, - USBDevice *pdev, usb_attachfn attach) + USBDevice *pdev, USBPortOps *ops) { port->opaque = opaque; port->index = index; - port->attach = attach; port->pdev = pdev; + port->opaque = opaque; + port->index = index; + port->ops = ops; QTAILQ_INSERT_TAIL(&bus->free, port, next); bus->nfree++; } diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 3c7c3eee43..b3d72987f3 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -506,6 +506,10 @@ static void usb_hub_handle_destroy(USBDevice *dev) } } +static USBPortOps usb_hub_port_ops = { + .attach = usb_hub_attach, +}; + static int usb_hub_initfn(USBDevice *dev) { USBHubState *s = DO_UPCAST(USBHubState, dev, dev); @@ -516,7 +520,7 @@ static int usb_hub_initfn(USBDevice *dev) for (i = 0; i < NUM_PORTS; i++) { port = &s->ports[i]; usb_register_port(usb_bus_from_device(dev), - &port->port, s, i, &s->dev, usb_hub_attach); + &port->port, s, i, &s->dev, &usb_hub_port_ops); port->wPortStatus = PORT_STAT_POWER; port->wPortChange = 0; } diff --git a/hw/usb-musb.c b/hw/usb-musb.c index 9efe7a6344..592d3e67f4 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -261,6 +261,10 @@ static void musb_attach(USBPort *port, USBDevice *dev); +static USBPortOps musb_port_ops = { + .attach = musb_attach, +}; + typedef struct { uint16_t faddr[2]; uint8_t haddr[2]; @@ -343,7 +347,7 @@ struct MUSBState { } usb_bus_new(&s->bus, NULL /* FIXME */); - usb_register_port(&s->bus, &s->port, s, 0, NULL, musb_attach); + usb_register_port(&s->bus, &s->port, s, 0, NULL, &musb_port_ops); return s; } diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 240e8409af..7b13bdd0d3 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1669,6 +1669,10 @@ static CPUWriteMemoryFunc * const ohci_writefn[3]={ ohci_mem_write }; +static USBPortOps ohci_port_ops = { + .attach = ohci_attach, +}; + static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, int num_ports, uint32_t localmem_base) { @@ -1699,7 +1703,7 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, usb_bus_new(&ohci->bus, dev); ohci->num_ports = num_ports; for (i = 0; i < num_ports; i++) { - usb_register_port(&ohci->bus, &ohci->rhport[i].port, ohci, i, NULL, ohci_attach); + usb_register_port(&ohci->bus, &ohci->rhport[i].port, ohci, i, NULL, &ohci_port_ops); } ohci->async_td = 0; diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index b9b822fcb1..0f9ef1edc3 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -1101,6 +1101,10 @@ static void uhci_map(PCIDevice *pci_dev, int region_num, register_ioport_read(addr, 32, 1, uhci_ioport_readb, s); } +static USBPortOps uhci_port_ops = { + .attach = uhci_attach, +}; + static int usb_uhci_common_initfn(UHCIState *s) { uint8_t *pci_conf = s->dev.config; @@ -1115,7 +1119,7 @@ static int usb_uhci_common_initfn(UHCIState *s) usb_bus_new(&s->bus, &s->dev.qdev); for(i = 0; i < NB_PORTS; i++) { - usb_register_port(&s->bus, &s->ports[i].port, s, i, NULL, uhci_attach); + usb_register_port(&s->bus, &s->ports[i].port, s, i, NULL, &uhci_port_ops); } s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); s->expire_time = qemu_get_clock(vm_clock) + @@ -28,7 +28,7 @@ void usb_attach(USBPort *port, USBDevice *dev) { - port->attach(port, dev); + port->ops->attach(port, dev); } /**********************/ @@ -216,12 +216,14 @@ struct USBDeviceInfo { USBDevice *(*usbdevice_init)(const char *params); }; -typedef void (*usb_attachfn)(USBPort *port, USBDevice *dev); +typedef struct USBPortOps { + void (*attach)(USBPort *port, USBDevice *dev); +} USBPortOps; /* USB port on which a device can be connected */ struct USBPort { USBDevice *dev; - usb_attachfn attach; + USBPortOps *ops; void *opaque; USBDevice *pdev; int index; /* internal port index, may be used with the opaque */ @@ -333,7 +335,7 @@ USBDevice *usb_create(USBBus *bus, const char *name); USBDevice *usb_create_simple(USBBus *bus, const char *name); USBDevice *usbdevice_create(const char *cmdline); void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, - USBDevice *pdev, usb_attachfn attach); + USBDevice *pdev, USBPortOps *ops); void usb_unregister_port(USBBus *bus, USBPort *port); int usb_device_attach(USBDevice *dev); int usb_device_detach(USBDevice *dev); |