Revision fd8014e1 hw/sun4m.c
| b/hw/sun4m.c | ||
|---|---|---|
| 758 | 758 |
qemu_irq fdc_tc; |
| 759 | 759 |
qemu_irq *cpu_halt; |
| 760 | 760 |
unsigned long kernel_size; |
| 761 |
BlockDriverState *fd[MAX_FD];
|
|
| 761 |
DriveInfo *fd[MAX_FD];
|
|
| 762 | 762 |
void *fw_cfg; |
| 763 |
DriveInfo *dinfo; |
|
| 764 | 763 |
|
| 765 | 764 |
/* init CPUs */ |
| 766 | 765 |
if (!cpu_model) |
| ... | ... | |
| 834 | 833 |
if (hwdef->fd_base) {
|
| 835 | 834 |
/* there is zero or one floppy drive */ |
| 836 | 835 |
memset(fd, 0, sizeof(fd)); |
| 837 |
dinfo = drive_get(IF_FLOPPY, 0, 0); |
|
| 838 |
if (dinfo) |
|
| 839 |
fd[0] = dinfo->bdrv; |
|
| 840 |
|
|
| 836 |
fd[0] = drive_get(IF_FLOPPY, 0, 0); |
|
| 841 | 837 |
sun4m_fdctrl_init(slavio_irq[22], hwdef->fd_base, fd, |
| 842 | 838 |
&fdc_tc); |
| 843 | 839 |
} |
| ... | ... | |
| 1562 | 1558 |
qemu_irq esp_reset; |
| 1563 | 1559 |
qemu_irq fdc_tc; |
| 1564 | 1560 |
unsigned long kernel_size; |
| 1565 |
BlockDriverState *fd[MAX_FD];
|
|
| 1561 |
DriveInfo *fd[MAX_FD];
|
|
| 1566 | 1562 |
void *fw_cfg; |
| 1567 | 1563 |
DeviceState *dev; |
| 1568 | 1564 |
unsigned int i; |
| 1569 |
DriveInfo *dinfo; |
|
| 1570 | 1565 |
|
| 1571 | 1566 |
/* init CPU */ |
| 1572 | 1567 |
if (!cpu_model) |
| ... | ... | |
| 1618 | 1613 |
if (hwdef->fd_base != (target_phys_addr_t)-1) {
|
| 1619 | 1614 |
/* there is zero or one floppy drive */ |
| 1620 | 1615 |
memset(fd, 0, sizeof(fd)); |
| 1621 |
dinfo = drive_get(IF_FLOPPY, 0, 0); |
|
| 1622 |
if (dinfo) |
|
| 1623 |
fd[0] = dinfo->bdrv; |
|
| 1624 |
|
|
| 1616 |
fd[0] = drive_get(IF_FLOPPY, 0, 0); |
|
| 1625 | 1617 |
sun4m_fdctrl_init(slavio_irq[1], hwdef->fd_base, fd, |
| 1626 | 1618 |
&fdc_tc); |
| 1627 | 1619 |
} |
Also available in: Unified diff