[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] apb_pci: convert to PCIDeviceInfo to initialize
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 5/7] apb_pci: convert to PCIDeviceInfo to initialize ids |
Date: |
Fri, 8 Apr 2011 21:53:04 +0900 |
Use PCIDeviceInfo to initialize ids.
Signed-off-by: Isaku Yamahata <address@hidden>
---
hw/apb_pci.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index 84e9af7..974c87a 100644
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -304,9 +304,6 @@ static int apb_pci_bridge_initfn(PCIDevice *dev)
return rc;
}
- pci_config_set_vendor_id(dev->config, PCI_VENDOR_ID_SUN);
- pci_config_set_device_id(dev->config, PCI_DEVICE_ID_SUN_SIMBA);
-
/*
* command register:
* According to PCI bridge spec, after reset
@@ -321,7 +318,6 @@ static int apb_pci_bridge_initfn(PCIDevice *dev)
pci_set_word(dev->config + PCI_STATUS,
PCI_STATUS_FAST_BACK | PCI_STATUS_66MHZ |
PCI_STATUS_DEVSEL_MEDIUM);
- pci_set_byte(dev->config + PCI_REVISION_ID, 0x11);
return 0;
}
@@ -436,14 +432,11 @@ static int pci_pbm_init_device(SysBusDevice *dev)
static int pbm_pci_host_init(PCIDevice *d)
{
- pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_SUN);
- pci_config_set_device_id(d->config, PCI_DEVICE_ID_SUN_SABRE);
pci_set_word(d->config + PCI_COMMAND,
PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
pci_set_word(d->config + PCI_STATUS,
PCI_STATUS_FAST_BACK | PCI_STATUS_66MHZ |
PCI_STATUS_DEVSEL_MEDIUM);
- pci_config_set_class(d->config, PCI_CLASS_BRIDGE_HOST);
return 0;
}
@@ -451,6 +444,9 @@ static PCIDeviceInfo pbm_pci_host_info = {
.qdev.name = "pbm",
.qdev.size = sizeof(PCIDevice),
.init = pbm_pci_host_init,
+ .vendor_id = PCI_VENDOR_ID_SUN,
+ .device_id = PCI_DEVICE_ID_SUN_SABRE,
+ .class_id = PCI_CLASS_BRIDGE_HOST,
.is_bridge = 1,
};
@@ -468,6 +464,9 @@ static PCIDeviceInfo pbm_pci_bridge_info = {
.qdev.reset = pci_bridge_reset,
.init = apb_pci_bridge_initfn,
.exit = pci_bridge_exitfn,
+ .vendor_id = PCI_VENDOR_ID_SUN,
+ .device_id = PCI_DEVICE_ID_SUN_SIMBA,
+ .revision = 0x11,
.config_write = pci_bridge_write_config,
.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 <=
- [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