[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] ide/piix: convert to PCIDeviceInfo to initializ
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 6/7] ide/piix: convert to PCIDeviceInfo to initialize ids |
Date: |
Fri, 8 Apr 2011 21:53:05 +0900 |
use PCIDeviceInfo to initialize ids.
Signed-off-by: Isaku Yamahata <address@hidden>
---
hw/ide/piix.c | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index c349644..2736b48 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -131,8 +131,9 @@ static void pci_piix_init_ports(PCIIDEState *d) {
}
}
-static int pci_piix_ide_initfn(PCIIDEState *d)
+static int pci_piix_ide_initfn(PCIDevice *dev)
{
+ PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev);
uint8_t *pci_conf = d->dev.config;
pci_conf[PCI_CLASS_PROG] = 0x80; // legacy ATA mode
@@ -149,24 +150,6 @@ static int pci_piix_ide_initfn(PCIIDEState *d)
return 0;
}
-static int pci_piix3_ide_initfn(PCIDevice *dev)
-{
- PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev);
-
- pci_config_set_vendor_id(d->dev.config, PCI_VENDOR_ID_INTEL);
- pci_config_set_device_id(d->dev.config, PCI_DEVICE_ID_INTEL_82371SB_1);
- return pci_piix_ide_initfn(d);
-}
-
-static int pci_piix4_ide_initfn(PCIDevice *dev)
-{
- PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev);
-
- pci_config_set_vendor_id(d->dev.config, PCI_VENDOR_ID_INTEL);
- pci_config_set_device_id(d->dev.config, PCI_DEVICE_ID_INTEL_82371AB);
- return pci_piix_ide_initfn(d);
-}
-
/* hd_table must contain 4 block drivers */
/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */
PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn)
@@ -195,13 +178,17 @@ static PCIDeviceInfo piix_ide_info[] = {
.qdev.size = sizeof(PCIIDEState),
.qdev.no_user = 1,
.no_hotplug = 1,
- .init = pci_piix3_ide_initfn,
+ .init = pci_piix_ide_initfn,
+ .vendor_id = PCI_VENDOR_ID_INTEL,
+ .device_id = PCI_DEVICE_ID_INTEL_82371SB_1,
},{
.qdev.name = "piix4-ide",
.qdev.size = sizeof(PCIIDEState),
.qdev.no_user = 1,
.no_hotplug = 1,
- .init = pci_piix4_ide_initfn,
+ .init = pci_piix_ide_initfn,
+ .vendor_id = PCI_VENDOR_ID_INTEL,
+ .device_id = PCI_DEVICE_ID_INTEL_82371AB,
},{
/* end of list */
}
--
1.7.1.1
- [Qemu-devel] [PATCH 0/7] pci: initialize ids in pci common code, Isaku Yamahata, 2011/04/08
- [Qemu-devel] [PATCH 6/7] ide/piix: convert to PCIDeviceInfo to initialize ids,
Isaku Yamahata <=
- [Qemu-devel] [PATCH 3/7] eepro100: convert to PCIDeviceInfo to initialize ids, Isaku Yamahata, 2011/04/08
- [Qemu-devel] [PATCH 2/7] usb-uhci: convert to PCIDEviceInfo to initialize ids, Isaku Yamahata, 2011/04/08
- [Qemu-devel] [PATCH 5/7] apb_pci: convert to PCIDeviceInfo to initialize ids, Isaku Yamahata, 2011/04/08
- [Qemu-devel] [PATCH 4/7] dec_pci: convert to PCIDeviceInfo to initialize ids, Isaku Yamahata, 2011/04/08
- [Qemu-devel] [PATCH 7/7] vmware_vga.c: convert to PCIDeviceInfo to initialize ids, Isaku Yamahata, 2011/04/08
- [Qemu-devel] [PATCH 1/7] pci: move ids of config space into PCIDeviceInfo, Isaku Yamahata, 2011/04/08