| Message ID | 20190627202719.17739-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block/pflash_cfi02: Implement missing AMD pflash functionality | expand |
On Thu, Jun 27, 2019 at 1:36 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Always compile the debug code to prevent format string to bitrot. > Delete dead code. > > Signed-off-by: Stephen Checkoway <stephen.checkoway@oberlin.edu> > Message-Id: <20190426162624.55977-3-stephen.checkoway@oberlin.edu> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > [PMD: Extracted from bigger patch, use PRIx32] > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/block/pflash_cfi02.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c > index 6cdfc85264..43796e551a 100644 > --- a/hw/block/pflash_cfi02.c > +++ b/hw/block/pflash_cfi02.c > @@ -47,15 +47,13 @@ > #include "hw/sysbus.h" > #include "trace.h" > > -//#define PFLASH_DEBUG > -#ifdef PFLASH_DEBUG > +#define PFLASH_DEBUG false > #define DPRINTF(fmt, ...) \ > do { \ > - fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__); \ > + if (PFLASH_DEBUG) { \ > + fprintf(stderr, "PFLASH: " fmt, ## __VA_ARGS__); \ > + } \ > } while (0) > -#else > -#define DPRINTF(fmt, ...) do { } while (0) > -#endif > > #define PFLASH_LAZY_ROMD_THRESHOLD 42 > > @@ -218,14 +216,14 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset, > default: > goto flash_read; > } > - DPRINTF("%s: ID " TARGET_FMT_plx " %x\n", __func__, boff, ret); > + DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx32 "\n", __func__, boff, ret); > break; > case 0xA0: > case 0x10: > case 0x30: > /* Status register read */ > ret = pfl->status; > - DPRINTF("%s: status %x\n", __func__, ret); > + DPRINTF("%s: status %" PRIx32 "\n", __func__, ret); > /* Toggle bit 6 */ > pfl->status ^= 0x40; > break; > @@ -268,10 +266,6 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offset, > trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle); > cmd = value; > if (pfl->cmd != 0xA0 && cmd == 0xF0) { > -#if 0 > - DPRINTF("%s: flash reset asked (%02x %02x)\n", > - __func__, pfl->cmd, cmd); > -#endif > goto reset_flash; > } > offset &= pfl->chip_len - 1; > -- > 2.20.1 > >
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 6cdfc85264..43796e551a 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -47,15 +47,13 @@ #include "hw/sysbus.h" #include "trace.h" -//#define PFLASH_DEBUG -#ifdef PFLASH_DEBUG +#define PFLASH_DEBUG false #define DPRINTF(fmt, ...) \ do { \ - fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__); \ + if (PFLASH_DEBUG) { \ + fprintf(stderr, "PFLASH: " fmt, ## __VA_ARGS__); \ + } \ } while (0) -#else -#define DPRINTF(fmt, ...) do { } while (0) -#endif #define PFLASH_LAZY_ROMD_THRESHOLD 42 @@ -218,14 +216,14 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset, default: goto flash_read; } - DPRINTF("%s: ID " TARGET_FMT_plx " %x\n", __func__, boff, ret); + DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx32 "\n", __func__, boff, ret); break; case 0xA0: case 0x10: case 0x30: /* Status register read */ ret = pfl->status; - DPRINTF("%s: status %x\n", __func__, ret); + DPRINTF("%s: status %" PRIx32 "\n", __func__, ret); /* Toggle bit 6 */ pfl->status ^= 0x40; break; @@ -268,10 +266,6 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offset, trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle); cmd = value; if (pfl->cmd != 0xA0 && cmd == 0xF0) { -#if 0 - DPRINTF("%s: flash reset asked (%02x %02x)\n", - __func__, pfl->cmd, cmd); -#endif goto reset_flash; } offset &= pfl->chip_len - 1;