From patchwork Wed Aug 24 00:13:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111220 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 4EC4BB6F00 for ; Wed, 24 Aug 2011 11:16:35 +1000 (EST) Received: from localhost ([::1]:54368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw18R-00005n-7j for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 20:15:59 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qw17Z-0006zr-K4 for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:15:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qw179-0004Fv-Ih for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:41 -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 1Qw178-00046B-So for qemu-devel@nongnu.org; Tue, 23 Aug 2011 20:14:39 -0400 Received: by mail-vx0-f173.google.com with SMTP id 32so649475vxi.4 for ; Tue, 23 Aug 2011 17:14:38 -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=ZVKY5mYAGlxLp5Z08bwuMoLzuRCkNs+scg4RhNFk/TY=; b=UAFqfv3HE8ym4cX6SdmK4xr0q8U37ng6RqxgdrhqcYl8WRqZJaJSUt+PAFQzCs3piX uQM+vBNO4k32B/EmhL2ULYy5BVPpEWZ956Yfdwc2pQ4cWSOq3OW+6BGOONbcDfWFb/EM SxhSHfFI136eO/8Kel4HcDuvNi39AzoWtPy64= Received: by 10.52.172.228 with SMTP id bf4mr3928247vdc.264.1314144878773; Tue, 23 Aug 2011 17:14:38 -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.37 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 17:14:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 17:13:53 -0700 Message-Id: <1314144835-29098-15-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 14/16] vmport: 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 Signed-off-by: Richard Henderson --- hw/vmport.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/vmport.c b/hw/vmport.c index c8aefaa..b5c6fa1 100644 --- a/hw/vmport.c +++ b/hw/vmport.c @@ -38,6 +38,7 @@ typedef struct _VMPortState { ISADevice dev; + MemoryRegion io; IOPortReadFunc *func[VMPORT_ENTRIES]; void *opaque[VMPORT_ENTRIES]; } VMPortState; @@ -120,13 +121,22 @@ void vmmouse_set_data(const uint32_t *data) env->regs[R_ESI] = data[4]; env->regs[R_EDI] = data[5]; } +static const MemoryRegionPortio vmport_portio[] = { + {0, 1, 4, .read = vmport_ioport_read, .write = vmport_ioport_write }, + PORTIO_END_OF_LIST(), +}; + +static const MemoryRegionOps vmport_ops = { + .old_portio = vmport_portio +}; + static int vmport_initfn(ISADevice *dev) { VMPortState *s = DO_UPCAST(VMPortState, dev, dev); - register_ioport_read(0x5658, 1, 4, vmport_ioport_read, s); - register_ioport_write(0x5658, 1, 4, vmport_ioport_write, s); - isa_init_ioport(dev, 0x5658); + memory_region_init_io(&s->io, &vmport_ops, s, "vmport", 1); + isa_register_ioport(dev, &s->io, 0x5658); + port_state = s; /* Register some generic port commands */ vmport_register(VMPORT_CMD_GETVERSION, vmport_cmd_get_version, NULL);