From patchwork Wed Nov 10 14:21:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 70680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 92FCDB70F6 for ; Thu, 11 Nov 2010 06:04:05 +1100 (EST) Received: from localhost ([127.0.0.1]:56960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGFxf-0008JN-Cd for incoming@patchwork.ozlabs.org; Wed, 10 Nov 2010 14:03:59 -0500 Received: from [140.186.70.92] (port=56854 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGFwg-0008GI-KG for qemu-devel@nongnu.org; Wed, 10 Nov 2010 14:02:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGFwf-0004TC-8g for qemu-devel@nongnu.org; Wed, 10 Nov 2010 14:02:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGFwf-0004T1-0d for qemu-devel@nongnu.org; Wed, 10 Nov 2010 14:02:57 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAAJ2u6u015284 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Nov 2010 14:02:56 -0500 Received: from doriath (ovpn-113-58.phx2.redhat.com [10.3.113.58]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAAJ2qK5001160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 10 Nov 2010 14:02:54 -0500 Date: Wed, 10 Nov 2010 12:21:32 -0200 From: Luiz Capitulino To: qemu-devel@nongnu.org Message-ID: <20101110122132.08d9c330@doriath> Organization: Red Hat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Markus Armbruster , gleb@redhat.com Subject: [Qemu-devel] [PATCH] ioport: Fix duplicated code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Functions register_ioport_read() and register_ioport_write() are almost identical, the only difference is that they write to different arrays. Introduce register_ioport() to handle this difference and change both functions to use it instead of duplicating code. Signed-off-by: Luiz Capitulino --- ioport.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ioport.c b/ioport.c index ec3dc65..ae1bf8c 100644 --- a/ioport.c +++ b/ioport.c @@ -137,8 +137,9 @@ static int ioport_bsize(int size, int *bsize) } /* size is the word size in byte */ -int register_ioport_read(pio_addr_t start, int length, int size, - IOPortReadFunc *func, void *opaque) +static int register_ioport_rw(pio_addr_t start, int length, int size, + IOPortReadFunc *read_func, + IOPortWriteFunc *write_func, void *opaque) { int i, bsize; @@ -147,7 +148,11 @@ int register_ioport_read(pio_addr_t start, int length, int size, return -1; } for(i = start; i < start + length; i += size) { - ioport_read_table[bsize][i] = func; + if (read_func) { + ioport_read_table[bsize][i] = read_func; + } else if (write_func) { + ioport_write_table[bsize][i] = write_func; + } if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque) hw_error("register_ioport_read: invalid opaque"); ioport_opaque[i] = opaque; @@ -155,23 +160,16 @@ int register_ioport_read(pio_addr_t start, int length, int size, return 0; } -/* size is the word size in byte */ +int register_ioport_read(pio_addr_t start, int length, int size, + IOPortReadFunc *func, void *opaque) +{ + return register_ioport_rw(start, length, size, func, NULL, opaque); +} + int register_ioport_write(pio_addr_t start, int length, int size, IOPortWriteFunc *func, void *opaque) { - int i, bsize; - - if (ioport_bsize(size, &bsize)) { - hw_error("register_ioport_write: invalid size"); - return -1; - } - for(i = start; i < start + length; i += size) { - ioport_write_table[bsize][i] = func; - if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque) - hw_error("register_ioport_write: invalid opaque"); - ioport_opaque[i] = opaque; - } - return 0; + return register_ioport_rw(start, length, size, NULL, func, opaque); } void isa_unassign_ioport(pio_addr_t start, int length)