X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_io.h;h=8db4f71f62c8a956bacf74cd0471c9b2b000461c;hb=f44ca084bc46b20de6414920ab3a6fe53688095f;hp=601bffe7b0366188e0dd13b3b45d62872057c9cb;hpb=a1e0475bbefa968791679c5e71232ddca522868b;p=palacios.git

diff --git a/palacios/include/palacios/vmm_io.h b/palacios/include/palacios/vmm_io.h
index 601bffe..8db4f71 100644
--- a/palacios/include/palacios/vmm_io.h
+++ b/palacios/include/palacios/vmm_io.h
@@ -1,23 +1,40 @@
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #ifndef __VMM_IO_H
 #define __VMM_IO_H
 
 
+#ifdef __V3VEE__
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_util.h>
+#include <palacios/vmm_rbtree.h>
 
+typedef struct rb_root v3_io_map_t;
 
-struct guest_info;
-struct vmm_io_hook;
 
-struct vmm_io_map {
-  uint_t num_ports;
-  struct vmm_io_hook * head;
+struct guest_info;
 
-};
+void v3_init_io_map(struct guest_info * info);
 
 
-int v3_unhook_io_port(struct guest_info * info, uint_t port);
 
 
 /* External API */
@@ -26,18 +43,12 @@ int v3_hook_io_port(struct guest_info * info, uint_t port,
 		    int (*write)(ushort_t port, void * src, uint_t length, void * priv_data), 
 		    void * priv_data);
 
-void init_vmm_io_map(struct guest_info * info);
-
-
-#ifdef __V3VEE__
-
+int v3_unhook_io_port(struct guest_info * info, uint_t port);
 
 
-// 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)
 
 
-struct vmm_io_hook {
+struct v3_io_hook {
   ushort_t port;
 
   // Reads data into the IO port (IN, INS)
@@ -47,17 +58,29 @@ struct vmm_io_hook {
   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;
+  
+  struct rb_node tree_node;
 
 };
 
 
-struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port);
+struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint_t port);
+
+
+void v3_print_io_map(struct guest_info * info);
+
+
+
+
+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);
 
-void PrintDebugIOMap(struct vmm_io_map * io_map);
 
 
 #endif // !__V3VEE__