X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_io.h;h=96094532dfc5ba3620ba7dd2be745d263fb8d12a;hb=bc2c46a12649344d973e2201271c05390ce924bf;hp=f13eee8b98b777ab7f21ad48893ef2f6fa1677d7;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git

diff --git a/palacios/include/palacios/vmm_io.h b/palacios/include/palacios/vmm_io.h
index f13eee8..9609453 100644
--- a/palacios/include/palacios/vmm_io.h
+++ b/palacios/include/palacios/vmm_io.h
@@ -1,53 +1,76 @@
 #ifndef __VMM_IO_H
 #define __VMM_IO_H
 
-#include <palacios/vmm_types.h>
 
+
+#include <palacios/vmm_types.h>
 #include <palacios/vmm_util.h>
 
+
+struct vmm_io_hook;
+
+typedef struct vmm_io_map {
+  uint_t num_ports;
+
+
+  struct vmm_io_hook * head;
+
+} vmm_io_map_t;
+
+
+int v3_unhook_io_port(vmm_io_map_t * io_map, uint_t port);
+
+
+/* External API */
+int v3_hook_io_port(vmm_io_map_t * io_map, uint_t port, 
+		    int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data),
+		    int (*write)(ushort_t port, void * src, uint_t length, void * priv_data), 
+		    void * priv_data);
+
+void init_vmm_io_map(vmm_io_map_t * io_map);
+
+
+
+struct vmm_io_hook * v3_get_io_hook(vmm_io_map_t * io_map, uint_t port);
+
+
+
+
+#ifdef __V3VEE__
+
+
 // FOREACH_IO_HOOK(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook)
 #define FOREACH_IO_HOOK(io_map, io_hook) for (io_hook = (io_map).head; io_hook != NULL; io_hook = (io_hook)->next)
 
 
-typedef struct vmm_io_hook {
+struct vmm_io_hook {
   ushort_t port;
 
   // Reads data into the IO port (IN, INS)
-  int (*read)(ushort_t port, void * dst, uint_t length);
+  int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data);
 
   // Writes data from the IO port (OUT, OUTS)
-  int (*write)(ushort_t port, void * src, uint_t length);
+  int (*write)(ushort_t port, void * src, uint_t length, void * priv_data);
+
+  void * priv_data;
 
   struct vmm_io_hook * next;
   struct vmm_io_hook * prev;
 
-} vmm_io_hook_t;
+};
 
+typedef struct vmm_io_hook vmm_io_hook_t;
 
-typedef struct vmm_io_map {
-  uint_t num_ports;
 
 
-  vmm_io_hook_t * head;
-
-} vmm_io_map_t;
-
-
-void add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook);
-
 
+void PrintDebugIOMap(vmm_io_map_t * io_map);
 
-vmm_io_hook_t * get_io_hook(vmm_io_map_t * io_map, uint_t port);
 
+#endif // !__V3VEE__
 
-/* External API */
-void hook_io_port(vmm_io_map_t * io_map, uint_t port, 
-		  int (*read)(ushort_t port, void * dst, uint_t length),
-		  int (*write)(ushort_t port, void * src, uint_t length));
 
-void init_vmm_io_map(vmm_io_map_t * io_map);
 
-void PrintDebugIOMap(vmm_io_map_t * io_map);
 
 
 #endif