From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L6T28-0003gK-QS
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 11:51:04 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L6T28-0003fu-85
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 11:51:04 -0500
Received: from [199.232.76.173] (port=51571 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L6T28-0003fn-2g
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 11:51:04 -0500
Received: from savannah.gnu.org ([199.232.41.3]:44107 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L6T27-0001Af-NQ
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 11:51:03 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L6T27-0000uC-5A
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 16:51:03 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1L6T26-0000u7-RV
	for qemu-devel@nongnu.org; Sat, 29 Nov 2008 16:51:03 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1L6T26-0000u7-RV@cvs.savannah.gnu.org>
Date: Sat, 29 Nov 2008 16:51:02 +0000
Subject: [Qemu-devel] [5813] Fix command len detection (esp_3_cmdlen.diff)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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;