removed references to GeekOS and added some namespace 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 1b4ff8a..827d7e7 100644 (file)
--- a/palacios/include/palacios/vmm_io.h
+++ b/palacios/include/palacios/vmm_io.h
@@ -1,43 +1,42 @@
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
 #ifndef __VMM_IO_H
 #define __VMM_IO_H
 
 
+#ifdef __V3VEE__
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_util.h>
 
 
-struct vmm_io_hook;
-
-struct vmm_io_map {
-  uint_t num_ports;
-
-
-  struct vmm_io_hook * head;
-
-};
+struct guest_info;
 
-
-int v3_unhook_io_port(struct vmm_io_map * io_map, uint_t port);
+int v3_unhook_io_port(struct guest_info * info, uint_t port);
 
 
 /* External API */
-int v3_hook_io_port(struct vmm_io_map * io_map, uint_t port, 
+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);
 
-void init_vmm_io_map(struct vmm_io_map * io_map);
 
 
 
-struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port);
 
 
+struct vmm_io_hook;
+
+struct vmm_io_map {
+  uint_t num_ports;
+  struct vmm_io_hook * head;
 
+};
 
-#ifdef __V3VEE__
 
+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)
@@ -60,11 +59,23 @@ struct vmm_io_hook {
 };
 
 
+struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port);
+
+
+void PrintDebugIOMap(struct vmm_io_map * io_map);
 
 
 
 
-void PrintDebugIOMap(struct vmm_io_map * io_map);
+void v3_outb(ushort_t port, uchar_t value);
+uchar_t v3_inb(ushort_t port);
+
+void v3_outw(ushort_t port, ushort_t value);
+ushort_t v3_inw(ushort_t port);
+
+void v3_outdw(ushort_t port, uint_t value);
+uint_t v3_indw(ushort_t port);
+
 
 
 #endif // !__V3VEE__