ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use CMD646 IDE for now 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6555 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2009-02-08 13:05:12 +00:00
parent 3a616592a1
commit 77f0435ece
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ppc_newworld.c
View File

@ -100,7 +100,6 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
int vga_bios_size, bios_size; int vga_bios_size, bios_size;
qemu_irq *dummy_irq; qemu_irq *dummy_irq;
int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index; int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index;
int ide_mem_index[2];
int ppc_boot_device; int ppc_boot_device;
int index; int index;
BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; 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,
hd[i] = NULL; hd[i] = NULL;
} }
dbdma = DBDMA_init(&dbdma_mem_index); dbdma = DBDMA_init(&dbdma_mem_index);
#if 1 pci_cmd646_ide_init(pci_bus, hd, 0);
ide_mem_index[0] = pmac_ide_init(&hd[0], pic[0x13], dbdma, 0x14, pic[0x01]);
ide_mem_index[1] = pmac_ide_init(&hd[2], pic[0x14], dbdma, 0x16, pic[0x02]);
#else
pci_cmd646_ide_init(pci_bus, &hd[0], 0);
#endif
/* cuda also initialize ADB */ /* cuda also initialize ADB */
cuda_init(&cuda_mem_index, pic[0x19]); cuda_init(&cuda_mem_index, pic[0x19]);
@ -310,7 +305,7 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem_index, macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem_index,
dbdma_mem_index, cuda_mem_index, NULL, 2, ide_mem_index, dbdma_mem_index, cuda_mem_index, NULL, 0, NULL,
escc_mem_index); escc_mem_index);
if (usb_enabled) { if (usb_enabled) {