aboutsummaryrefslogtreecommitdiffstats
path: root/hw/usb-ehci.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2011-06-14 17:15:34 +0300
committerMichael S. Tsirkin <mst@redhat.com>2011-06-15 18:32:08 +0300
commit9047c0b40654ce3578c148f6754f878218569252 (patch)
tree5f540357505e0c8d55c935db0da817e8a16b3e3b /hw/usb-ehci.c
parentcdfdec7f10fc1576c1b59db0584c2ae4ec6ec06f (diff)
usb-ehci: move device/vendor/class id to qdev
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/usb-ehci.c')
-rw-r--r--hw/usb-ehci.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index f63519ecf..4d6989a70 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -1945,6 +1945,10 @@ static PCIDeviceInfo ehci_info = {
.qdev.name = "usb-ehci",
.qdev.size = sizeof(EHCIState),
.init = usb_ehci_initfn,
+ .vendor_id = PCI_VENDOR_ID_INTEL,
+ .device_id = PCI_DEVICE_ID_INTEL_82801D,
+ .revision = 0x10,
+ .class_id = PCI_CLASS_SERIAL_USB,
};
static int usb_ehci_initfn(PCIDevice *dev)
@@ -1953,12 +1957,7 @@ static int usb_ehci_initfn(PCIDevice *dev)
uint8_t *pci_conf = s->dev.config;
int i;
- pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
- pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82801D);
- pci_set_byte(&pci_conf[PCI_REVISION_ID], 0x10);
pci_set_byte(&pci_conf[PCI_CLASS_PROG], 0x20);
- pci_config_set_class(pci_conf, PCI_CLASS_SERIAL_USB);
- pci_set_byte(&pci_conf[PCI_HEADER_TYPE], PCI_HEADER_TYPE_NORMAL);
/* capabilities pointer */
pci_set_byte(&pci_conf[PCI_CAPABILITY_LIST], 0x00);