ide: split ide command interpretation off
The ATA command interpretation code can be used for PATA and SATA interfaces alike. So let's split it out into a separate function. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
1da7cfbd01
commit
7cff87ff6a
|
@ -1791,9 +1791,6 @@ static void ide_clear_hob(IDEBus *bus)
|
||||||
void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
||||||
{
|
{
|
||||||
IDEBus *bus = opaque;
|
IDEBus *bus = opaque;
|
||||||
IDEState *s;
|
|
||||||
int n;
|
|
||||||
int lba48 = 0;
|
|
||||||
|
|
||||||
#ifdef DEBUG_IDE
|
#ifdef DEBUG_IDE
|
||||||
printf("IDE: write addr=0x%x val=0x%02x\n", addr, val);
|
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:
|
default:
|
||||||
case 7:
|
case 7:
|
||||||
/* command */
|
/* 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)
|
#if defined(DEBUG_IDE)
|
||||||
printf("ide: CMD=%02x\n", val);
|
printf("ide: CMD=%02x\n", val);
|
||||||
#endif
|
#endif
|
||||||
s = idebus_active_if(bus);
|
s = idebus_active_if(bus);
|
||||||
/* ignore commands to non existant slave */
|
/* ignore commands to non existant slave */
|
||||||
if (s != bus->ifs && !s->bs)
|
if (s != bus->ifs && !s->bs)
|
||||||
break;
|
return;
|
||||||
|
|
||||||
/* Only DEVICE RESET is allowed while BSY or/and DRQ are set */
|
/* Only DEVICE RESET is allowed while BSY or/and DRQ are set */
|
||||||
if ((s->status & (BUSY_STAT|DRQ_STAT)) && val != WIN_DEVICE_RESET)
|
if ((s->status & (BUSY_STAT|DRQ_STAT)) && val != WIN_DEVICE_RESET)
|
||||||
break;
|
return;
|
||||||
|
|
||||||
switch(val) {
|
switch(val) {
|
||||||
case WIN_IDENTIFY:
|
case WIN_IDENTIFY:
|
||||||
|
@ -2355,7 +2364,6 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
||||||
ide_set_irq(s->bus);
|
ide_set_irq(s->bus);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t ide_ioport_read(void *opaque, uint32_t addr1)
|
uint32_t ide_ioport_read(void *opaque, uint32_t addr1)
|
||||||
|
|
|
@ -567,6 +567,8 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,
|
||||||
DriveInfo *hd1, qemu_irq irq);
|
DriveInfo *hd1, qemu_irq irq);
|
||||||
void ide_init_ioport(IDEBus *bus, int iobase, int iobase2);
|
void ide_init_ioport(IDEBus *bus, int iobase, int iobase2);
|
||||||
|
|
||||||
|
void ide_exec_cmd(IDEBus *bus, uint32_t val);
|
||||||
|
|
||||||
/* hw/ide/qdev.c */
|
/* hw/ide/qdev.c */
|
||||||
void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id);
|
void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id);
|
||||||
IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive);
|
IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive);
|
||||||
|
|
Loading…
Reference in New Issue