commit fc4d65da26449765724098520d36ad51959e1d8a
author blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 29 16:51:02 2008 +0000
committer blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 29 16:51:02 2008 +0000
tree 6f579c8a4de48a3c68e281c3b91c9abf297d69b0
parent b44c08fab34d35e19e4a58be1012ce0ce2740045

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>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5813 c046a42c-6fe2-441c-8c8c-71466251a162

hw/esp.c

diff --git a/hw/esp.c b/hw/esp.c
index 33f4432..10c465f 100644
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -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;