[Qemu-devel] [5813] Fix command len detection (esp_3_cmdlen.diff)

[Qemu-devel] [5813] Fix command len detection (esp_3_cmdlen.diff)

[Blue Swirl]

Revision: 5813
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5813
Author:   blueswir1
Date:     2008-11-29 16:51:02 +0000 (Sat, 29 Nov 2008)

Log Message:
-----------
Fix command len detection (esp_3_cmdlen.diff)
When command is not DMA, TCMID and TCLO registers are not filled. Use command buffer len instead

Signed-off-by: Herve Poussineau <hpoussin@reactos.org>

Modified Paths:
--------------
    trunk/hw/esp.c

Modified: trunk/hw/esp.c
===================================================================
--- trunk/hw/esp.c	2008-11-29 16:48:29 UTC (rev 5812)
+++ trunk/hw/esp.c	2008-11-29 16:51:02 UTC (rev 5813)
@@ -167,16 +167,16 @@
     uint32_t dmalen;
     int target;
 
-    dmalen = s->rregs[ESP_TCLO] | (s->rregs[ESP_TCMID] << 8);
     target = s->wregs[ESP_WBUSID] & BUSID_DID;
-    DPRINTF("get_cmd: len %d target %d\n", dmalen, target);
     if (s->dma) {
+        dmalen = s->rregs[ESP_TCLO] | (s->rregs[ESP_TCMID] << 8);
         s->dma_memory_read(s->dma_opaque, buf, dmalen);
     } else {
+        dmalen = s->ti_size;
+        memcpy(buf, s->ti_buf, dmalen);
         buf[0] = 0;
-        memcpy(&buf[1], s->ti_buf, dmalen);
-        dmalen++;
     }
+    DPRINTF("get_cmd: len %d target %d\n", dmalen, target);
 
     s->ti_size = 0;
     s->ti_rptr = 0;