From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuXPH-0002D2-GY for qemu-devel@nongnu.org; Sun, 13 Jan 2013 18:56:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TuXPB-0001cO-Ij for qemu-devel@nongnu.org; Sun, 13 Jan 2013 18:56:03 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 14 Jan 2013 00:55:00 +0100 Message-Id: <1358121304-21345-7-git-send-email-afaerber@suse.de> In-Reply-To: <1358121304-21345-1-git-send-email-afaerber@suse.de> References: <1358121304-21345-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC ppc-next v3 06/10] mac_nvram: Clean up public API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, agraf@suse.de, =?UTF-8?q?Andreas=20F=C3=A4rber?= , armbru@redhat.com 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=C3=A4rber --- hw/mac_nvram.c | 21 ++++++++++----------- hw/ppc/mac.h | 4 ++-- 2 Dateien ge=C3=A4ndert, 12 Zeilen hinzugef=C3=BCgt(+), 13 Zeilen entfer= nt(-) 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 =20 /* 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 =3D opaque; uint32_t ret; =20 - if (addr < s->size) + if (addr < s->size) { ret =3D s->data[addr]; - else + } else { ret =3D -1; - NVR_DPRINTF("read addr %04x val %x\n", addr, ret); + } + NVR_DPRINTF("read addr %04" PRIx32 " val %" PRIx8 "\n", addr, ret); =20 return ret; } =20 -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 =3D 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] =3D val; + } } =20 /* macio style NVRAM device */ @@ -78,7 +77,7 @@ static void macio_nvram_writeb(void *opaque, hwaddr add= r, =20 addr =3D (addr >> s->it_shift) & (s->size - 1); s->data[addr] =3D value; - NVR_DPRINTF("writeb addr %04x val %x\n", (int)addr, value); + NVR_DPRINTF("writeb addr %04" PHYS_PRIx " val %" PRIx64 "\n", addr, = value); } =20 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__) */ --=20 1.7.10.4