source code clean up,

[palacios.git] / palacios / src / palacios / vmm_io.c

diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c
index 350eb29..91fef14 100644 (file)
--- a/palacios/src/palacios/vmm_io.c
+++ b/palacios/src/palacios/vmm_io.c
@@ -2,7 +2,14 @@
 #include <palacios/vmm_string.h>
 #include <palacios/vmm.h>
 
-extern struct vmm_os_hooks * os_hooks;
+
+
+
+#ifndef DEBUG_IO
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 
 void init_vmm_io_map(vmm_io_map_t * io_map) {
   io_map->num_ports = 0;
@@ -11,52 +18,59 @@ 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;
 
-  if (!tmp_hook) {
+
+static int add_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_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++;
-      
-      return;
+      //tmp_hook->read = io_hook->read;
+      //tmp_hook->write = io_hook->write;
+      //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) {
+static 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,31 +80,91 @@ void remove_io_hook(vmm_io_map_t * io_map, vmm_io_hook_t * io_hook) {
 
   io_map->num_ports--;
 
-  return;
+  return 0;
 }
 
 
-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) {
-  vmm_io_hook_t * io_hook = os_hooks->malloc(sizeof(vmm_io_hook_t));
+
+/* 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)
+    );
+
+    return value;
+  */
+
+  return 0;
+}
+
+int v3_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 = (vmm_io_hook_t *)V3_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) {
-  vmm_io_hook_t * hook = get_io_hook(io_map, port);
+int v3_unhook_io_port(vmm_io_map_t * io_map, uint_t port) {
+  vmm_io_hook_t * hook = v3_get_io_hook(io_map, port);
 
   if (hook == NULL) {
     return -1;
@@ -101,7 +175,7 @@ int unhook_io_port(vmm_io_map_t * io_map, uint_t port) {
 }
 
 
-vmm_io_hook_t * get_io_hook(vmm_io_map_t * io_map, uint_t port) {
+vmm_io_hook_t * v3_get_io_hook(vmm_io_map_t * io_map, uint_t port) {
   vmm_io_hook_t * tmp_hook;
   FOREACH_IO_HOOK(*io_map, tmp_hook) {
     if (tmp_hook->port == port) {