[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] ioport: Fix duplicated code
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH] ioport: Fix duplicated code |
Date: |
Wed, 10 Nov 2010 12:21:32 -0200 |
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 <address@hidden>
---
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)
--
1.7.3.2.161.g3089c
- [Qemu-devel] [PATCH] ioport: Fix duplicated code,
Luiz Capitulino <=