motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/block/pflash_cfi02: Fix debug format string

Browse source 
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]
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-05-01 18:15:35 +02:00
parent c1474acd5d
commit 6536987fd6
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/block/pflash_cfi02.c
View file

@ -47,15 +47,13 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "trace.h" #include "trace.h"
//#define PFLASH_DEBUG #define PFLASH_DEBUG false
#ifdef PFLASH_DEBUG
#define DPRINTF(fmt, ...) \ #define DPRINTF(fmt, ...) \
do { \ do { \
fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__); \ if (PFLASH_DEBUG) { \
fprintf(stderr, "PFLASH: " fmt, ## __VA_ARGS__); \
} \
} while (0) } while (0)
#else
#define DPRINTF(fmt, ...) do { } while (0)
#endif
#define PFLASH_LAZY_ROMD_THRESHOLD 42 #define PFLASH_LAZY_ROMD_THRESHOLD 42
@ -218,14 +216,14 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset,
default: default:
goto flash_read; 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; break;
case 0xA0: case 0xA0:
case 0x10: case 0x10:
case 0x30: case 0x30:
/* Status register read */ /* Status register read */
ret = pfl->status; ret = pfl->status;
DPRINTF("%s: status %x\n", __func__, ret); DPRINTF("%s: status %" PRIx32 "\n", __func__, ret);
/* Toggle bit 6 */ /* Toggle bit 6 */
pfl->status ^= 0x40; pfl->status ^= 0x40;
break; break;
@ -268,10 +266,6 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offset,
trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle); trace_pflash_io_write(offset, width, width << 1, value, pfl->wcycle);
cmd = value; cmd = value;
if (pfl->cmd != 0xA0 && cmd == 0xF0) { if (pfl->cmd != 0xA0 && cmd == 0xF0) {
#if 0
DPRINTF("%s: flash reset asked (%02x %02x)\n",
__func__, pfl->cmd, cmd);
#endif
goto reset_flash; goto reset_flash;
} }
offset &= pfl->chip_len - 1; offset &= pfl->chip_len - 1;