more clean up changes

[palacios.git] / palacios / include / palacios / vmm_io.h

diff --git a/palacios/include/palacios/vmm_io.h b/palacios/include/palacios/vmm_io.h
index 14c2e76..6e85f7e 100644 (file)
--- a/palacios/include/palacios/vmm_io.h
+++ b/palacios/include/palacios/vmm_io.h
@@ -1,15 +1,45 @@
 #ifndef __VMM_IO_H
 #define __VMM_IO_H
 
-#include <palacios/vmm_types.h>
 
+
+#include <palacios/vmm_types.h>
 #include <palacios/vmm_util.h>
 
+
+struct guest_info;
+
+int v3_unhook_io_port(struct guest_info * info, uint_t port);
+
+
+/* External API */
+int v3_hook_io_port(struct guest_info * info, 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);
+
+
+
+
+#ifdef __V3VEE__
+
+
+struct vmm_io_hook;
+
+struct vmm_io_map {
+  uint_t num_ports;
+  struct vmm_io_hook * head;
+
+};
+
+
+void init_vmm_io_map(struct guest_info * info);
+
 // 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)
@@ -23,36 +53,19 @@ typedef struct vmm_io_hook {
   struct vmm_io_hook * next;
   struct vmm_io_hook * prev;
 
-} vmm_io_hook_t;
+};
 
 
-typedef struct vmm_io_map {
-  uint_t num_ports;
+struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port);
 
 
-  vmm_io_hook_t * head;
+void PrintDebugIOMap(struct vmm_io_map * io_map);
 
-} vmm_io_map_t;
 
+#endif // !__V3VEE__
 
-void add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook);
-
-void remove_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook);
-
-vmm_io_hook_t * get_io_hook(vmm_io_map_t * io_map, uint_t port);
-
-
-/* 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, void * priv_data),
-                 int (*write)(ushort_t port, void * src, uint_t length, void * priv_data), 
-                 void * priv_data );
-
-int unhook_io_port(vmm_io_map_t * io_map, uint_t port);
 
-void init_vmm_io_map(vmm_io_map_t * io_map);
 
-void PrintDebugIOMap(vmm_io_map_t * io_map);
 
 
 #endif