[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/10] qdev-ify: uhci
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 08/10] qdev-ify: uhci |
Date: |
Wed, 17 Jun 2009 14:59:23 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-uhci.c | 71 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index 00e740b..e3a501c 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -1069,18 +1069,11 @@ static void uhci_map(PCIDevice *pci_dev, int region_num,
register_ioport_read(addr, 32, 1, uhci_ioport_readb, s);
}
-void usb_uhci_piix3_init(PCIBus *bus, int devfn)
+static void usb_uhci_common_initfn(UHCIState *s)
{
- UHCIState *s;
- uint8_t *pci_conf;
+ uint8_t *pci_conf = s->dev.config;
int i;
- s = (UHCIState *)pci_register_device(bus,
- "USB-UHCI", sizeof(UHCIState),
- devfn, NULL, NULL);
- pci_conf = s->dev.config;
- pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
- pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371SB_2);
pci_conf[0x08] = 0x01; // revision number
pci_conf[0x09] = 0x00;
pci_config_set_class(pci_conf, PCI_CLASS_SERIAL_USB);
@@ -1103,36 +1096,50 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn)
register_savevm("uhci", 0, 1, uhci_save, uhci_load, s);
}
-void usb_uhci_piix4_init(PCIBus *bus, int devfn)
+static void usb_uhci_piix3_initfn(PCIDevice *dev)
{
- UHCIState *s;
- uint8_t *pci_conf;
- int i;
+ UHCIState *s = DO_UPCAST(UHCIState, dev, dev);
+ uint8_t *pci_conf = s->dev.config;
+
+ pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
+ pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371SB_2);
+ usb_uhci_common_initfn(s);
+}
+
+static void usb_uhci_piix4_initfn(PCIDevice *dev)
+{
+ UHCIState *s = DO_UPCAST(UHCIState, dev, dev);
+ uint8_t *pci_conf = s->dev.config;
- s = (UHCIState *)pci_register_device(bus,
- "USB-UHCI", sizeof(UHCIState),
- devfn, NULL, NULL);
- pci_conf = s->dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371AB_2);
- pci_conf[0x08] = 0x01; // revision number
- pci_conf[0x09] = 0x00;
- pci_config_set_class(pci_conf, PCI_CLASS_SERIAL_USB);
- pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
- pci_conf[0x3d] = 4; // interrupt pin 3
- pci_conf[0x60] = 0x10; // release number
+ usb_uhci_common_initfn(s);
+}
- for(i = 0; i < NB_PORTS; i++) {
- qemu_register_usb_port(&s->ports[i].port, s, i, uhci_attach);
+static PCIDeviceInfo uhci_info[] = {
+ {
+ .qdev.name = "PIIX3 USB-UHCI",
+ .qdev.size = sizeof(UHCIState),
+ .init = usb_uhci_piix3_initfn,
+ },{
+ .qdev.name = "PIIX4 USB-UHCI",
+ .qdev.size = sizeof(UHCIState),
+ .init = usb_uhci_piix4_initfn,
}
- s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s);
+};
- uhci_reset(s);
+static void acpi_register(void)
+{
+ pci_qdev_register(uhci_info, ARRAY_SIZE(uhci_info));
+}
+device_init(acpi_register);
- /* Use region 4 for consistency with real hardware. BSD guests seem
- to rely on this. */
- pci_register_bar(&s->dev, 4, 0x20,
- PCI_ADDRESS_SPACE_IO, uhci_map);
+void usb_uhci_piix3_init(PCIBus *bus, int devfn)
+{
+ pci_create_simple(bus, devfn, "PIIX3 USB-UHCI");
+}
- register_savevm("uhci", 0, 1, uhci_save, uhci_load, s);
+void usb_uhci_piix4_init(PCIBus *bus, int devfn)
+{
+ pci_create_simple(bus, devfn, "PIIX4 USB-UHCI");
}
--
1.6.2.2
- [Qemu-devel] [PATCH 0/10] qdev patches., Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 04/10] qdev/pci: bus name, Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 01/10] qdev: update pci device registration., Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 03/10] qdev: remove DeviceType, Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 07/10] qdev-ify: piix acpi, Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 02/10] qdev: replace bus_type enum with bus_info struct., Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 05/10] qdev: hook up i440fx., Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 06/10] qdev: convert piix-ide, first step, Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 08/10] qdev-ify: uhci,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 09/10] qdev-ify: usb, Gerd Hoffmann, 2009/06/17
- [Qemu-devel] [PATCH 10/10] qdev-ify: scsi, Gerd Hoffmann, 2009/06/17
- [Qemu-devel] Re: [PATCH 0/10] qdev patches., Gerd Hoffmann, 2009/06/18
- Re: [Qemu-devel] Re: [PATCH 0/10] qdev patches., Gerd Hoffmann, 2009/06/19
- Re: [Qemu-devel] Re: [PATCH 0/10] qdev patches., Paul Brook, 2009/06/19
- Re: [Qemu-devel] Re: [PATCH 0/10] qdev patches., Gerd Hoffmann, 2009/06/22
- Re: [Qemu-devel] Re: [PATCH 0/10] qdev patches., Avi Kivity, 2009/06/22
- Re: [Qemu-devel] Re: [PATCH 0/10] qdev patches., Gerd Hoffmann, 2009/06/22
- Re: [Qemu-devel] Re: [PATCH 0/10] qdev patches., Gerd Hoffmann, 2009/06/22
- Re: [Qemu-devel] Re: [PATCH 0/10] qdev patches., Avi Kivity, 2009/06/22