From patchwork Wed Aug 24 00:13:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 29A83B6F00 for ; Wed, 24 Aug 2011 11:31:48 +1000 (EST) Received: from localhost ([::1]:52464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw17r-0007UB-7Q for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 20:15:23 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw16z-0005ID-LT for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qw16y-00047z-Iw for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:29 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:40396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw16y-00045z-GJ for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:28 -0400 Received: by mail-vw0-f45.google.com with SMTP id 17so649441vws.4 for ; Tue, 23 Aug 2011 17:14:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=TwOYcrtd6le8RUI2rJ6WPC5BWoxWj6N8NZzPBlVYAj4=; b=o6a321XtVUeQ11f7VLiTpQw+CFXQSlbwJf1DxDN7YpHKyEmWiRenzjr80bW5PFbwXX 9iRox470oa6lKDr/TZnCf+vt0kb6nJtPYXzl3NpYGpDL6w+1oCixqG8m+Evp9uZUJvv2 RY4FO6MQ1IO1ma+j64+eAX2+11h5qsBEsKJNc= Received: by 10.52.33.134 with SMTP id r6mr3992148vdi.309.1314144868330; Tue, 23 Aug 2011 17:14:28 -0700 (PDT) Received: from localhost.localdomain (cpe-66-91-180-197.hawaii.res.rr.com [66.91.180.197]) by mx.google.com with ESMTPS id es7sm441852vdb.6.2011.08.23.17.14.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 17:14:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 17:13:46 -0700 Message-Id: <1314144835-29098-8-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1314144835-29098-1-git-send-email-rth@twiddle.net> References: <1314144835-29098-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.212.45 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 07/16] m48t59: Convert to isa_register_ioport. 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 sysbus interface is as yet unconverted. Signed-off-by: Richard Henderson --- hw/m48t59.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/m48t59.c b/hw/m48t59.c index 0cc361e..f318e67 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -73,6 +73,7 @@ struct M48t59State { typedef struct M48t59ISAState { ISADevice busdev; M48t59State state; + MemoryRegion io; } M48t59ISAState; typedef struct M48t59SysBusState { @@ -626,6 +627,15 @@ static void m48t59_reset_sysbus(DeviceState *d) m48t59_reset_common(NVRAM); } +static const MemoryRegionPortio m48t59_portio[] = { + {0, 4, 1, .read = NVRAM_readb, .write = NVRAM_writeb }, + PORTIO_END_OF_LIST(), +}; + +static const MemoryRegionOps m48t59_io_ops = { + .old_portio = m48t59_portio, +}; + /* Initialisation routine */ M48t59State *m48t59_init(qemu_irq IRQ, target_phys_addr_t mem_base, uint32_t io_base, uint16_t size, int type) @@ -669,10 +679,9 @@ M48t59State *m48t59_init_isa(uint32_t io_base, uint16_t size, int type) d = DO_UPCAST(M48t59ISAState, busdev, dev); s = &d->state; + memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4); if (io_base != 0) { - register_ioport_read(io_base, 0x04, 1, NVRAM_readb, s); - register_ioport_write(io_base, 0x04, 1, NVRAM_writeb, s); - isa_init_ioport_range(dev, io_base, 4); + isa_register_ioport(dev, &d->io, io_base); } return s;