[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/14] vmport: Disentangle read handler type from
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v3 13/14] vmport: Disentangle read handler type from portio |
Date: |
Sat, 22 Jun 2013 08:07:06 +0200 |
From: Jan Kiszka <address@hidden>
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 <address@hidden>
---
hw/misc/vmport.c | 4 ++--
include/hw/i386/pc.h | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
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);
--
1.7.3.4
- [Qemu-devel] [PATCH v3 08/14] isa: implement isa_is_ioport_assigned via memory_region_find, (continued)
- [Qemu-devel] [PATCH v3 08/14] isa: implement isa_is_ioport_assigned via memory_region_find, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 02/14] applesmc: replace register_ioport*, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 04/14] i82374: replace register_ioport*, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 10/14] xen: Mark fixed platform I/O as unaligned, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 09/14] vmware-vga: Accept unaligned I/O accesses, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 14/14] ioport: Move portio types to ioport.h, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 11/14] ioport: Switch dispatching to memory core layer, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 13/14] vmport: Disentangle read handler type from portio,
Jan Kiszka <=
- [Qemu-devel] [PATCH v3 05/14] prep: replace register_ioport*, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 01/14] adlib: replace register_ioport*, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 06/14] vt82c686: replace register_ioport*, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 07/14] Privatize register_ioport_read/write, Jan Kiszka, 2013/06/22
- [Qemu-devel] [PATCH v3 12/14] ioport: Remove unused old dispatching services, Jan Kiszka, 2013/06/22
- Re: [Qemu-devel] [PATCH v3 00/14] Refactor portio dispatching, Hervé Poussineau, 2013/06/23