diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/core.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index c3334b121e..443ff10135 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2633,27 +2633,29 @@ void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version) ide_reset(s); } +static void ide_init1(IDEBus *bus, int unit, DriveInfo *dinfo) +{ + static int drive_serial = 1; + IDEState *s = &bus->ifs[unit]; + + s->bus = bus; + s->unit = unit; + s->drive_serial = drive_serial++; + s->io_buffer = qemu_blockalign(s->bs, IDE_DMA_BUF_SECTORS*512 + 4); + s->io_buffer_total_len = IDE_DMA_BUF_SECTORS*512 + 4; + s->smart_selftest_data = qemu_blockalign(s->bs, 512); + s->sector_write_timer = qemu_new_timer(vm_clock, + ide_sector_write_timer_cb, s); + ide_init_drive(s, dinfo, NULL); +} + void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, qemu_irq irq) { - IDEState *s; - static int drive_serial = 1; int i; for(i = 0; i < 2; i++) { - s = bus->ifs + i; - s->bus = bus; - s->unit = i; - s->drive_serial = drive_serial++; - s->io_buffer = qemu_blockalign(s->bs, IDE_DMA_BUF_SECTORS*512 + 4); - s->io_buffer_total_len = IDE_DMA_BUF_SECTORS*512 + 4; - s->smart_selftest_data = qemu_blockalign(s->bs, 512); - s->sector_write_timer = qemu_new_timer(vm_clock, - ide_sector_write_timer_cb, s); - if (i == 0) - ide_init_drive(s, hd0, NULL); - if (i == 1) - ide_init_drive(s, hd1, NULL); + ide_init1(bus, i, i == 0 ? hd0 : hd1); } bus->irq = irq; } |