From 18f499ba7cac5d66f42255f6ddf384e01bead569 Mon Sep 17 00:00:00 2001

From: Gerd Hoffmann <kraxel@redhat.com>

Date: Fri, 1 Jul 2011 09:48:49 +0200

Subject: [PATCH 16/35] uhci: add ich9 controllers

Add ich9 controllers,  Factor out properties to a separate

struct and reference it to reduce duplication.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---

 hw/usb-uhci.c |   54 +++++++++++++++++++++++++++++++++++++++---------------

 1 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c

index 925c03b..2ef4c5b 100644

--- a/hw/usb-uhci.c

+++ b/hw/usb-uhci.c

@@ -1176,6 +1176,12 @@ static int usb_uhci_vt82c686b_initfn(PCIDevice *dev)

     return usb_uhci_common_initfn(dev);

 }

+static Property uhci_properties[] = {

+    DEFINE_PROP_STRING("masterbus", UHCIState, masterbus),

+    DEFINE_PROP_UINT32("firstport", UHCIState, firstport, 0),

+    DEFINE_PROP_END_OF_LIST(),

+};

+

 static PCIDeviceInfo uhci_info[] = {

     {

         .qdev.name    = "piix3-usb-uhci",

@@ -1186,11 +1192,7 @@ static PCIDeviceInfo uhci_info[] = {

         .device_id    = PCI_DEVICE_ID_INTEL_82371SB_2,

         .revision     = 0x01,

         .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.props   = uhci_properties,

     },{

         .qdev.name    = "piix4-usb-uhci",

         .qdev.size    = sizeof(UHCIState),

@@ -1200,11 +1202,7 @@ static PCIDeviceInfo uhci_info[] = {

         .device_id    = PCI_DEVICE_ID_INTEL_82371AB_2,

         .revision     = 0x01,

         .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.props   = uhci_properties,

     },{

         .qdev.name    = "vt82c686b-usb-uhci",

         .qdev.size    = sizeof(UHCIState),

@@ -1214,11 +1212,37 @@ static PCIDeviceInfo uhci_info[] = {

         .device_id    = PCI_DEVICE_ID_VIA_UHCI,

         .revision     = 0x01,

         .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.props   = uhci_properties,

+    },{

+        .qdev.name    = "ich9-usb-uhci1",

+        .qdev.size    = sizeof(UHCIState),

+        .qdev.vmsd    = &vmstate_uhci,

+        .init         = usb_uhci_common_initfn,

+        .vendor_id    = PCI_VENDOR_ID_INTEL,

+        .device_id    = PCI_DEVICE_ID_INTEL_82801I_UHCI1,

+        .revision     = 0x03,

+        .class_id     = PCI_CLASS_SERIAL_USB,

+        .qdev.props   = uhci_properties,

+    },{

+        .qdev.name    = "ich9-usb-uhci2",

+        .qdev.size    = sizeof(UHCIState),

+        .qdev.vmsd    = &vmstate_uhci,

+        .init         = usb_uhci_common_initfn,

+        .vendor_id    = PCI_VENDOR_ID_INTEL,

+        .device_id    = PCI_DEVICE_ID_INTEL_82801I_UHCI2,

+        .revision     = 0x03,

+        .class_id     = PCI_CLASS_SERIAL_USB,

+        .qdev.props   = uhci_properties,

+    },{

+        .qdev.name    = "ich9-usb-uhci3",

+        .qdev.size    = sizeof(UHCIState),

+        .qdev.vmsd    = &vmstate_uhci,

+        .init         = usb_uhci_common_initfn,

+        .vendor_id    = PCI_VENDOR_ID_INTEL,

+        .device_id    = PCI_DEVICE_ID_INTEL_82801I_UHCI3,

+        .revision     = 0x03,

+        .class_id     = PCI_CLASS_SERIAL_USB,

+        .qdev.props   = uhci_properties,

     },{

         /* end of list */

     }

-- 

1.7.5.1