X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_io.h;h=e2f4be5239608e985255daac9a55054fe706ef7f;hb=29e825c5f095066bbb5ebbec5a5af1419d883264;hp=b1e211c05495b297b4390ac3dd0d6b76e29b8141;hpb=56f8088296ee4116a4811a2f4f843edd80a7748d;p=palacios.git

diff --git a/palacios/include/palacios/vmm_io.h b/palacios/include/palacios/vmm_io.h
index b1e211c..e2f4be5 100644
--- a/palacios/include/palacios/vmm_io.h
+++ b/palacios/include/palacios/vmm_io.h
@@ -1,68 +1,96 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/*
+ * 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>
+
+
 
 
 struct guest_info;
 
-int v3_unhook_io_port(struct guest_info * info, uint_t port);
+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), 
+		    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, uint_t port);
 
 
 
-#ifdef __V3VEE__
 
 
-struct vmm_io_hook;
+struct v3_io_hook {
+    uint16_t port;
 
-struct vmm_io_map {
-  uint_t num_ports;
-  struct vmm_io_hook * head;
+    // Reads data into the IO port (IN, INS)
+    int (*read)(uint16_t port, void * dst, uint_t length, void * priv_data);
 
-};
+    // Writes data from the IO port (OUT, OUTS)
+    int (*write)(uint16_t port, void * src, uint_t length, void * priv_data);
 
 
-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)
+    void * priv_data;
+  
+    struct rb_node tree_node;
 
+};
 
-struct vmm_io_hook {
-  ushort_t port;
+struct v3_io_map {
+    struct rb_root map;
 
-  // Reads data into the IO port (IN, INS)
-  int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data);
+    int (*update_map)(struct guest_info * info, uint16_t port, int hook_read, int hook_write);
 
-  // Writes data from the IO port (OUT, OUTS)
-  int (*write)(ushort_t port, void * src, uint_t length, void * priv_data);
+    void * arch_data;
+};
+
+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 * priv_data;
 
-  struct vmm_io_hook * next;
-  struct vmm_io_hook * prev;
 
-};
 
+void v3_outb(uint16_t port, uint8_t value);
+uint8_t v3_inb(uint16_t port);
 
-struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port);
+void v3_outw(uint16_t port, uint16_t value);
+uint16_t v3_inw(uint16_t port);
 
+void v3_outdw(uint16_t port, uint_t value);
+uint_t v3_indw(uint16_t port);
 
-void PrintDebugIOMap(struct vmm_io_map * io_map);
 
 
 #endif // !__V3VEE__