Revision 520128bd

b/hw/gt64xxx.c
1115 1115

  
1116 1116
    s->pci->bus = pci_register_bus(NULL, "pci",
1117 1117
                                   pci_gt64120_set_irq, pci_gt64120_map_irq,
1118
                                   pic, 144, 4);
1118
                                   pic, PCI_DEVFN(18, 0), 4);
1119 1119
    s->ISD_handle = cpu_register_io_memory(gt64120_read, gt64120_write, s);
1120 1120
    d = pci_register_device(s->pci->bus, "GT64120 PCI Bus", sizeof(PCIDevice),
1121 1121
                            0, NULL, NULL);
b/hw/ppce500_pci.c
279 279
    controller->pci_state.bus = pci_register_bus(NULL, "pci",
280 280
                                                 mpc85xx_pci_set_irq,
281 281
                                                 mpc85xx_pci_map_irq,
282
                                                 pci_irqs, 0x88, 4);
282
                                                 pci_irqs, PCI_DEVFN(0x11, 0),
283
                                                 4);
283 284
    d = pci_register_device(controller->pci_state.bus,
284 285
                            "host bridge", sizeof(PCIDevice),
285 286
                            0, NULL, NULL);
b/hw/unin_pci.c
230 230
    d = FROM_SYSBUS(UNINState, s);
231 231
    d->host_state.bus = pci_register_bus(&d->busdev.qdev, "pci",
232 232
                                         pci_unin_set_irq, pci_unin_map_irq,
233
                                         pic, 11 << 3, 4);
233
                                         pic, PCI_DEVFN(11, 0), 4);
234 234

  
235 235
#if 0
236
    pci_create_simple(d->host_state.bus, 11 << 3, "uni-north");
236
    pci_create_simple(d->host_state.bus, PCI_DEVFN(11, 0), "uni-north");
237 237
#endif
238 238

  
239 239
    sysbus_mmio_map(s, 0, 0xf2800000);
......
242 242
    /* DEC 21154 bridge */
243 243
#if 0
244 244
    /* XXX: not activated as PPC BIOS doesn't handle multiple buses properly */
245
    pci_create_simple(d->host_state.bus, 12 << 3, "dec-21154");
245
    pci_create_simple(d->host_state.bus, PCI_DEVFN(12, 0), "dec-21154");
246 246
#endif
247 247

  
248 248
    /* Uninorth AGP bus */
249
    pci_create_simple(d->host_state.bus, 11 << 3, "uni-north-agp");
249
    pci_create_simple(d->host_state.bus, PCI_DEVFN(11, 0), "uni-north-agp");
250 250
    dev = qdev_create(NULL, "uni-north-agp");
251 251
    qdev_init_nofail(dev);
252 252
    s = sysbus_from_qdev(dev);
......
256 256
    /* Uninorth internal bus */
257 257
#if 0
258 258
    /* XXX: not needed for now */
259
    pci_create_simple(d->host_state.bus, 14 << 3, "uni-north-pci");
259
    pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0), "uni-north-pci");
260 260
    dev = qdev_create(NULL, "uni-north-pci");
261 261
    qdev_init_nofail(dev);
262 262
    s = sysbus_from_qdev(dev);
......
282 282

  
283 283
    d->host_state.bus = pci_register_bus(&d->busdev.qdev, "pci",
284 284
                                         pci_unin_set_irq, pci_unin_map_irq,
285
                                         pic, 11 << 3, 4);
285
                                         pic, PCI_DEVFN(11, 0), 4);
286 286

  
287 287
    sysbus_mmio_map(s, 0, 0xf0800000);
288 288
    sysbus_mmio_map(s, 1, 0xf0c00000);
b/hw/versatile_pci.c
127 127
    }
128 128
    bus = pci_register_bus(&dev->qdev, "pci",
129 129
                           pci_vpb_set_irq, pci_vpb_map_irq, s->irq,
130
                           11 << 3, 4);
130
                           PCI_DEVFN(11, 0), 4);
131 131

  
132 132
    /* ??? Register memory space.  */
133 133

  

Also available in: Unified diff