diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb-bus.c | 3 | ||||
| -rw-r--r-- | hw/usb-hub.c | 3 | ||||
| -rw-r--r-- | hw/usb-musb.c | 3 | ||||
| -rw-r--r-- | hw/usb-ohci.c | 3 | ||||
| -rw-r--r-- | hw/usb-uhci.c | 3 | ||||
| -rw-r--r-- | hw/usb.h | 9 |
6 files changed, 18 insertions, 6 deletions
diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 9dc8793148..e94b88ded5 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -113,7 +113,7 @@ USBDevice *usb_create_simple(USBBus *bus, const char *name) } void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, - USBDevice *pdev, USBPortOps *ops) + USBDevice *pdev, USBPortOps *ops, int speedmask) { port->opaque = opaque; port->index = index; @@ -121,6 +121,7 @@ void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, port->opaque = opaque; port->index = index; port->ops = ops; + port->speedmask = speedmask; QTAILQ_INSERT_TAIL(&bus->free, port, next); bus->nfree++; } diff --git a/hw/usb-hub.c b/hw/usb-hub.c index 8a80151da2..ba712d6252 100644 --- a/hw/usb-hub.c +++ b/hw/usb-hub.c @@ -526,7 +526,8 @@ 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_port_ops); + &port->port, s, i, &s->dev, &usb_hub_port_ops, + USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); port->wPortStatus = PORT_STAT_POWER; port->wPortChange = 0; } diff --git a/hw/usb-musb.c b/hw/usb-musb.c index 233a2657c0..87eb9ca0ce 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -349,7 +349,8 @@ struct MUSBState { } usb_bus_new(&s->bus, NULL /* FIXME */); - usb_register_port(&s->bus, &s->port, s, 0, NULL, &musb_port_ops); + usb_register_port(&s->bus, &s->port, s, 0, NULL, &musb_port_ops, + USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); return s; } diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index c859540c19..0d4271692d 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1699,7 +1699,8 @@ 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_port_ops); + usb_register_port(&ohci->bus, &ohci->rhport[i].port, ohci, i, NULL, &ohci_port_ops, + USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); } ohci->async_td = 0; diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 2d2a9e791d..253561f528 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -1129,7 +1129,8 @@ 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_port_ops); + usb_register_port(&s->bus, &s->ports[i].port, s, i, NULL, &uhci_port_ops, + USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); } s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); s->expire_time = qemu_get_clock(vm_clock) + @@ -44,6 +44,12 @@ #define USB_SPEED_LOW 0 #define USB_SPEED_FULL 1 #define USB_SPEED_HIGH 2 +#define USB_SPEED_SUPER 3 + +#define USB_SPEED_MASK_LOW (1 << USB_SPEED_LOW) +#define USB_SPEED_MASK_FULL (1 << USB_SPEED_FULL) +#define USB_SPEED_MASK_HIGH (1 << USB_SPEED_HIGH) +#define USB_SPEED_MASK_SUPER (1 << USB_SPEED_SUPER) #define USB_STATE_NOTATTACHED 0 #define USB_STATE_ATTACHED 1 @@ -226,6 +232,7 @@ typedef struct USBPortOps { /* USB port on which a device can be connected */ struct USBPort { USBDevice *dev; + int speedmask; USBPortOps *ops; void *opaque; USBDevice *pdev; @@ -339,7 +346,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, USBPortOps *ops); + USBDevice *pdev, USBPortOps *ops, int speedmask); void usb_unregister_port(USBBus *bus, USBPort *port); int usb_device_attach(USBDevice *dev); int usb_device_detach(USBDevice *dev); |