From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LJBno-0004UQ-CE
	for qemu-devel@nongnu.org; Sat, 03 Jan 2009 14:04:52 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LJBnm-0004Ti-Sg
	for qemu-devel@nongnu.org; Sat, 03 Jan 2009 14:04:52 -0500
Received: from [199.232.76.173] (port=54106 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LJBnm-0004Tf-Ol
	for qemu-devel@nongnu.org; Sat, 03 Jan 2009 14:04:50 -0500
Received: from mail.gmx.net ([213.165.64.20]:41734)
	by monty-python.gnu.org with smtp (Exim 4.60)
	(envelope-from <herbszt@gmx.de>) id 1LJBnm-0003iC-0N
	for qemu-devel@nongnu.org; Sat, 03 Jan 2009 14:04:50 -0500
Message-ID: <16831C6E5BE84D8BB12F83AFCF8403E5@FSCPC>
From: "Sebastian Herbszt" <herbszt@gmx.de>
Date: Sat, 3 Jan 2009 20:03:18 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
	reply-type=original
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH] LSI53C895A: Introduce CASE_GET_REG24
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

CASE_GET_REG32 is already defined in lsi53c895a.c; introduce CASE_GET_REG24.

- Sebastian

--- qemu-r6133/hw/lsi53c895a.c.bak Sat Dec 27 16:18:23 2008
+++ qemu-r6133/hw/lsi53c895a.c Sat Jan  3 18:51:59 2009
@@ -1316,6 +1316,11 @@ again:
 static uint8_t lsi_reg_readb(LSIState *s, int offset)
 {
     uint8_t tmp;
+#define CASE_GET_REG24(name, addr) \
+    case addr: return s->name & 0xff; \
+    case addr + 1: return (s->name >> 8) & 0xff; \
+    case addr + 2: return (s->name >> 16) & 0xff;
+
 #define CASE_GET_REG32(name, addr) \
     case addr: return s->name & 0xff; \
     case addr + 1: return (s->name >> 8) & 0xff; \
@@ -1391,12 +1396,7 @@ static uint8_t lsi_reg_readb(LSIState *s
         return s->ctest5;
     case 0x23: /* CTEST6 */
          return 0;
-    case 0x24: /* DBC[0:7] */
-        return s->dbc & 0xff;
-    case 0x25: /* DBC[8:15] */
-        return (s->dbc >> 8) & 0xff;
-    case 0x26: /* DBC[16->23] */
-        return (s->dbc >> 16) & 0xff;
+    CASE_GET_REG24(dbc, 0x24)
     case 0x27: /* DCMD */
         return s->dcmd;
     CASE_GET_REG32(dsp, 0x2c)
@@ -1481,6 +1481,7 @@ static uint8_t lsi_reg_readb(LSIState *s
     }
     BADF("readb 0x%x\n", offset);
     exit(1);
+#undef CASE_GET_REG24
 #undef CASE_GET_REG32
 }