From patchwork Sun Jan 13 23:55:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 211691 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3EACB2C0108 for ; Mon, 14 Jan 2013 11:33:48 +1100 (EST) Received: from localhost ([::1]:57336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuXPz-00040o-SL for incoming@patchwork.ozlabs.org; Sun, 13 Jan 2013 18:56:47 -0500 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 Received: from cantor2.suse.de ([195.135.220.15]:32960 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuXPB-0001cI-9D; Sun, 13 Jan 2013 18:55:57 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 5CF94A3E1C; Mon, 14 Jan 2013 00:55:23 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2013 00:55:00 +0100 Message-Id: <1358121304-21345-7-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: qemu-ppc@nongnu.org, agraf@suse.de, =?UTF-8?q?Andreas=20F=C3=A4rber?= , armbru@redhat.com Subject: [Qemu-devel] [RFC ppc-next v3 06/10] mac_nvram: Clean up public API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/mac_nvram.c | 21 ++++++++++----------- hw/ppc/mac.h | 4 ++-- 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) 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__) */