From patchwork Wed Aug 10 22:28:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 109472 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 90343B6F88 for ; Thu, 11 Aug 2011 09:16:09 +1000 (EST) Received: from localhost ([::1]:51178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHl-0005z3-Gz for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2011 18:30:01 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHH8-0003mp-Uf for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrHH8-0006M4-3F for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:22 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:44730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHH7-0006Kk-VA for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:22 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so1164337wyf.4 for ; Wed, 10 Aug 2011 15:29:21 -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=JeGlbrzqCqt6nmuNMcxhM7WQv7muwBHlIWSTc+taxXU=; b=pnUnsS5qzCErP0AcSkG6Cl2zyVQZHDWRnrTs6HZHBuuAfRcwvKj3SnLdvZ803vidEk n2q+owJnsG3yNht6TjiApQ902emr8x68HPTbmAaSgOJ+n/Z+3ZVD4paFYjY4C89LWvg7 1gOIaSvjAJkUulQ1lpkA/HgiWVRUa5ILLVobk= Received: by 10.216.177.68 with SMTP id c46mr1057658wem.98.1313015361629; Wed, 10 Aug 2011 15:29:21 -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 m38sm880619weq.21.2011.08.10.15.29.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 15:29:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 10 Aug 2011 15:28:12 -0700 Message-Id: <1313015300-23920-4-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313015300-23920-1-git-send-email-rth@twiddle.net> References: <1313015300-23920-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 03/11] isa: add 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 To replace isa_init_ioport and isa_init_ioport_range as the ISA devices are converted to the memory api. Signed-off-by: Richard Henderson --- hw/isa-bus.c | 10 ++++++++++ hw/isa.h | 5 ++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index d067505..b49e6c6 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -108,6 +108,16 @@ void isa_init_ioport(ISADevice *dev, uint16_t ioport) isa_init_ioport_range(dev, ioport, 1); } +void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start) +{ + memory_region_add_subregion(isabus->address_space_io, start, io); + if (dev != NULL) { + assert(dev->nio < ARRAY_SIZE(dev->io)); + dev->io[dev->nio++] = io; + isa_init_ioport_range(dev, start, io->size); + } +} + static int isa_qdev_init(DeviceState *qdev, DeviceInfo *base) { ISADevice *dev = DO_UPCAST(ISADevice, qdev, qdev); diff --git a/hw/isa.h b/hw/isa.h index 390e2d4..432d17a 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -13,10 +13,12 @@ typedef struct ISADeviceInfo ISADeviceInfo; struct ISADevice { DeviceState qdev; + MemoryRegion *io[32]; uint32_t isairq[2]; - int nirqs; uint16_t ioports[32]; + int nirqs; int nioports; + int nio; }; typedef int (*isa_qdev_initfn)(ISADevice *dev); @@ -29,6 +31,7 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io); void isa_bus_irqs(qemu_irq *irqs); qemu_irq isa_get_irq(int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq); +void isa_register_ioport(ISADevice *dev, MemoryRegion *io, uint16_t start); void isa_init_ioport(ISADevice *dev, uint16_t ioport); void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length); void isa_qdev_register(ISADeviceInfo *info);