X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=9a9629f7689386d5ab6c4020dd99feca792eeb1f;hb=72396466a6eeb253948862b334a8534ab29313fe;hp=350eb29132f45a96367b84b2a71df1129d858d75;hpb=a27a60b911afe29329cf93b23e274e0ef182093e;p=palacios.git

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index 350eb29..9a9629f 100644
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -4,6 +4,10 @@
 
 extern struct vmm_os_hooks * os_hooks;
 
+
+
+
+
 void init_vmm_io_map(vmm_io_map_t * io_map) {
   io_map->num_ports = 0;
   io_map->head = NULL;
@@ -11,52 +15,58 @@ void init_vmm_io_map(vmm_io_map_t * io_map) {
 
 
 
-void add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
-  vmm_io_hook_t * tmp_hook = io_map->head;
+int add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
 
-  if (!tmp_hook) {
+  if (!(io_map->head)) {
     io_map->head = io_hook;
     io_map->num_ports = 1;
-    return;
+    return 0;
+  } else if (io_map->head->port > io_hook->port) {
+    io_hook->next = io_map->head;
+
+    io_map->head->prev = io_hook;
+    io_map->head = io_hook;
+    io_map->num_ports++;
+
+    return 0;
   } else {
+    vmm_io_hook_t * tmp_hook = io_map->head;
+    
     while ((tmp_hook->next)  && 
 	   (tmp_hook->next->port <= io_hook->port)) {
-      tmp_hook = tmp_hook->next;
+	tmp_hook = tmp_hook->next;
     }
     
     if (tmp_hook->port == io_hook->port) {
-      tmp_hook->read = io_hook->read;
-      tmp_hook->write = io_hook->write;
-      
-      VMMFree(io_hook);
-      return;
-    } else if (!tmp_hook->next) {
-      tmp_hook->next = io_hook;
-      io_hook->prev = tmp_hook;
-      io_map->num_ports++;
+      //tmp_hook->read = io_hook->read;
+      //tmp_hook->write = io_hook->write;
       
-      return;
+      //V3_Free(io_hook);
+      return -1;
     } else {
-      io_hook->next = tmp_hook->next;
       io_hook->prev = tmp_hook;
-      
-      tmp_hook->next = io_hook;
-      if (io_hook->next) {
-	io_hook->next->prev = io_hook;
+      io_hook->next = tmp_hook->next;
+
+      if (tmp_hook->next) {
+	tmp_hook->next->prev = io_hook;
       }
-      
+
+      tmp_hook->next = io_hook;
+
       io_map->num_ports++;
-      return;
+      return 0;
     }
   }
+  return -1;
 }
 
-void remove_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
+int remove_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
   if (io_map->head == io_hook) {
     io_map->head = io_hook->next;
   } else if (io_hook->prev) {
     io_hook->prev->next = io_hook->next;
   } else {
+    return -1;
     // data corruption failure
   }
   
@@ -66,27 +76,87 @@ void remove_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
 
   io_map->num_ports--;
 
-  return;
+  return 0;
+}
+
+
+
+/* FIX ME */
+static int default_write(ushort_t port, void *src, uint_t length, void * priv_data) {
+  /*
+    
+  if (length == 1) {
+  __asm__ __volatile__ (
+  "outb %b0, %w1"
+  :
+  : "a" (*dst), "Nd" (port)
+  );
+  } else if (length == 2) {
+  __asm__ __volatile__ (
+  "outw %b0, %w1"
+  :
+  : "a" (*dst), "Nd" (port)
+  );
+  } else if (length == 4) {
+  __asm__ __volatile__ (
+  "outw %b0, %w1"
+  :
+  : "a" (*dst), "Nd" (port)
+  );
+  }
+  */
+  return 0;
 }
 
+static int default_read(ushort_t port, void * dst, uint_t length, void * priv_data)
+{
+
+  /*    
+	uchar_t value;
+
+    __asm__ __volatile__ (
+	"inb %w1, %b0"
+	: "=a" (value)
+	: "Nd" (port)
+    );
 
-void hook_io_port(vmm_io_map_t * io_map, 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) {
+    return value;
+  */
+
+  return 0;
+}
+
+int hook_io_port(vmm_io_map_t * io_map, 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) {
   vmm_io_hook_t * io_hook = os_hooks->malloc(sizeof(vmm_io_hook_t));
 
   io_hook->port = port;
-  io_hook->read = read;
-  io_hook->write = write;
+
+  if (!read) {
+    io_hook->read = &default_read;
+  } else {
+    io_hook->read = read;
+  }
+
+  if (!write) {
+    io_hook->write = &default_write;
+  } else {
+    io_hook->write = write;
+  }
+
   io_hook->next = NULL;
   io_hook->prev = NULL;
 
   io_hook->priv_data = priv_data;
 
-  add_io_hook(io_map, io_hook);
+  if (add_io_hook(io_map, io_hook) != 0) {
+    V3_Free(io_hook);
+    return -1;
+  }
 
-  return;
+  return 0;
 }
 
 int unhook_io_port(vmm_io_map_t * io_map, uint_t port) {