[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] ioport: consolidate duplicated logic in registe
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH 3/6] ioport: consolidate duplicated logic in register_ioport_{read, write}(). |
Date: |
Fri, 10 Jul 2009 18:13:22 +0900 |
consolidate duplicated logic in register_ioport_{read, write}().
Signed-off-by: Isaku Yamahata <address@hidden>
---
ioport.c | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ioport.c b/ioport.c
index 04bffc4..01cfaf7 100644
--- a/ioport.c
+++ b/ioport.c
@@ -121,19 +121,27 @@ static void default_ioport_writel(void *opaque, uint32_t
address, uint32_t data)
#endif
}
+static int ioport_bsize(int size, int *bsize)
+{
+ if (size == 1) {
+ *bsize = 0;
+ } else if (size == 2) {
+ *bsize = 1;
+ } else if (size == 4) {
+ *bsize = 2;
+ } else {
+ return -1;
+ }
+ return 0;
+}
+
/* size is the word size in byte */
int register_ioport_read(int start, int length, int size,
IOPortReadFunc *func, void *opaque)
{
int i, bsize;
- if (size == 1) {
- bsize = 0;
- } else if (size == 2) {
- bsize = 1;
- } else if (size == 4) {
- bsize = 2;
- } else {
+ if (ioport_bsize(size, &bsize)) {
hw_error("register_ioport_read: invalid size");
return -1;
}
@@ -152,13 +160,7 @@ int register_ioport_write(int start, int length, int size,
{
int i, bsize;
- if (size == 1) {
- bsize = 0;
- } else if (size == 2) {
- bsize = 1;
- } else if (size == 4) {
- bsize = 2;
- } else {
+ if (ioport_bsize(size, &bsize)) {
hw_error("register_ioport_write: invalid size");
return -1;
}
--
1.6.0.2
- [Qemu-devel] [PATCH 0/6] ioport related clean ups. V3, Isaku Yamahata, 2009/07/10
- [Qemu-devel] [PATCH 1/6] split out ioport related stuffs from vl.c into ioport.c., Isaku Yamahata, 2009/07/10
- [Qemu-devel] [PATCH 3/6] ioport: consolidate duplicated logic in register_ioport_{read, write}().,
Isaku Yamahata <=
- [Qemu-devel] [PATCH 4/6] ioport: remove some #ifdef DEBUG_UNUSED_IOPORT., Isaku Yamahata, 2009/07/10
- [Qemu-devel] [PATCH 5/6] consolidate user cpu_{in, out}[bwl] into ioport-user.c, Isaku Yamahata, 2009/07/10
- [Qemu-devel] [PATCH 6/6] use uint{32, 16, 8}_t for ioport value and uint16_t for ioport address., Isaku Yamahata, 2009/07/10
- [Qemu-devel] [PATCH 2/6] use constant IOPORTS_MASK instead of 0xffff., Isaku Yamahata, 2009/07/10
- Re: [Qemu-devel] [PATCH 0/6] ioport related clean ups. V3, Anthony Liguori, 2009/07/10