Revision 77f0435e

b/hw/ppc_newworld.c
100 100
    int vga_bios_size, bios_size;
101 101
    qemu_irq *dummy_irq;
102 102
    int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index;
103
    int ide_mem_index[2];
104 103
    int ppc_boot_device;
105 104
    int index;
106 105
    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
......
296 295
            hd[i] = NULL;
297 296
    }
298 297
    dbdma = DBDMA_init(&dbdma_mem_index);
299
#if 1
300
    ide_mem_index[0] = pmac_ide_init(&hd[0], pic[0x13], dbdma, 0x14, pic[0x01]);
301
    ide_mem_index[1] = pmac_ide_init(&hd[2], pic[0x14], dbdma, 0x16, pic[0x02]);
302
#else
303
    pci_cmd646_ide_init(pci_bus, &hd[0], 0);
304
#endif
298
    pci_cmd646_ide_init(pci_bus, hd, 0);
299

  
305 300
    /* cuda also initialize ADB */
306 301
    cuda_init(&cuda_mem_index, pic[0x19]);
307 302

  
......
310 305

  
311 306

  
312 307
    macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem_index,
313
               dbdma_mem_index, cuda_mem_index, NULL, 2, ide_mem_index,
308
               dbdma_mem_index, cuda_mem_index, NULL, 0, NULL,
314 309
               escc_mem_index);
315 310

  
316 311
    if (usb_enabled) {

Also available in: Unified diff