Changeset 320 for soft/giet_vm/giet_drivers/rdk_driver.c

Timestamp:

Jun 10, 2014, 12:33:23 PM (10 years ago)

Author:

alain

Message:

All drivers have been modified to use only the information
contained in the hard_config.h file

File:

• soft/giet_vm/giet_drivers/rdk_driver.c (modified) (3 diffs)

soft/giet_vm/giet_drivers/rdk_driver.c

@@ -15 +15 @@
 // As the number of concurrent accesses is not bounded, these functions
 // don't use the _ioc_lock variable.
+//
+// The SEG_RDK_BASE virtual address must be defined in the hard_config.h
+// file when the USE_RAMDISK flag is set.
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <giet_config.h>
+#include <hard_config.h>
 #include <rdk_driver.h>
 #include <utils.h>
 #include <tty_driver.h>
 #include <ctx_handler.h>
+
+#if !defined(SEG_RDK_BASE) 
+# error: You must define SEG_RDK_BASE in the hard_config.h file
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -54 +62 @@
 #endif
 
-    char* src = (char*)&seg_ram_disk_base + (512*lba);
+#if USE_RAM_DISK
+    char* src = (char*)SEG_RDK_BASE + (512*lba);
     char* dst = (char*)buffer;
     _memcpy( dst, src, count*512 );
-
     return 0;
+#else
+    _printf("[GIET ERROR] _rdk_read() should not be used if USE_RAM_DISK not set\n");
+    return 1;
+#endif
 }
 
@@ -83 +95 @@
 #endif
 
-    char* dst = (char*)&seg_ram_disk_base + (512*lba);
+#if USE_RAM_DISK
+    char* dst = (char*)SEG_RDK_BASE + (512*lba);
     char* src = (char*)buffer;
     _memcpy( dst, src, count*512 );
-
     return 0;
+#else
+    _printf("[GIET ERROR] _rdk_write() should not be used if USE_RAM_DISK not set\n");
+    return 1;
+#endif
 }