Revision 751c6a17 hw/sun4m.c
b/hw/sun4m.c | ||
---|---|---|
581 | 581 |
qemu_irq *cpu_halt; |
582 | 582 |
unsigned long kernel_size; |
583 | 583 |
BlockDriverState *fd[MAX_FD]; |
584 |
int drive_index; |
|
585 | 584 |
void *fw_cfg; |
586 | 585 |
DeviceState *dev; |
586 |
DriveInfo *dinfo; |
|
587 | 587 |
|
588 | 588 |
/* init CPUs */ |
589 | 589 |
if (!cpu_model) |
... | ... | |
662 | 662 |
if (hwdef->fd_base) { |
663 | 663 |
/* there is zero or one floppy drive */ |
664 | 664 |
memset(fd, 0, sizeof(fd)); |
665 |
drive_index = drive_get_index(IF_FLOPPY, 0, 0);
|
|
666 |
if (drive_index != -1)
|
|
667 |
fd[0] = drives_table[drive_index].bdrv;
|
|
665 |
dinfo = drive_get(IF_FLOPPY, 0, 0);
|
|
666 |
if (dinfo)
|
|
667 |
fd[0] = dinfo->bdrv;
|
|
668 | 668 |
|
669 | 669 |
sun4m_fdctrl_init(slavio_irq[hwdef->fd_irq], hwdef->fd_base, fd, |
670 | 670 |
&fdc_tc); |
... | ... | |
1507 | 1507 |
qemu_irq fdc_tc; |
1508 | 1508 |
unsigned long kernel_size; |
1509 | 1509 |
BlockDriverState *fd[MAX_FD]; |
1510 |
int drive_index; |
|
1511 | 1510 |
void *fw_cfg; |
1512 | 1511 |
DeviceState *dev; |
1513 | 1512 |
unsigned int i; |
1513 |
DriveInfo *dinfo; |
|
1514 | 1514 |
|
1515 | 1515 |
/* init CPU */ |
1516 | 1516 |
if (!cpu_model) |
... | ... | |
1565 | 1565 |
if (hwdef->fd_base != (target_phys_addr_t)-1) { |
1566 | 1566 |
/* there is zero or one floppy drive */ |
1567 | 1567 |
memset(fd, 0, sizeof(fd)); |
1568 |
drive_index = drive_get_index(IF_FLOPPY, 0, 0);
|
|
1569 |
if (drive_index != -1)
|
|
1570 |
fd[0] = drives_table[drive_index].bdrv;
|
|
1568 |
dinfo = drive_get(IF_FLOPPY, 0, 0);
|
|
1569 |
if (dinfo)
|
|
1570 |
fd[0] = dinfo->bdrv;
|
|
1571 | 1571 |
|
1572 | 1572 |
sun4m_fdctrl_init(slavio_irq[hwdef->fd_irq], hwdef->fd_base, fd, |
1573 | 1573 |
&fdc_tc); |
Also available in: Unified diff