From 2217dcfff5e24a16217cba5e53c3579f97d8880e Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Fri, 30 Oct 2009 21:20:57 +0900 Subject: pci: use PCI_SLOT() and PCI_FUNC(). use PCI_SLOT() and PCI_FUNC() where appropriate instead of direct use of bit operation. Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin Signed-off-by: Anthony Liguori --- hw/apb_pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'hw/apb_pci.c') diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 43be7ceeb5..1ea3e0dc42 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -261,11 +261,13 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base, 0, 32); pci_create_simple(d->host_state.bus, 0, "pbm"); /* APB secondary busses */ - *bus2 = pci_bridge_init(d->host_state.bus, 8, PCI_VENDOR_ID_SUN, - PCI_DEVICE_ID_SUN_SIMBA, pci_apb_map_irq, + *bus2 = pci_bridge_init(d->host_state.bus, PCI_DEVFN(1, 0), + PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SIMBA, + pci_apb_map_irq, "Advanced PCI Bus secondary bridge 1"); - *bus3 = pci_bridge_init(d->host_state.bus, 9, PCI_VENDOR_ID_SUN, - PCI_DEVICE_ID_SUN_SIMBA, pci_apb_map_irq, + *bus3 = pci_bridge_init(d->host_state.bus, PCI_DEVFN(1, 1), + PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SIMBA, + pci_apb_map_irq, "Advanced PCI Bus secondary bridge 2"); return d->host_state.bus; -- cgit v1.2.3-55-g7522