[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] Fixes for qemu
From: |
J. Mayer |
Subject: |
Re: [Qemu-devel] [PATCH] Fixes for qemu |
Date: |
18 Nov 2003 08:30:55 +0100 |
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);
- [Qemu-devel] new knoppix SegFault, Jens Arm, 2003/11/17
- [Qemu-devel] [PATCH] Fixes for qemu, J. Mayer, 2003/11/18
- Re: [Qemu-devel] [PATCH] Fixes for qemu,
J. Mayer <=
- Re: [Qemu-devel] [PATCH] Fixes for qemu, J. Mayer, 2003/11/18
- Re: [Qemu-devel] [PATCH] Fixes for qemu, J. Mayer, 2003/11/18
- Re: [Qemu-devel] [PATCH] Fixes for qemu, J. Mayer, 2003/11/18
- Re: [Qemu-devel] [PATCH] Fixes for qemu, Chad Page, 2003/11/18
- Re: [Qemu-devel] [PATCH] Fixes for qemu, J. Mayer, 2003/11/18
- [Qemu-devel] [ADD] floppy disk emulation, J. Mayer, 2003/11/18