import of new ramdisk

[palacios.git] / palacios / src / devices / generic.c

diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c
index 3734a56..b16dd07 100644 (file)
--- a/palacios/src/devices/generic.c
+++ b/palacios/src/devices/generic.c
@@ -1,6 +1,7 @@
 /* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
 /* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
 
+
 #include <devices/generic.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_types.h>
@@ -28,15 +29,6 @@ struct generic_internal {
 };
 
 
-  
-#ifdef RAMDISK_BOOT
-#include <devices/ramdisk.h>
-//ramdisk_state
-static struct ramdisk_t *ramdisk_state;
-#endif    
-
-
-
 
 int generic_reset_device(struct vm_device * dev)
 {
@@ -81,18 +73,6 @@ int generic_write_port_passthrough(ushort_t port,
   
   PrintDebug(" to port 0x%x ... ", port);
 
-#ifdef RAMDISK_BOOT
-
-  uint_t err;
-
-  if (((port >= 0x170 && port <= 0x177) || port == 0x376 || port == 0x377)
-      && (dev->vm->cpu_mode == REAL)) {
-
-    
-    err = ramdisk_state->eops.write_port(port, src, length, dev);
-
-  }else{
-#endif
 
   switch (length) {
   case 1:
@@ -109,9 +89,8 @@ int generic_write_port_passthrough(ushort_t port,
       Out_Byte(port, ((uchar_t*)src)[i]);
     }
   } //switch length
-#ifdef RAMDISK_BOOT
-  }//else not ramdisk
-#endif
+
+
   PrintDebug(" done\n");
   
   return length;
@@ -126,17 +105,6 @@ int generic_read_port_passthrough(ushort_t port,
 
   PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port);
 
-#ifdef RAMDISK_BOOT
-
-  uint_t err;
-
-  if (((port >= 0x170 && port <= 0x177) || port == 0x376 || port == 0x377)
-      && (dev->vm->cpu_mode == REAL)) {
-
-    err = ramdisk_state->eops.read_port(port, src, length, dev);
-
-  }else{
-#endif
 
     switch (length) {
     case 1:
@@ -153,9 +121,6 @@ int generic_read_port_passthrough(ushort_t port,
        ((uchar_t*)src)[i] = In_Byte(port);
       }
     }//switch length
-#ifdef RAMDISK_BOOT
-  }//else not ramdisk
-#endif
 
   PrintDebug(" done ... read 0x");
 
@@ -185,18 +150,6 @@ int generic_write_port_ignore(ushort_t port,
 
   PrintDebug(" ignored\n");
  
-#ifdef RAMDISK_BOOT
-
-  uint_t err;
-
-  if (((port >= 0x3e8 && port <= 0x3ef) || 
-       (port >= 0x2e8 && port <= 0x2ef))
-      && (dev->vm->cpu_mode == REAL)) {
-
-    err = ramdisk_state->eops.write_port_ignore(port, src, length, dev);
-  }
-#endif
- 
   return length;
 }
 
@@ -211,18 +164,6 @@ int generic_read_port_ignore(ushort_t port,
   memset((char*)src,0,length);
   PrintDebug(" ignored (return zeroed buffer)\n");
 
-#ifdef RAMDISK_BOOT
-
-  uint_t err;
-
-  if (((port >= 0x3e8 && port <= 0x3ef) || 
-       (port >= 0x2e8 && port <= 0x2ef))
-      && (dev->vm->cpu_mode == REAL)) {
-
-    err = ramdisk_state->eops.read_port_ignore(port, src, length, dev);
-  }
-#endif
-
   return length;
 }
 
@@ -301,12 +242,6 @@ int generic_init_device(struct vm_device * dev)
 
   }
 
-#ifdef RAMDISK_BOOT
-
-  ramdisk_state->cops.init(ramdisk_state, dev);
-
-#endif
-
   return 0;
 }
 
@@ -317,11 +252,6 @@ int generic_deinit_device(struct vm_device *dev)
 
   PrintDebug("generic: deinit_device\n");
 
-#ifdef RAMDISK_BOOT
-
-  ramdisk_state->cops.close(ramdisk_state);
-  
-#endif
 
   for (i = 0; i < state->num_irq_ranges; i++) { 
     PrintDebug("generic: unhooking irqs 0x%x to 0x%x\n", state->irq_ranges[i][0], state->irq_ranges[i][1]);
@@ -449,13 +379,6 @@ struct vm_device *create_generic(generic_port_range_type    port_ranges[],
     generic_state->irq_ranges = NULL;
   }
 
-#ifdef RAMDISK_BOOT
-
-  ramdisk_state = create_ramdisk();
-  V3_ASSERT(ramdisk_state != NULL);
-
-#endif
-
   struct vm_device *device = create_device("GENERIC", &dev_ops, generic_state);
 
   return device;