Modify debug macros to have the same format through the codebase and use regular
ifs instead of ifdef.
Signed-off-by: Marc Marí <marc.mari.barc...@gmail.com>
---
hw/sd/sd.c | 8 +++++---
hw/sd/ssi-sd.c | 19 ++++++++++++-------
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 4502ad1..46ad8f4 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -37,12 +37,14 @@
//#define DEBUG_SD 1
#ifdef DEBUG_SD
-#define DPRINTF(fmt, ...) \
-do { fprintf(stderr, "SD: " fmt , ## __VA_ARGS__); } while (0)
+#define DEBUG_SD_ENABLED 1
#else
-#define DPRINTF(fmt, ...) do {} while(0)
+#define DEBUG_SD_ENABLED 0
#endif
+#define DPRINTF(fmt, ...) \
+ QEMU_DPRINTF(DEBUG_SD_ENABLED, "SD", fmt, ## __VA_ARGS__)
+
#define ACMD41_ENQUIRY_MASK 0x00ffffff
typedef enum {
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index b012e57..cd6fc7b 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -17,16 +17,21 @@
//#define DEBUG_SSI_SD 1
#ifdef DEBUG_SSI_SD
-#define DPRINTF(fmt, ...) \
-do { printf("ssi_sd: " fmt , ## __VA_ARGS__); } while (0)
-#define BADF(fmt, ...) \
-do { fprintf(stderr, "ssi_sd: error: " fmt , ## __VA_ARGS__); exit(1);} while
(0)
+#define DEBUG_SSI_SD_ENABLED 1
#else
-#define DPRINTF(fmt, ...) do {} while(0)
-#define BADF(fmt, ...) \
-do { fprintf(stderr, "ssi_sd: error: " fmt , ## __VA_ARGS__);} while (0)
+#define DEBUG_SSI_SD_ENABLED 0
#endif
+#define DPRINTF(fmt, ...) \
+ QEMU_DPRINTF(DEBUG_SSI_SD_ENABLED, "ssi_sd", fmt, ## __VA_ARGS__)
+#define BADF(fmt, ...) \
+ do { \
+ QEMU_DPRINTF(1, "ssi_sd error", fmt, ## __VA_ARGS__); \
+ if(DEBUG_SSI_SD_ENABLED) { \
+ exit(1); \
+ } \
+ } while (0)
+
typedef enum {
SSI_SD_CMD,
SSI_SD_CMDARG,
--
1.7.10.4
