From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RW9wi-0003UA-18 for qemu-devel@nongnu.org; Thu, 01 Dec 2011 11:57:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RW9wd-0001MI-V7 for qemu-devel@nongnu.org; Thu, 01 Dec 2011 11:57:16 -0500 Received: from mail-ey0-f173.google.com ([209.85.215.173]:62750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RW9wd-0001M5-On for qemu-devel@nongnu.org; Thu, 01 Dec 2011 11:57:11 -0500 Received: by eaai10 with SMTP id i10so2740505eaa.4 for ; Thu, 01 Dec 2011 08:57:10 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Thu, 1 Dec 2011 17:57:04 +0100 Message-Id: <1322758625-15384-2-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1322758625-15384-1-git-send-email-benoit.canet@gmail.com> References: <1322758625-15384-1-git-send-email-benoit.canet@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 1/2] applesmc: convert portio to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Signed-off-by: Benoît Canet --- hw/applesmc.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/applesmc.c b/hw/applesmc.c index c47b592..fb11bdf 100644 --- a/hw/applesmc.c +++ b/hw/applesmc.c @@ -165,6 +165,16 @@ static uint32_t applesmc_io_cmd_readb(void *opaque, uint32_t addr1) return s->status; } +static const MemoryRegionPortio applesmc_portio_list[] = { + { APPLESMC_DATA_PORT, 4, 1, + .read = applesmc_io_data_readb, + .write = applesmc_io_data_writeb }, + { APPLESMC_CMD_PORT, 4, 1, + .read = applesmc_io_cmd_readb, + .write = applesmc_io_cmd_writeb }, + PORTIO_END_OF_LIST(), +}; + static void applesmc_add_key(struct AppleSMCStatus *s, const char *key, int len, const char *data) { @@ -200,14 +210,8 @@ static int applesmc_isa_init(ISADevice *dev) { struct AppleSMCStatus *s = DO_UPCAST(struct AppleSMCStatus, dev, dev); - register_ioport_read(s->iobase + APPLESMC_DATA_PORT, 4, 1, - applesmc_io_data_readb, s); - register_ioport_read(s->iobase + APPLESMC_CMD_PORT, 4, 1, - applesmc_io_cmd_readb, s); - register_ioport_write(s->iobase + APPLESMC_DATA_PORT, 4, 1, - applesmc_io_data_writeb, s); - register_ioport_write(s->iobase + APPLESMC_CMD_PORT, 4, 1, - applesmc_io_cmd_writeb, s); + isa_register_portio_list(dev, s->iobase, applesmc_portio_list, s, + "applesmc"); if (!s->osk || (strlen(s->osk) != 64)) { fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n"); -- 1.7.7.3