[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/11] ide: split ide command interpretation off
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 01/11] ide: split ide command interpretation off |
Date: |
Tue, 14 Dec 2010 01:34:33 +0100 |
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 <address@hidden>
---
v6 -> v7:
- use bus instead of opaque (stefanha)
---
hw/ide/core.c | 20 ++++++++++++++------
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 430350f..ac4ee71 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 71af66f..029c76c 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);
--
1.6.0.2
- [Qemu-devel] [PATCH 00/11] AHCI emulation support v9, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 04/11] ide: move transfer_start after variable modification, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 07/11] pci: add ich9 pci id, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 05/11] ide: add ncq identify data for ahci sata drives, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 01/11] ide: split ide command interpretation off,
Alexander Graf <=
- [Qemu-devel] [PATCH 06/11] pci: add storage class for sata, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 11/11] ahci: set SATA Mode Select, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 10/11] config: add ahci for pci capable machines, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 09/11] config: move ide core and pci to pci.mak, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 03/11] ide: Split out BMDMA code from ATA core, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 02/11] ide: fix whitespace gap in ide_exec_cmd, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 08/11] ahci: add ahci emulation, Alexander Graf, 2010/12/13
- [Qemu-devel] [PATCH 12/11] ide: honor ncq for atapi, Alexander Graf, 2010/12/14