Revision 3028376e hw/usb-ehci.c

b/hw/usb-ehci.c
2244 2244
    .register_companion = ehci_register_companion,
2245 2245
};
2246 2246

  
2247
static PCIDeviceInfo ehci_info = {
2248
    .qdev.name    = "usb-ehci",
2249
    .qdev.size    = sizeof(EHCIState),
2250
    .init         = usb_ehci_initfn,
2251
    .vendor_id    = PCI_VENDOR_ID_INTEL,
2252
    .device_id    = PCI_DEVICE_ID_INTEL_82801D,
2253
    .revision     = 0x10,
2254
    .class_id     = PCI_CLASS_SERIAL_USB,
2255
    .qdev.props   = (Property[]) {
2256
        DEFINE_PROP_UINT32("freq",      EHCIState, freq, FRAME_TIMER_FREQ),
2257
        DEFINE_PROP_UINT32("maxframes", EHCIState, maxframes, 128),
2258
        DEFINE_PROP_END_OF_LIST(),
2259
    },
2247
static Property ehci_properties[] = {
2248
    DEFINE_PROP_UINT32("freq",      EHCIState, freq, FRAME_TIMER_FREQ),
2249
    DEFINE_PROP_UINT32("maxframes", EHCIState, maxframes, 128),
2250
    DEFINE_PROP_END_OF_LIST(),
2251
};
2252

  
2253
static PCIDeviceInfo ehci_info[] = {
2254
    {
2255
        .qdev.name    = "usb-ehci",
2256
        .qdev.size    = sizeof(EHCIState),
2257
        .init         = usb_ehci_initfn,
2258
        .vendor_id    = PCI_VENDOR_ID_INTEL,
2259
        .device_id    = PCI_DEVICE_ID_INTEL_82801D, /* ich4 */
2260
        .revision     = 0x10,
2261
        .class_id     = PCI_CLASS_SERIAL_USB,
2262
        .qdev.props   = ehci_properties,
2263
    },{
2264
        .qdev.name    = "ich9-usb-ehci1",
2265
        .qdev.size    = sizeof(EHCIState),
2266
        .init         = usb_ehci_initfn,
2267
        .vendor_id    = PCI_VENDOR_ID_INTEL,
2268
        .device_id    = PCI_DEVICE_ID_INTEL_82801I_EHCI1,
2269
        .revision     = 0x03,
2270
        .class_id     = PCI_CLASS_SERIAL_USB,
2271
        .qdev.props   = ehci_properties,
2272
    },{
2273
        /* end of list */
2274
    }
2260 2275
};
2261 2276

  
2262 2277
static int usb_ehci_initfn(PCIDevice *dev)
......
2335 2350

  
2336 2351
static void ehci_register(void)
2337 2352
{
2338
    pci_qdev_register(&ehci_info);
2353
    pci_qdev_register_many(ehci_info);
2339 2354
}
2340 2355
device_init(ehci_register);
2341 2356

  

Also available in: Unified diff