From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48225 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Of80x-0000FC-Dm for qemu-devel@nongnu.org; Sat, 31 Jul 2010 05:05:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Of80w-0000am-6E for qemu-devel@nongnu.org; Sat, 31 Jul 2010 05:05:55 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:43609) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Of80v-0000ZT-FR for qemu-devel@nongnu.org; Sat, 31 Jul 2010 05:05:54 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 31 Jul 2010 11:05:28 +0200 Message-Id: <1280567128-7005-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] jazz led: Fix debug prints List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Add a macro to easily enable/disable debug prints Also fix wrong printf formatters Signed-off-by: Herv=C3=A9 Poussineau --- hw/jazz_led.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/hw/jazz_led.c b/hw/jazz_led.c index 18780e9..4cb680c 100644 --- a/hw/jazz_led.c +++ b/hw/jazz_led.c @@ -29,6 +29,15 @@ =20 //#define DEBUG_LED =20 +#ifdef DEBUG_LED +#define DPRINTF(fmt, ...) \ +do { printf("jazz led: " fmt , ## __VA_ARGS__); } while (0) +#else +#define DPRINTF(fmt, ...) do {} while (0) +#endif +#define BADF(fmt, ...) \ +do { fprintf(stderr, "jazz led ERROR: " fmt , ## __VA_ARGS__);} while (0= ) + typedef enum { REDRAW_NONE =3D 0, REDRAW_SEGMENTS =3D 1, REDRAW_BACKGROUND =3D 2, } screen_state_t; @@ -49,12 +58,12 @@ static uint32_t led_readb(void *opaque, target_phys_a= ddr_t addr) val =3D s->segments; break; default: -#ifdef DEBUG_LED - printf("jazz led: invalid read [0x%x]\n", relative_addr); -#endif + BADF("invalid read at [" TARGET_FMT_plx "]\n", addr); val =3D 0; } =20 + DPRINTF("read addr=3D" TARGET_FMT_plx " val=3D0x%02x\n", addr, val); + return val; } =20 @@ -92,15 +101,15 @@ static void led_writeb(void *opaque, target_phys_add= r_t addr, uint32_t val) { LedState *s =3D opaque; =20 + DPRINTF("write addr=3D" TARGET_FMT_plx " val=3D0x%02x\n", addr, val)= ; + switch (addr) { case 0: s->segments =3D val; s->state |=3D REDRAW_SEGMENTS; break; default: -#ifdef DEBUG_LED - printf("jazz led: invalid write of 0x%02x at [0x%x]\n", val,= relative_addr); -#endif + BADF("invalid write of 0x%08x at [" TARGET_FMT_plx "]\n", va= l, addr); break; } } --=20 1.7.1.GIT