From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6li-0004W4-JB for qemu-devel@nongnu.org; Tue, 13 May 2014 03:05:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lZ-00016N-Hv for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:54 -0400 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:44081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lZ-00016G-7S for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:45 -0400 Received: by mail-wi0-f173.google.com with SMTP id bs8so5689713wib.12 for ; Tue, 13 May 2014 00:04:44 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 13 May 2014 09:02:50 +0200 Message-Id: <1399964572-5376-15-git-send-email-marc.mari.barcelo@gmail.com> In-Reply-To: <1399964572-5376-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1399964572-5376-1-git-send-email-marc.mari.barcelo@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 14/16] lan9118: Convert conditional compilation of debug printfs to regular ifs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Stefan Hajnoczi , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Modify debug macros to have the same format through the codebase and use regular ifs instead of ifdef. As the debug printf is always put in code, some casting had to be added to avoid warnings treated as errors at compile time. Signed-off-by: Marc Marí --- hw/net/lan9118.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index e528290..5f43ab6 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -21,16 +21,22 @@ //#define DEBUG_LAN9118 #ifdef DEBUG_LAN9118 -#define DPRINTF(fmt, ...) \ -do { printf("lan9118: " fmt , ## __VA_ARGS__); } while (0) -#define BADF(fmt, ...) \ -do { hw_error("lan9118: error: " fmt , ## __VA_ARGS__);} while (0) +#define DEBUG_LAN9118_ENABLED 1 #else -#define DPRINTF(fmt, ...) do {} while(0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "lan9118: error: " fmt , ## __VA_ARGS__);} while (0) +#define DEBUG_LAN9118_ENABLED 0 #endif +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_LAN9118_ENABLED, "lan9118", fmt, ## __VA_ARGS__) + +#define BADF(fmt, ...) \ + do { \ + if(DEBUG_LAN9118_ENABLED) { \ + hw_error("lan9118: error: " fmt , ## __VA_ARGS__); \ + }else{ \ + fprintf(stderr, "lan9118: error: " fmt , ## __VA_ARGS__); \ + } \ + } while (0) + #define CSR_ID_REV 0x50 #define CSR_IRQ_CFG 0x54 #define CSR_INT_STS 0x58 @@ -1031,7 +1037,7 @@ static void lan9118_writel(void *opaque, hwaddr offset, s->int_sts |= val & SW_INT; break; case CSR_FIFO_INT: - DPRINTF("FIFO INT levels %08x\n", val); + DPRINTF("FIFO INT levels %08x\n", (unsigned)val); s->fifo_int = val; break; case CSR_RX_CFG: @@ -1112,9 +1118,9 @@ static void lan9118_writel(void *opaque, hwaddr offset, if (val & 0x80000000) { if (val & 0x40000000) { s->mac_data = do_mac_read(s, val & 0xf); - DPRINTF("MAC read %d = 0x%08x\n", val & 0xf, s->mac_data); + DPRINTF("MAC read %d = 0x%08x\n", (unsigned)(val & 0xf), s->mac_data); } else { - DPRINTF("MAC write %d = 0x%08x\n", val & 0xf, s->mac_data); + DPRINTF("MAC write %d = 0x%08x\n", (unsigned)(val & 0xf), s->mac_data); do_mac_write(s, val & 0xf, s->mac_data); } } -- 1.7.10.4