From patchwork Wed Aug 24 00:13:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111207 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 91C03B6F18 for ; Wed, 24 Aug 2011 10:15:11 +1000 (EST) Received: from localhost ([::1]:50396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw17a-0006N0-I5 for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 20:15:06 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw179-0005qL-LU for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qw177-0004Ev-OH for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:39 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:49027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw177-00046B-Bx for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:37 -0400 Received: by mail-vx0-f173.google.com with SMTP id 32so649475vxi.4 for ; Tue, 23 Aug 2011 17:14:37 -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=u+S7ZrPFslvV8HYzpN359XCI6PepE005nS7l/TYQiBM=; b=GFc/11dYdpGTzcHNq/zKwYXieQ2EK9mTXjQ+IIB1rYOQe25uSDtpvUEwTVl5Ja/Rnb EU+Yd93CtXVNDzya/y77e7E3n92vR+j3IOSghQ8FdIoBak+1Nhs8oaE7TN7+apkHya3b KyvX49GVpTh53Z4uryLVlpUONuqt+MdjUhpRk= Received: by 10.52.174.168 with SMTP id bt8mr4083764vdc.42.1314144877258; Tue, 23 Aug 2011 17:14:37 -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.35 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 17:14:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 17:13:52 -0700 Message-Id: <1314144835-29098-14-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.220.173 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 13/16] pc: Convert port92 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 Signed-off-by: Richard Henderson --- hw/pc.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 263fb1a..4c460fd 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -428,6 +428,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, /* port 92 stuff: could be split off */ typedef struct Port92State { ISADevice dev; + MemoryRegion io; uint8_t outport; qemu_irq *a20_out; } Port92State; @@ -479,13 +480,22 @@ static void port92_reset(DeviceState *d) s->outport &= ~1; } +static const MemoryRegionPortio port92_portio[] = { + { 0, 1, 1, .read = port92_read, .write = port92_write }, + PORTIO_END_OF_LIST(), +}; + +static const MemoryRegionOps port92_ops = { + .old_portio = port92_portio +}; + static int port92_initfn(ISADevice *dev) { Port92State *s = DO_UPCAST(Port92State, dev, dev); - register_ioport_read(0x92, 1, 1, port92_read, s); - register_ioport_write(0x92, 1, 1, port92_write, s); - isa_init_ioport(dev, 0x92); + memory_region_init_io(&s->io, &port92_ops, s, "port92", 1); + isa_register_ioport(dev, &s->io, 0x92); + s->outport = 0; return 0; }