Revision 751c6a17 hw/ppc_prep.c
b/hw/ppc_prep.c | ||
---|---|---|
550 | 550 |
PCIBus *pci_bus; |
551 | 551 |
qemu_irq *i8259; |
552 | 552 |
int ppc_boot_device; |
553 |
int index;
|
|
553 |
DriveInfo *dinfo;
|
|
554 | 554 |
BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; |
555 | 555 |
BlockDriverState *fd[MAX_FD]; |
556 | 556 |
|
... | ... | |
691 | 691 |
} |
692 | 692 |
|
693 | 693 |
for(i = 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) { |
694 |
index = drive_get_index(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS); |
|
695 |
if (index != -1) |
|
696 |
hd[i] = drives_table[index].bdrv; |
|
697 |
else |
|
698 |
hd[i] = NULL; |
|
694 |
dinfo = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS); |
|
695 |
hd[i] = dinfo ? dinfo->bdrv : NULL; |
|
699 | 696 |
} |
700 | 697 |
|
701 | 698 |
for(i = 0; i < MAX_IDE_BUS; i++) { |
... | ... | |
708 | 705 |
// SB16_init(); |
709 | 706 |
|
710 | 707 |
for(i = 0; i < MAX_FD; i++) { |
711 |
index = drive_get_index(IF_FLOPPY, 0, i); |
|
712 |
if (index != -1) |
|
713 |
fd[i] = drives_table[index].bdrv; |
|
714 |
else |
|
715 |
fd[i] = NULL; |
|
708 |
dinfo = drive_get(IF_FLOPPY, 0, i); |
|
709 |
fd[i] = dinfo ? dinfo->bdrv : NULL; |
|
716 | 710 |
} |
717 | 711 |
fdctrl_init(i8259[6], 2, 0, 0x3f0, fd); |
718 | 712 |
|
Also available in: Unified diff