dec_pci: convert to PCIDeviceInfo to initialize ids
use PCIDeviceInfo to initialize ids. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
ad03502b3f
commit
e7b9bc3e89
26
hw/dec_pci.c
26
hw/dec_pci.c
|
@ -50,28 +50,16 @@ static int dec_map_irq(PCIDevice *pci_dev, int irq_num)
|
||||||
return 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 = {
|
static PCIDeviceInfo dec_21154_pci_bridge_info = {
|
||||||
.qdev.name = "dec-21154-p2p-bridge",
|
.qdev.name = "dec-21154-p2p-bridge",
|
||||||
.qdev.desc = "DEC 21154 PCI-PCI bridge",
|
.qdev.desc = "DEC 21154 PCI-PCI bridge",
|
||||||
.qdev.size = sizeof(PCIBridge),
|
.qdev.size = sizeof(PCIBridge),
|
||||||
.qdev.vmsd = &vmstate_pci_device,
|
.qdev.vmsd = &vmstate_pci_device,
|
||||||
.qdev.reset = pci_bridge_reset,
|
.qdev.reset = pci_bridge_reset,
|
||||||
.init = dec_21154_initfn,
|
.init = pci_bridge_initfn,
|
||||||
.exit = pci_bridge_exitfn,
|
.exit = pci_bridge_exitfn,
|
||||||
|
.vendor_id = PCI_VENDOR_ID_DEC,
|
||||||
|
.device_id = PCI_DEVICE_ID_DEC_21154,
|
||||||
.config_write = pci_bridge_write_config,
|
.config_write = pci_bridge_write_config,
|
||||||
.is_bridge = 1,
|
.is_bridge = 1,
|
||||||
};
|
};
|
||||||
|
@ -108,10 +96,6 @@ static int pci_dec_21154_init_device(SysBusDevice *dev)
|
||||||
static int dec_21154_pci_host_init(PCIDevice *d)
|
static int dec_21154_pci_host_init(PCIDevice *d)
|
||||||
{
|
{
|
||||||
/* PCI2PCI bridge same values as PearPC - check this */
|
/* 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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -119,6 +103,10 @@ static PCIDeviceInfo dec_21154_pci_host_info = {
|
||||||
.qdev.name = "dec-21154",
|
.qdev.name = "dec-21154",
|
||||||
.qdev.size = sizeof(PCIDevice),
|
.qdev.size = sizeof(PCIDevice),
|
||||||
.init = dec_21154_pci_host_init,
|
.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,
|
.is_bridge = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue