From 08406b035edc35fff4e3e14af3ec6f8f3a17a587 Mon Sep 17 00:00:00 2001 From: malc Date: Mon, 27 Aug 2012 18:33:24 +0400 Subject: [PATCH] Revert "fix some debug printf format strings" This reverts commit 145c7c880ff520a9348cc2401ba291330b9606fe. Signed-off-by: malc --- hw/cirrus_vga.c | 4 ++-- hw/i8259.c | 3 +-- hw/ide/cmd646.c | 5 ++--- hw/ide/via.c | 5 ++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 909899dd54..e8dcc6b883 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2055,8 +2055,8 @@ static void cirrus_vga_mem_write(void *opaque, } } else { #ifdef DEBUG_CIRRUS - printf("cirrus: mem_writeb " TARGET_FMT_plx " value %" PRIx64 "\n", - addr, mem_value); + printf("cirrus: mem_writeb " TARGET_FMT_plx " value %02x\n", addr, + mem_value); #endif } } diff --git a/hw/i8259.c b/hw/i8259.c index 65876662a1..53daf78652 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -355,8 +355,7 @@ static uint64_t pic_ioport_read(void *opaque, target_phys_addr_t addr, ret = s->imr; } } - DPRINTF("read: addr=0x%02" TARGET_PRIxPHYS " val=0x%02x\n", - addr, ret); + DPRINTF("read: addr=0x%02x val=0x%02x\n", addr, ret); return ret; } diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index dd2855e19d..e0b9443496 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -154,7 +154,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, break; } #ifdef DEBUG_IDE - printf("bmdma: readb 0x%02" TARGET_PRIxPHYS " : 0x%02x\n", addr, val); + printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val); #endif return val; } @@ -170,8 +170,7 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, } #ifdef DEBUG_IDE - printf("bmdma: writeb 0x%02" TARGET_PRIxPHYS " : 0x%02" PRIx64 "\n", - addr, val); + printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val); #endif switch(addr & 3) { case 0: diff --git a/hw/ide/via.c b/hw/ide/via.c index 948a46938a..b20e4f094e 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -55,7 +55,7 @@ static uint64_t bmdma_read(void *opaque, target_phys_addr_t addr, break; } #ifdef DEBUG_IDE - printf("bmdma: readb 0x%02" TARGET_PRIxPHYS " : 0x%02x\n", addr, val); + printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val); #endif return val; } @@ -70,8 +70,7 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr, } #ifdef DEBUG_IDE - printf("bmdma: writeb 0x%02" TARGET_PRIxPHYS " : 0x%02" PRIx64 "\n", - addr, val); + printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val); #endif switch (addr & 3) { case 0: -- 2.11.0