From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47961 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGIWN-0002AZ-1i for qemu-devel@nongnu.org; Wed, 10 Nov 2010 16:48:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGIWL-0000nG-VU for qemu-devel@nongnu.org; Wed, 10 Nov 2010 16:47:58 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:51024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGIWL-0000mw-HK for qemu-devel@nongnu.org; Wed, 10 Nov 2010 16:47:57 -0500 Message-ID: <4CDB1308.8010701@mail.berlios.de> Date: Wed, 10 Nov 2010 22:47:52 +0100 From: Stefan Weil MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] ioport: Fix duplicated code References: <20101110122132.08d9c330@doriath> In-Reply-To: <20101110122132.08d9c330@doriath> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org, gleb@redhat.com, Markus Armbruster Am 10.11.2010 15:21, schrieb Luiz Capitulino: > 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"); Please fix the error message, too (register_ioport_read -> register_ioport_rw). > 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)