Patchwork [v3,13/14] vmport: Disentangle read handler type from portio

login
register
mail settings
Submitter Jan Kiszka
Date June 22, 2013, 6:07 a.m.
Message ID <70ced61c00008dee55d4aaccbb55b5435767cf5d.1371881222.git.jan.kiszka@web.de>
Download mbox | patch
Permalink /patch/253342/
State New
Headers show

Comments

Jan Kiszka - June 22, 2013, 6:07 a.m.
From: Jan Kiszka <jan.kiszka@siemens.com>

In case the latter may vanish one day, make sure the vmport read handler
type will remain unaffected. This is also conceptually cleaner.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 hw/misc/vmport.c     |    4 ++--
 include/hw/i386/pc.h |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

Patch

diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c
index 57b71f5..eb9059e 100644
--- a/hw/misc/vmport.c
+++ b/hw/misc/vmport.c
@@ -43,13 +43,13 @@  typedef struct VMPortState
     ISADevice parent_obj;
 
     MemoryRegion io;
-    IOPortReadFunc *func[VMPORT_ENTRIES];
+    VMPortReadFunc *func[VMPORT_ENTRIES];
     void *opaque[VMPORT_ENTRIES];
 } VMPortState;
 
 static VMPortState *port_state;
 
-void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque)
+void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque)
 {
     if (command >= VMPORT_ENTRIES)
         return;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 7f04967..3a89ce3 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -3,7 +3,6 @@ 
 
 #include "qemu-common.h"
 #include "exec/memory.h"
-#include "exec/ioport.h"
 #include "hw/isa/isa.h"
 #include "hw/block/fdc.h"
 #include "net/net.h"
@@ -56,11 +55,14 @@  typedef struct GSIState {
 void gsi_handler(void *opaque, int n, int level);
 
 /* vmport.c */
+typedef uint32_t (VMPortReadFunc)(void *opaque, uint32_t address);
+
 static inline void vmport_init(ISABus *bus)
 {
     isa_create_simple(bus, "vmport");
 }
-void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque);
+
+void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque);
 void vmmouse_get_data(uint32_t *data);
 void vmmouse_set_data(const uint32_t *data);