@@ -273,7 +273,7 @@ static void m5206_mbar_reset(m5206_mbar_state *s)
}
static uint64_t m5206_mbar_read(m5206_mbar_state *s,
- uint64_t offset, unsigned size)
+ uint16_t offset, unsigned size)
{
if (offset >= 0x100 && offset < 0x120) {
return m5206_timer_read(s->timer[0], offset - 0x100);
@@ -306,11 +306,11 @@ static uint64_t m5206_mbar_read(m5206_mbar_state *s,
case 0x170: return s->uivr[0];
case 0x1b0: return s->uivr[1];
}
- hw_error("Bad MBAR read offset 0x%x", (int)offset);
+ hw_error("Bad MBAR read offset 0x%"PRIx16, offset);
return 0;
}
-static void m5206_mbar_write(m5206_mbar_state *s, uint32_t offset,
+static void m5206_mbar_write(m5206_mbar_state *s, uint16_t offset,
uint64_t value, unsigned size)
{
if (offset >= 0x100 && offset < 0x120) {
@@ -360,7 +360,7 @@ static void m5206_mbar_write(m5206_mbar_state *s, uint32_t offset,
s->uivr[1] = value;
break;
default:
- hw_error("Bad MBAR write offset 0x%x", (int)offset);
+ hw_error("Bad MBAR write offset 0x%"PRIx16, offset);
break;
}
}
All calls to m5206_mbar_read/m5206_mbar_write are used with 'offset = hwaddr & 0x3ff', so we are sure the offset fits in 16-bit. Suggested-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- v3: Use PRIx16 --- hw/m68k/mcf5206.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)