gwj / at91sam9263 · Commits

Commit 77f0435ece5fbf4da304e0f9822e4a3fab8d6fa5

Authored by blueswir1
1 parent 3a616592

Use CMD646 IDE for now 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6555 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 8 deletions
hw/ppc_newworld.c
  View file @77f0435
@@ -100,7 +100,6 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, @@ -100,7 +100,6 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
100 int vga_bios_size, bios_size; 100 int vga_bios_size, bios_size;
101 qemu_irq *dummy_irq; 101 qemu_irq *dummy_irq;
102 int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index; 102 int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index;
103 - int ide_mem_index[2];  
104 int ppc_boot_device; 103 int ppc_boot_device;
105 int index; 104 int index;
106 BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; 105 BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
@@ -296,12 +295,8 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, @@ -296,12 +295,8 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
296 hd[i] = NULL; 295 hd[i] = NULL;
297 } 296 }
298 dbdma = DBDMA_init(&dbdma_mem_index); 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 /* cuda also initialize ADB */ 300 /* cuda also initialize ADB */
306 cuda_init(&cuda_mem_index, pic[0x19]); 301 cuda_init(&cuda_mem_index, pic[0x19]);
307 302
@@ -310,7 +305,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, @@ -310,7 +305,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
310 305
311 306
312 macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem_index, 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 escc_mem_index); 309 escc_mem_index);
315 310
316 if (usb_enabled) { 311 if (usb_enabled) {