From patchwork Tue Aug 16 16:45:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 110195 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 B9D85B6F72 for ; Wed, 17 Aug 2011 02:48:50 +1000 (EST) Received: from localhost ([::1]:40920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoV-0004hY-FF for incoming@patchwork.ozlabs.org; Tue, 16 Aug 2011 12:48:27 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoB-00049H-Ts for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtMo9-00026o-Ab for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:07 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:60303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMo8-00024O-Vg for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:05 -0400 Received: by mail-vx0-f173.google.com with SMTP id 32so93846vxi.4 for ; Tue, 16 Aug 2011 09:48:04 -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=SSOj19TKOZVBWEbpJpfFAb5hLGJxPkpxtWR1zi3v+mM=; b=mv1gtnlUiii6x9mJ+/ntKVnWfxFCh88WUi+DzKmFIOb4c+gxuZGIGNiJ7ZleAhqxZz fnaTkuy8RNQ0rr8QJN25gbycYc+7K0jkkRc4PDX5hMuwXIjGbhC0emCdcudvd5vJXYyA qRNtUsW9S8wBIQt2gO3+3W0lV7Icge34K8CCk= Received: by 10.52.97.196 with SMTP id ec4mr4983590vdb.117.1313513284529; Tue, 16 Aug 2011 09:48:04 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id gw3sm246636vdb.44.2011.08.16.09.48.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 16 Aug 2011 09:48:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 16 Aug 2011 09:45:36 -0700 Message-Id: <1313513145-5348-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313513145-5348-1-git-send-email-rth@twiddle.net> References: <1313513145-5348-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.220.173 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 05/14] 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 537c0f7..2520812 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -72,6 +72,7 @@ struct M48t59State { typedef struct M48t59ISAState { ISADevice busdev; M48t59State state; + MemoryRegion io; } M48t59ISAState; typedef struct M48t59SysBusState { @@ -625,6 +626,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) @@ -668,10 +678,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;