diff options
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/core.c | 20 | ||||
| -rw-r--r-- | hw/ide/internal.h | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 430350f873..ac4ee7162d 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1791,9 +1791,6 @@ static void ide_clear_hob(IDEBus *bus) void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) { IDEBus *bus = opaque; - IDEState *s; - int n; - int lba48 = 0; #ifdef DEBUG_IDE printf("IDE: write addr=0x%x val=0x%02x\n", addr, val); @@ -1854,17 +1851,29 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) default: case 7: /* command */ + ide_exec_cmd(bus, val); + break; + } +} + + +void ide_exec_cmd(IDEBus *bus, uint32_t val) +{ + IDEState *s; + int n; + int lba48 = 0; + #if defined(DEBUG_IDE) printf("ide: CMD=%02x\n", val); #endif s = idebus_active_if(bus); /* ignore commands to non existant slave */ if (s != bus->ifs && !s->bs) - break; + return; /* Only DEVICE RESET is allowed while BSY or/and DRQ are set */ if ((s->status & (BUSY_STAT|DRQ_STAT)) && val != WIN_DEVICE_RESET) - break; + return; switch(val) { case WIN_IDENTIFY: @@ -2355,7 +2364,6 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) ide_set_irq(s->bus); break; } - } } uint32_t ide_ioport_read(void *opaque, uint32_t addr1) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 71af66fff6..029c76c28f 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -567,6 +567,8 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, qemu_irq irq); void ide_init_ioport(IDEBus *bus, int iobase, int iobase2); +void ide_exec_cmd(IDEBus *bus, uint32_t val); + /* hw/ide/qdev.c */ void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id); IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive); |