mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb-uhci: Add support for being a companion controller

Browse Source 
To use as a companion controller set the masterbus property.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2011-06-24 17:44:53 +02:00 committed by Gerd Hoffmann
parent a0a3167a91
commit 35e4977f57
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/usb-uhci.c
View File

@ -132,7 +132,7 @@ typedef struct UHCIPort {
struct UHCIState { struct UHCIState {
PCIDevice dev; PCIDevice dev;
USBBus bus; USBBus bus; /* Note unused when we're a companion controller */
uint16_t cmd; /* cmd register */ uint16_t cmd; /* cmd register */
uint16_t status; uint16_t status;
uint16_t intr; /* interrupt enable register */ uint16_t intr; /* interrupt enable register */
@ -150,6 +150,10 @@ struct UHCIState {
/* Active packets */ /* Active packets */
QTAILQ_HEAD(,UHCIAsync) async_pending; QTAILQ_HEAD(,UHCIAsync) async_pending;
uint8_t num_ports_vmstate; uint8_t num_ports_vmstate;
/* Properties */
char *masterbus;
uint32_t firstport;
}; };
typedef struct UHCI_TD { typedef struct UHCI_TD {
@ -1126,10 +1130,22 @@ static int usb_uhci_common_initfn(PCIDevice *dev)
pci_conf[PCI_INTERRUPT_PIN] = 4; // interrupt pin 3 pci_conf[PCI_INTERRUPT_PIN] = 4; // interrupt pin 3
pci_conf[USB_SBRN] = USB_RELEASE_1; // release number pci_conf[USB_SBRN] = USB_RELEASE_1; // release number
usb_bus_new(&s->bus, &uhci_bus_ops, &s->dev.qdev); if (s->masterbus) {
for(i = 0; i < NB_PORTS; i++) { USBPort *ports[NB_PORTS];
usb_register_port(&s->bus, &s->ports[i].port, s, i, &uhci_port_ops, for(i = 0; i < NB_PORTS; i++) {
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); ports[i] = &s->ports[i].port;
}
if (usb_register_companion(s->masterbus, ports, NB_PORTS,
s->firstport, s, &uhci_port_ops,
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL) != 0) {
return -1;
}
} else {
usb_bus_new(&s->bus, &uhci_bus_ops, &s->dev.qdev);
for (i = 0; i < NB_PORTS; i++) {
usb_register_port(&s->bus, &s->ports[i].port, s, i, &uhci_port_ops,
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
}
} }
s->frame_timer = qemu_new_timer_ns(vm_clock, uhci_frame_timer, s); s->frame_timer = qemu_new_timer_ns(vm_clock, uhci_frame_timer, s);
s->num_ports_vmstate = NB_PORTS; s->num_ports_vmstate = NB_PORTS;
@ -1170,6 +1186,11 @@ static PCIDeviceInfo uhci_info[] = {
.device_id = PCI_DEVICE_ID_INTEL_82371SB_2, .device_id = PCI_DEVICE_ID_INTEL_82371SB_2,
.revision = 0x01, .revision = 0x01,
.class_id = PCI_CLASS_SERIAL_USB, .class_id = PCI_CLASS_SERIAL_USB,
.qdev.props = (Property[]) {
DEFINE_PROP_STRING("masterbus", UHCIState, masterbus),
DEFINE_PROP_UINT32("firstport", UHCIState, firstport, 0),
DEFINE_PROP_END_OF_LIST(),
},
},{ },{
.qdev.name = "piix4-usb-uhci", .qdev.name = "piix4-usb-uhci",
.qdev.size = sizeof(UHCIState), .qdev.size = sizeof(UHCIState),
@ -1179,6 +1200,11 @@ static PCIDeviceInfo uhci_info[] = {
.device_id = PCI_DEVICE_ID_INTEL_82371AB_2, .device_id = PCI_DEVICE_ID_INTEL_82371AB_2,
.revision = 0x01, .revision = 0x01,
.class_id = PCI_CLASS_SERIAL_USB, .class_id = PCI_CLASS_SERIAL_USB,
.qdev.props = (Property[]) {
DEFINE_PROP_STRING("masterbus", UHCIState, masterbus),
DEFINE_PROP_UINT32("firstport", UHCIState, firstport, 0),
DEFINE_PROP_END_OF_LIST(),
},
},{ },{
.qdev.name = "vt82c686b-usb-uhci", .qdev.name = "vt82c686b-usb-uhci",
.qdev.size = sizeof(UHCIState), .qdev.size = sizeof(UHCIState),
@ -1188,6 +1214,11 @@ static PCIDeviceInfo uhci_info[] = {
.device_id = PCI_DEVICE_ID_VIA_UHCI, .device_id = PCI_DEVICE_ID_VIA_UHCI,
.revision = 0x01, .revision = 0x01,
.class_id = PCI_CLASS_SERIAL_USB, .class_id = PCI_CLASS_SERIAL_USB,
.qdev.props = (Property[]) {
DEFINE_PROP_STRING("masterbus", UHCIState, masterbus),
DEFINE_PROP_UINT32("firstport", UHCIState, firstport, 0),
DEFINE_PROP_END_OF_LIST(),
},
},{ },{
/* end of list */ /* end of list */
} }