[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] dec_pci: convert to PCIDeviceInfo to initialize
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 4/7] dec_pci: convert to PCIDeviceInfo to initialize ids |
Date: |
Fri, 8 Apr 2011 21:53:03 +0900 |
use PCIDeviceInfo to initialize ids.
Signed-off-by: Isaku Yamahata <address@hidden>
---
hw/dec_pci.c | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/hw/dec_pci.c b/hw/dec_pci.c
index bf88f2a..0468aab 100644
--- a/hw/dec_pci.c
+++ b/hw/dec_pci.c
@@ -50,28 +50,17 @@ static int dec_map_irq(PCIDevice *pci_dev, int irq_num)
return irq_num;
}
-static int dec_21154_initfn(PCIDevice *dev)
-{
- int rc;
-
- rc = pci_bridge_initfn(dev);
- if (rc < 0) {
- return rc;
- }
-
- pci_config_set_vendor_id(dev->config, PCI_VENDOR_ID_DEC);
- pci_config_set_device_id(dev->config, PCI_DEVICE_ID_DEC_21154);
- return 0;
-}
-
static PCIDeviceInfo dec_21154_pci_bridge_info = {
.qdev.name = "dec-21154-p2p-bridge",
.qdev.desc = "DEC 21154 PCI-PCI bridge",
.qdev.size = sizeof(PCIBridge),
.qdev.vmsd = &vmstate_pci_device,
.qdev.reset = pci_bridge_reset,
- .init = dec_21154_initfn,
+ .init = pci_bridge_initfn,
.exit = pci_bridge_exitfn,
+ .vendor_id = PCI_VENDOR_ID_DEC,
+ .device_id = PCI_DEVICE_ID_DEC_21154,
+ .header_type = PCI_HEADER_TYPE_BRIDGE,
.config_write = pci_bridge_write_config,
.is_bridge = 1,
};
@@ -108,10 +97,6 @@ static int pci_dec_21154_init_device(SysBusDevice *dev)
static int dec_21154_pci_host_init(PCIDevice *d)
{
/* PCI2PCI bridge same values as PearPC - check this */
- pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_DEC);
- pci_config_set_device_id(d->config, PCI_DEVICE_ID_DEC_21154);
- pci_set_byte(d->config + PCI_REVISION_ID, 0x02);
- pci_config_set_class(d->config, PCI_CLASS_BRIDGE_PCI);
return 0;
}
@@ -119,6 +104,10 @@ static PCIDeviceInfo dec_21154_pci_host_info = {
.qdev.name = "dec-21154",
.qdev.size = sizeof(PCIDevice),
.init = dec_21154_pci_host_init,
+ .vendor_id = PCI_VENDOR_ID_DEC,
+ .device_id = PCI_DEVICE_ID_DEC_21154,
+ .revision = 0x02,
+ .class_id = PCI_CLASS_BRIDGE_PCI,
.is_bridge = 1,
};
--
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, 2011/04/08
- [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 <=
- [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