Revision f455e98c hw/ppc_oldworld.c
| b/hw/ppc_oldworld.c | ||
|---|---|---|
| 137 | 137 |
int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index; |
| 138 | 138 |
int escc_mem_index, ide_mem_index[2]; |
| 139 | 139 |
uint16_t ppc_boot_device; |
| 140 |
BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; |
|
| 141 |
DriveInfo *dinfo; |
|
| 140 |
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; |
|
| 142 | 141 |
void *fw_cfg; |
| 143 | 142 |
void *dbdma; |
| 144 | 143 |
uint8_t *vga_bios_ptr; |
| ... | ... | |
| 331 | 330 |
} |
| 332 | 331 |
|
| 333 | 332 |
/* First IDE channel is a MAC IDE on the MacIO bus */ |
| 334 |
dinfo = drive_get(IF_IDE, 0, 0); |
|
| 335 |
hd[0] = dinfo ? dinfo->bdrv : NULL; |
|
| 336 |
dinfo = drive_get(IF_IDE, 0, 1); |
|
| 337 |
hd[1] = dinfo ? dinfo->bdrv : NULL; |
|
| 333 |
hd[0] = drive_get(IF_IDE, 0, 0); |
|
| 334 |
hd[1] = drive_get(IF_IDE, 0, 1); |
|
| 338 | 335 |
dbdma = DBDMA_init(&dbdma_mem_index); |
| 339 | 336 |
ide_mem_index[0] = -1; |
| 340 | 337 |
ide_mem_index[1] = pmac_ide_init(hd, pic[0x0D], dbdma, 0x16, pic[0x02]); |
| 341 | 338 |
|
| 342 | 339 |
/* Second IDE channel is a CMD646 on the PCI bus */ |
| 343 |
dinfo = drive_get(IF_IDE, 1, 0); |
|
| 344 |
hd[0] = dinfo ? dinfo->bdrv : NULL; |
|
| 345 |
dinfo = drive_get(IF_IDE, 1, 1); |
|
| 346 |
hd[1] = dinfo ? dinfo->bdrv : NULL; |
|
| 340 |
hd[0] = drive_get(IF_IDE, 1, 0); |
|
| 341 |
hd[1] = drive_get(IF_IDE, 1, 1); |
|
| 347 | 342 |
hd[3] = hd[2] = NULL; |
| 348 | 343 |
pci_cmd646_ide_init(pci_bus, hd, 0); |
| 349 | 344 |
|
Also available in: Unified diff