From patchwork Tue Aug 16 16:45:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 110209 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 C456EB6F7F for ; Wed, 17 Aug 2011 03:42:30 +1000 (EST) Received: from localhost ([::1]:44039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMos-0006Mf-LY for incoming@patchwork.ozlabs.org; Tue, 16 Aug 2011 12:48:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoK-0004ao-3S for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtMoG-00029j-RC for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:15 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:57789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoG-00024p-Gz for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:12 -0400 Received: by mail-vw0-f45.google.com with SMTP id 17so96031vws.4 for ; Tue, 16 Aug 2011 09:48:12 -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=xwv0BLfD7Q9Hf2AgDMqkCBm+bwqiSepAKdIpY3yFQNU=; b=SqATCN0JtHZ5SPtjo/HzOeIZfiHOljYWqD2bcr9fftYV/MEzI4XF/0AIqTvB1JTFmd jC39IuvJOpCAsgwRbcEqaaFAITxGcgCPt9pcmUAWiFO9Kz5yKq6WFM9ZnBe/Sx9dtYlu 9Y3TGc3IQqS7A8zyDg740kMW5ibIlrRSlwmd8= Received: by 10.52.110.8 with SMTP id hw8mr5162999vdb.66.1313513292106; Tue, 16 Aug 2011 09:48:12 -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.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 16 Aug 2011 09:48:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 16 Aug 2011 09:45:43 -0700 Message-Id: <1313513145-5348-13-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.212.45 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 12/14] 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);