[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 05/21] mac_nvram: Clean up public API
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PATCH 05/21] mac_nvram: Clean up public API |
Date: |
Fri, 25 Jan 2013 13:52:48 +0100 |
From: Andreas Färber <address@hidden>
The state data field is accessed in uint8_t quantities, so switch from
uint32_t argument and return value to uint8_t.
Fix debug format specifiers while at it.
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/mac_nvram.c | 21 ++++++++++-----------
hw/ppc/mac.h | 4 ++--
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c
index eec7ca4..bcde07d 100644
--- a/hw/mac_nvram.c
+++ b/hw/mac_nvram.c
@@ -47,27 +47,26 @@ struct MacIONVRAMState {
#define DEF_SYSTEM_SIZE 0xc10
/* Direct access to NVRAM */
-uint32_t macio_nvram_read (void *opaque, uint32_t addr)
+uint8_t macio_nvram_read(MacIONVRAMState *s, uint32_t addr)
{
- MacIONVRAMState *s = opaque;
uint32_t ret;
- if (addr < s->size)
+ if (addr < s->size) {
ret = s->data[addr];
- else
+ } else {
ret = -1;
- NVR_DPRINTF("read addr %04x val %x\n", addr, ret);
+ }
+ NVR_DPRINTF("read addr %04" PRIx32 " val %" PRIx8 "\n", addr, ret);
return ret;
}
-void macio_nvram_write (void *opaque, uint32_t addr, uint32_t val)
+void macio_nvram_write(MacIONVRAMState *s, uint32_t addr, uint8_t val)
{
- MacIONVRAMState *s = opaque;
-
- NVR_DPRINTF("write addr %04x val %x\n", addr, val);
- if (addr < s->size)
+ NVR_DPRINTF("write addr %04" PRIx32 " val %" PRIx8 "\n", addr, val);
+ if (addr < s->size) {
s->data[addr] = val;
+ }
}
/* macio style NVRAM device */
@@ -78,7 +77,7 @@ static void macio_nvram_writeb(void *opaque, hwaddr addr,
addr = (addr >> s->it_shift) & (s->size - 1);
s->data[addr] = value;
- NVR_DPRINTF("writeb addr %04x val %x\n", (int)addr, value);
+ NVR_DPRINTF("writeb addr %04" PHYS_PRIx " val %" PRIx64 "\n", addr, value);
}
static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index 864a610..6441794 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -78,6 +78,6 @@ MacIONVRAMState *macio_nvram_init (hwaddr size,
void macio_nvram_setup_bar(MacIONVRAMState *s, MemoryRegion *bar,
hwaddr mem_base);
void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
-uint32_t macio_nvram_read (void *opaque, uint32_t addr);
-void macio_nvram_write (void *opaque, uint32_t addr, uint32_t val);
+uint8_t macio_nvram_read(MacIONVRAMState *s, uint32_t addr);
+void macio_nvram_write(MacIONVRAMState *s, uint32_t addr, uint8_t val);
#endif /* !defined(__PPC_MAC_H__) */
--
1.6.0.2
- [Qemu-ppc] [PULL 00/21] ppc patch queue 2013-01-25, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 06/21] mac_nvram: Mark as Big Endian, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 01/21] ppc: Move Mac machines to hw/ppc/, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 08/21] ide/macio: QOM'ify MacIO IDE, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 07/21] mac_nvram: QOM'ify MacIO NVRAM, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 05/21] mac_nvram: Clean up public API,
Alexander Graf <=
- [Qemu-ppc] [PATCH 03/21] macio: Delay qdev init until all fields are initialized, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 13/21] target-ppc: Give a meaningful error if too many threads are specified, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 15/21] pseries: Adjust default VIO address allocations to play better with libvirt, Alexander Graf, 2013/01/25
- Re: [Qemu-ppc] [Qemu-devel] [PULL 00/21] ppc patch queue 2013-01-25, Andreas Färber, 2013/01/25
- [Qemu-ppc] [PATCH 10/21] adb: QOM'ify Apple Desktop Bus, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 12/21] cuda: Move ADB bus into CUDA state, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 04/21] macio: Split MacIO in two, Alexander Graf, 2013/01/25
- [Qemu-ppc] [PATCH 14/21] pseries: Improve handling of multiple PCI host bridges, Alexander Graf, 2013/01/25