[Qemu-devel] [PATCH] [UPDATE] ide: enable single word DMA

[Stefano Stabellini]

This is an updated version of the patch that enables single word DMA in
the emulated ide drive.
I improved the set transfer mode DMA switch, making sure that mdma is
deactivated when sdma is active and vice versa.

Signed-off-by: Stefano Stabellini <address@hidden>
---

diff --git a/hw/ide.c b/hw/ide.c
index 337621d..104e7dc 100644
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -569,6 +569,7 @@ static void ide_identify(IDEState *s)
         put_le16(p + 59, 0x100 | s->mult_sectors);
     put_le16(p + 60, s->nb_sectors);
     put_le16(p + 61, s->nb_sectors >> 16);
+    put_le16(p + 62, 0x07); /* single word dma0-2 supported */
     put_le16(p + 63, 0x07); /* mdma0-2 supported */
     put_le16(p + 65, 120);
     put_le16(p + 66, 120);
@@ -620,6 +621,7 @@ static void ide_atapi_identify(IDEState *s)
 #ifdef USE_DMA_CDROM
     put_le16(p + 49, 1 << 9 | 1 << 8); /* DMA and LBA supported */
     put_le16(p + 53, 7); /* words 64-70, 54-58, 88 valid */
+    put_le16(p + 62, 7);  /* single word dma0-2 supported */
     put_le16(p + 63, 7);  /* mdma0-2 supported */
     put_le16(p + 64, 0x3f); /* PIO modes supported */
 #else
@@ -2194,14 +2196,22 @@ static void ide_ioport_write(void *opaque, uint32_t 
addr, uint32_t val)
                switch (s->nsector >> 3) {
                    case 0x00: /* pio default */
                    case 0x01: /* pio mode */
+                       put_le16(s->identify_data + 62,0x07);
+                       put_le16(s->identify_data + 63,0x07);
+                       put_le16(s->identify_data + 88,0x3f);
+                       break;
+                    case 0x02: /* sigle word dma mode*/
+                       put_le16(s->identify_data + 62,0x07 | (1 << (val + 8)));
                        put_le16(s->identify_data + 63,0x07);
                        put_le16(s->identify_data + 88,0x3f);
                        break;
                    case 0x04: /* mdma mode */
+                       put_le16(s->identify_data + 62,0x07);
                        put_le16(s->identify_data + 63,0x07 | (1 << (val + 8)));
                        put_le16(s->identify_data + 88,0x3f);
                        break;
                    case 0x08: /* udma mode */
+                       put_le16(s->identify_data + 62,0x07);
                        put_le16(s->identify_data + 63,0x07);
                        put_le16(s->identify_data + 88,0x3f | (1 << (val + 8)));
                        break;