hw/audio/es1370: remove #ifdef ES1370_VERBOSE to avoid bit rot

Replace the #ifdef ES1370_VERBOSE code with code that the compiler
can optimize away to avoid bit rot and fix the already rotten code.

Tested-by: Rene Engel <ReneEngel80@emailn.de>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20230917065813.6692-5-vr_qemu@t-online.de>
This commit is contained in:
Volker Rümelin 2023-09-17 08:58:10 +02:00 committed by Patchew Applier
parent 480e4c7abc
commit a4b342a331

View file

@ -23,7 +23,7 @@
*/ */
#define DEBUG_ES1370 0 #define DEBUG_ES1370 0
/* #define VERBOSE_ES1370 */ #define VERBOSE_ES1370 0
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/audio/soundhw.h" #include "hw/audio/soundhw.h"
@ -238,11 +238,12 @@ static void print_sctl(uint32_t val)
} }
} }
#ifdef VERBOSE_ES1370 #define lwarn(...) \
#define lwarn(...) AUD_log ("es1370: warning", __VA_ARGS__) do { \
#else if (VERBOSE_ES1370) { \
#define lwarn(...) AUD_log("es1370: warning", __VA_ARGS__); \
#endif } \
} while (0)
#define TYPE_ES1370 "ES1370" #define TYPE_ES1370 "ES1370"
OBJECT_DECLARE_SIMPLE_TYPE(ES1370State, ES1370) OBJECT_DECLARE_SIMPLE_TYPE(ES1370State, ES1370)
@ -504,10 +505,10 @@ static void es1370_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
break; break;
case ES1370_REG_PHANTOM_FRAMECNT: case ES1370_REG_PHANTOM_FRAMECNT:
lwarn ("writing to phantom frame count %#x\n", val); lwarn("writing to phantom frame count 0x%" PRIx64 "\n", val);
break; break;
case ES1370_REG_PHANTOM_FRAMEADR: case ES1370_REG_PHANTOM_FRAMEADR:
lwarn ("writing to phantom frame address %#x\n", val); lwarn("writing to phantom frame address 0x%" PRIx64 "\n", val);
break; break;
case ES1370_REG_ADC_FRAMECNT: case ES1370_REG_ADC_FRAMECNT:
@ -524,7 +525,7 @@ static void es1370_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
break; break;
default: default:
lwarn ("writel %#x <- %#x\n", addr, val); lwarn("writel 0x%" PRIx64 " <- 0x%" PRIx64 "\n", addr, val);
break; break;
} }
} }
@ -588,16 +589,16 @@ static uint64_t es1370_read(void *opaque, hwaddr addr, unsigned size)
case ES1370_REG_PHANTOM_FRAMECNT: case ES1370_REG_PHANTOM_FRAMECNT:
val = ~0U; val = ~0U;
lwarn ("reading from phantom frame count\n"); lwarn("reading from phantom frame count\n");
break; break;
case ES1370_REG_PHANTOM_FRAMEADR: case ES1370_REG_PHANTOM_FRAMEADR:
val = ~0U; val = ~0U;
lwarn ("reading from phantom frame address\n"); lwarn("reading from phantom frame address\n");
break; break;
default: default:
val = ~0U; val = ~0U;
lwarn ("readl %#x -> %#x\n", addr, val); lwarn("readl 0x%" PRIx64 " -> 0x%x\n", addr, val);
break; break;
} }
return val; return val;