From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AM1Da-0006Ft-8k
	for qemu-devel@nongnu.org; Tue, 18 Nov 2003 03:28:14 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AM1D1-0005nl-LY
	for qemu-devel@nongnu.org; Tue, 18 Nov 2003 03:28:10 -0500
Received: from [62.210.158.46] (helo=teheran.magic.fr)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AM1D1-0005nZ-5T
	for qemu-devel@nongnu.org; Tue, 18 Nov 2003 03:27:39 -0500
Received: from 10.0.0.2 (ppp-181.net-555.magic.fr [62.210.255.181])
	by teheran.magic.fr (8.11.6/8.11.2) with ESMTP id hAI7QAe26121
	for <qemu-devel@nongnu.org>; Tue, 18 Nov 2003 08:26:10 +0100 (CET)
Subject: Re: [Qemu-devel] [PATCH] Fixes for qemu
From: "J. Mayer" <l_indien@magic.fr>
In-Reply-To: <1069139728.14646.2148.camel@rapid>
References: <20031117105133.7e856e56.Jens.Arm@gmx.de>
	<1069139728.14646.2148.camel@rapid>
Content-Type: text/plain
Message-Id: <1069140655.13658.2180.camel@rapid>
Mime-Version: 1.0
Date: 18 Nov 2003 08:30:55 +0100
Content-Transfer-Encoding: 7bit
Reply-To: qemu-devel@nongnu.org
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <http://mail.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://mail.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://mail.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

dma.c.diff

diff -urNbB -x CVS qemu-current/dma.c qemu/dma.c
--- qemu-current/dma.c	Tue Nov 18 06:51:07 2003
+++ qemu/dma.c	Thu Nov 13 19:53:00 2003
@@ -28,6 +28,7 @@
 #include "vl.h"
 #include "cpu.h"
 
+//#define DEBUG_DMA
 #define log(...) fprintf (stderr, "dma: " __VA_ARGS__)
 #ifdef DEBUG_DMA
 #define lwarn(...) fprintf (stderr, "dma: " __VA_ARGS__)
@@ -215,17 +216,17 @@
 
     case 0xb:                   /* mode */
         {
-#ifdef DMA_DEBUG
+            ichan = data & 3;
+#ifdef DEBUG_DMA
             int op;
             int ai;
             int dir;
             int opmode;
 
-            ichan = val & 3;
-            op = (val >> 2) & 3;
-            ai = (val >> 4) & 1;
-            dir = (val >> 5) & 1;
-            opmode = (val >> 6) & 3;
+            op = (data >> 2) & 3;
+            ai = (data >> 4) & 1;
+            dir = (data >> 5) & 1;
+            opmode = (data >> 6) & 3;
 
             linfo ("ichan %d, op %d, ai %d, dir %d, opmode %d\n",
                    ichan, op, ai, dir, opmode);
@@ -259,7 +259,7 @@
         goto error;
     }
 
-#ifdef DMA_DEBUG
+#ifdef DEBUG_DMA
     if (0xc != iport) {
         linfo ("nport %#06x, ncont %d, ichan % 2d, val %#06x\n",
                nport, d != dma_controllers, ichan, data);