From patchwork Tue Aug 16 16:45:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 110206 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 1BCEEB6F7F for ; Wed, 17 Aug 2011 03:29:04 +1000 (EST) Received: from localhost ([::1]:46993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMpS-0007so-Vo for incoming@patchwork.ozlabs.org; Tue, 16 Aug 2011 12:49:26 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoL-0004fd-Js for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtMoJ-0002Ab-Ab for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:17 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:36842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtMoJ-0002AE-3M for qemu-devel@nongnu.org; Tue, 16 Aug 2011 12:48:15 -0400 Received: by vxi32 with SMTP id 32so94084vxi.4 for ; Tue, 16 Aug 2011 09:48:14 -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=UFcPKaN3rfc+z5+zlwV4wPlkfOZxYibqW/16W2w3240=; b=mvoBhcLhMkkLes8HSaYwIlZdTNskR/PHgibnZUioplBnVYEUNeDnqzZ+a1qugdfGop Dki8glZ7DV+bGQbWZsIGNtoNfzGa5ifdiGE9DAhcw6en+md+kONHp5rz2YCdBlnaSqES X/IIpm1SUMDmC2AVrXA+lVrXBkBtLE2oc21co= Received: by 10.52.65.208 with SMTP id z16mr1206221vds.386.1313513294300; Tue, 16 Aug 2011 09:48:14 -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.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 16 Aug 2011 09:48:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 16 Aug 2011 09:45:45 -0700 Message-Id: <1313513145-5348-15-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 14/14] isa: Remove isa_init_ioport_range and isa_init_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 All users have been converted to either isa_register_ioport or isa_register_old_portio_list. Signed-off-by: Richard Henderson --- hw/isa-bus.c | 19 +++++-------------- hw/isa.h | 2 -- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index d8e1880..f6ab1eb 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -84,24 +84,17 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq) dev->nirqs++; } -void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length) +static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport) { - if (dev->ioport_id == 0 || start < dev->ioport_id) { - dev->ioport_id = start; + if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) { + dev->ioport_id = ioport; } } -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) { - isa_init_ioport(dev, start); - } + isa_init_ioport(dev, start); } void isa_register_old_portio_list(ISADevice *dev, uint16_t start, @@ -114,9 +107,7 @@ void isa_register_old_portio_list(ISADevice *dev, uint16_t start, /* START is how we should treat DEV, regardless of the actual contents of the portio array. This is how the old code actually handled e.g. the FDC device. */ - if (dev) { - isa_init_ioport(dev, start); - } + isa_init_ioport(dev, start); for (; pio_start->size != 0; pio_start = pio_iter + 1) { unsigned int off_low = UINT_MAX, off_high = 0; diff --git a/hw/isa.h b/hw/isa.h index 117d8b0..49ec181 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -28,8 +28,6 @@ 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_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); MemoryRegion *isa_address_space(ISADevice *dev); ISADevice *isa_create(const char *name);