X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_io.h;h=1ceff4df6f6f0d1176a3f0442671408f92e6c147;hb=3a4e54ec208ea3589963b410d2d73292bbc4a8fe;hp=242554b8de7d5105afc2d43878e3638ac2b4d104;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.git

diff --git a/palacios/include/palacios/vmm_io.h b/palacios/include/palacios/vmm_io.h
index 242554b..1ceff4d 100644
--- a/palacios/include/palacios/vmm_io.h
+++ b/palacios/include/palacios/vmm_io.h
@@ -25,72 +25,71 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_util.h>
+#include <palacios/vmm_rbtree.h>
 
 
-struct guest_info;
 
-int v3_unhook_io_port(struct guest_info * info, uint_t port);
 
+struct guest_info;
+
+void v3_init_io_map(struct guest_info * info);
 
-/* 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);
 
 
 
+/* External API */
+int v3_hook_io_port(struct guest_info * info, uint16_t port, 
+		    int (*read)(uint16_t port, void * dst, uint_t length, void * priv_data),
+		    int (*write)(uint16_t port, void * src, uint_t length, void * priv_data), 
+		    void * priv_data);
 
+int v3_unhook_io_port(struct guest_info * info, uint16_t port);
 
 
-struct vmm_io_hook;
 
-struct vmm_io_map {
-  uint_t num_ports;
-  struct vmm_io_hook * head;
 
-};
 
+struct v3_io_hook {
+    uint16_t port;
 
-void init_vmm_io_map(struct guest_info * info);
+    // Reads data into the IO port (IN, INS)
+    int (*read)(uint16_t port, void * dst, uint_t length, void * priv_data);
 
-// 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)
+    // Writes data from the IO port (OUT, OUTS)
+    int (*write)(uint16_t port, void * src, uint_t length, void * priv_data);
 
 
-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, void * priv_data);
+    void * priv_data;
+  
+    struct rb_node tree_node;
 
-  // Writes data from the IO port (OUT, OUTS)
-  int (*write)(ushort_t port, void * src, uint_t length, void * priv_data);
+};
 
-  void * priv_data;
+struct v3_io_map {
+    struct rb_root map;
 
-  struct vmm_io_hook * next;
-  struct vmm_io_hook * prev;
+    int (*update_map)(struct guest_info * info, uint16_t port, int hook_read, int hook_write);
 
+    void * arch_data;
 };
 
-
-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, uint16_t port);
 
 
-void PrintDebugIOMap(struct vmm_io_map * io_map);
+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_outb(uint16_t port, uint8_t value);
+uint8_t v3_inb(uint16_t port);
 
-void v3_outw(ushort_t port, ushort_t value);
-ushort_t v3_inw(ushort_t port);
+void v3_outw(uint16_t port, uint16_t value);
+uint16_t v3_inw(uint16_t port);
 
-void v3_outdw(ushort_t port, uint_t value);
-uint_t v3_indw(ushort_t port);
+void v3_outdw(uint16_t port, uint_t value);
+uint_t v3_indw(uint16_t port);