X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_io.h;h=726f75a162fc9732a48d328f96c70796192b5a9c;hb=63fc27a4eedc44a349cf8fde14e4c1b2401b4100;hp=8db4f71f62c8a956bacf74cd0471c9b2b000461c;hpb=a6865d183eedbdf3e5510e4be89dcb5ce51b5953;p=palacios.git

diff --git a/palacios/include/palacios/vmm_io.h b/palacios/include/palacios/vmm_io.h
index 8db4f71..726f75a 100644
--- a/palacios/include/palacios/vmm_io.h
+++ b/palacios/include/palacios/vmm_io.h
@@ -27,59 +27,67 @@
 #include <palacios/vmm_util.h>
 #include <palacios/vmm_rbtree.h>
 
-typedef struct rb_root v3_io_map_t;
 
 
+
+struct v3_vm_info;
 struct guest_info;
 
-void v3_init_io_map(struct guest_info * info);
+void v3_init_io_map(struct v3_vm_info * vm);
 
 
 
 
 /* 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), 
+int v3_hook_io_port(struct v3_vm_info * vm, uint16_t port, 
+		    int (*read)(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data),
+		    int (*write)(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data), 
 		    void * priv_data);
 
-int v3_unhook_io_port(struct guest_info * info, uint_t port);
+int v3_unhook_io_port(struct v3_vm_info * vm, uint16_t port);
+
 
 
 
 
 struct v3_io_hook {
-  ushort_t port;
+    uint16_t port;
 
-  // Reads data into the IO port (IN, INS)
-  int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data);
+    // Reads data into the IO port (IN, INS)
+    int (*read)(struct guest_info * core, uint16_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, void * priv_data);
+    // Writes data from the IO port (OUT, OUTS)
+    int (*write)(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data);
 
-  void * priv_data;
+    void * priv_data;
   
-  struct rb_node tree_node;
-
+    struct rb_node tree_node;
 };
 
+struct v3_io_map {
+    struct rb_root map;
 
-struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint_t port);
+    int (*update_map)(struct v3_vm_info * vm, uint16_t port, int hook_read, int hook_write);
+
+    void * arch_data;
+};
 
+struct v3_io_hook * v3_get_io_hook(struct v3_vm_info * vm, uint16_t port);
 
-void v3_print_io_map(struct guest_info * info);
 
+void v3_print_io_map(struct v3_vm_info * vm);
 
+void v3_refresh_io_map(struct v3_vm_info * vm);
 
 
-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);