qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 1/3] Rename DEBUG field to TC_DEBUG to avoid name cl


From: Riccardo Magliocchetti
Subject: [Qemu-devel] [PATCH 1/3] Rename DEBUG field to TC_DEBUG to avoid name clashes
Date: Wed, 19 May 2010 20:40:18 +0200

Some files use DEBUG as a preprocessor conditionals to enable debug
code and i find handy to pass -DDEBUG as extra cflags at configure
time.
Unfortunately this cannot be done if DEBUG name is used for other
purposes.

Signed-off-by: Riccardo Magliocchetti <address@hidden>
---
 hw/tc6393xb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c
index e0c5e5f..31a5fa1 100644
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -49,7 +49,7 @@
 #define SCR_FER                0xe0            /* b Function Enable    */
 #define SCR_MCR                0xe4            /* w Mode Control       */
 #define SCR_CONFIG     0xfc            /* b Configuration Control */
-#define SCR_DEBUG      0xff            /* b Debug              */
+#define SCR_TC_DEBUG   0xff            /* b Debug              */
 
 #define NAND_CFG_COMMAND    0x04    /* w Command        */
 #define NAND_CFG_BASE       0x10    /* l Control Base Address */
@@ -103,7 +103,7 @@ struct TC6393xbState {
         uint8_t FER;
         uint16_t MCR;
         uint8_t CONFIG;
-        uint8_t DEBUG;
+        uint8_t TC_DEBUG;
     } scr;
     uint32_t gpio_dir;
     uint32_t gpio_level;
@@ -247,7 +247,7 @@ static uint32_t tc6393xb_scr_readb(TC6393xbState *s, 
target_phys_addr_t addr)
         SCR_REG_B(FER);
         SCR_REG_W(MCR);
         SCR_REG_B(CONFIG);
-        SCR_REG_B(DEBUG);
+        SCR_REG_B(TC_DEBUG);
     }
     fprintf(stderr, "tc6393xb_scr: unhandled read at %08x\n", (uint32_t) addr);
     return 0;
@@ -308,7 +308,7 @@ static void tc6393xb_scr_writeb(TC6393xbState *s, 
target_phys_addr_t addr, uint3
         SCR_REG_B(FER);
         SCR_REG_W(MCR);
         SCR_REG_B(CONFIG);
-        SCR_REG_B(DEBUG);
+        SCR_REG_B(TC_DEBUG);
     }
     fprintf(stderr, "tc6393xb_scr: unhandled write at %08x: %02x\n",
                                        (uint32_t) addr, value & 0xff);
-- 
1.7.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]