From patchwork Wed Feb 1 22:28:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [v2,1/3] jazz-led: use trace framework Date: Wed, 01 Feb 2012 12:28:31 -0000 From: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 139016 Message-Id: <1328135314-13858-2-git-send-email-hpoussin@reactos.org> To: qemu-devel@nongnu.org Cc: Anthony Liguori , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Hervé Poussineau --- hw/jazz_led.c | 26 +++++++++----------------- trace-events | 4 ++++ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/hw/jazz_led.c b/hw/jazz_led.c index f8a2182..1af9268 100644 --- a/hw/jazz_led.c +++ b/hw/jazz_led.c @@ -26,17 +26,7 @@ #include "mips.h" #include "console.h" #include "pixel_ops.h" - -//#define DEBUG_LED - -#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) +#include "trace.h" typedef enum { REDRAW_NONE = 0, REDRAW_SEGMENTS = 1, REDRAW_BACKGROUND = 2, @@ -52,18 +42,18 @@ typedef struct LedState { static uint32_t led_readb(void *opaque, target_phys_addr_t addr) { LedState *s = opaque; - uint32_t val; + uint8_t val; switch (addr) { case 0: val = s->segments; break; default: - BADF("invalid read at [" TARGET_FMT_plx "]\n", addr); + error_report("invalid read at [" TARGET_FMT_plx "]\n", addr); val = 0; } - DPRINTF("read addr=" TARGET_FMT_plx " val=0x%02x\n", addr, val); + trace_jazz_led_read(addr, val); return val; } @@ -101,16 +91,18 @@ static uint32_t led_readl(void *opaque, target_phys_addr_t addr) static void led_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { LedState *s = opaque; + uint8_t new_val = val & 0xff; - DPRINTF("write addr=" TARGET_FMT_plx " val=0x%02x\n", addr, val); + trace_jazz_led_write(addr, new_val); switch (addr) { case 0: - s->segments = val; + s->segments = new_val; s->state |= REDRAW_SEGMENTS; break; default: - BADF("invalid write of 0x%08x at [" TARGET_FMT_plx "]\n", val, addr); + error_report("invalid write of 0x%x at [" TARGET_FMT_plx "]\n", + new_val, addr); break; } } diff --git a/trace-events b/trace-events index 5d05749..d112de4 100644 --- a/trace-events +++ b/trace-events @@ -140,6 +140,10 @@ ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 %08x" ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = %02x" ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x" +# hw/jazz-led.c +jazz_led_read(uint64_t addr, uint8_t val) "read addr=0x%"PRIx64": 0x%x" +jazz_led_write(uint64_t addr, uint8_t new) "write addr=0x%"PRIx64": 0x%x" + # hw/lance.c lance_mem_readw(uint64_t addr, uint32_t ret) "addr=%"PRIx64"val=0x%04x" lance_mem_writew(uint64_t addr, uint32_t val) "addr=%"PRIx64"val=0x%04x"