Changeset 320 for soft/giet_vm/giet_drivers/fbf_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/fbf_driver.c (modified) (5 diffs)

soft/giet_vm/giet_drivers/fbf_driver.c

@@ -19 +19 @@
 // A CMA channel must be allocated to the task requesting it in the mapping_info,
 // and stored in the task context.
+//
+// The SEG_FBF_BASE virtual address must be defined in hard_config.h file.
 ///////////////////////////////////////////////////////////////////////////////////
-// The seg_fbf_base virtual address must be defined in giet_vsegs.ld file.
-///////////////////////////////////////////////////////////////////////////////////
 
 #include <giet_config.h>
+#include <hard_config.h>
 #include <fbf_driver.h>
 #include <utils.h>
@@ -33 +34 @@
 #include <vmem.h>
 
+#if !defined(SEG_FBF_BASE) 
+# error: You must define SEG_FBF_BASE in the hard_config.h file
+#endif
+
 #if !defined(GIET_USE_IOMMU) 
 # error: You must define GIET_USE_IOMMU in the giet_config.h file
@@ -57 +62 @@
                             unsigned int length) 
 {
-    char* fbf_address = (char *)&seg_fbf_base + offset;
+    char* fbf_address = (char *)SEG_FBF_BASE + offset;
 
     _memcpy( fbf_address, buffer, length);
@@ -74 +79 @@
                             unsigned int   length) 
 {
-    char* fbf_address = (char *)&seg_fbf_base + offset;
+    char* fbf_address = (char *)SEG_FBF_BASE + offset;
 
     _memcpy( buffer, fbf_address, length);
@@ -176 +181 @@
 
     // compute and register frame buffer physical address
-    vaddr = ((unsigned int)&seg_fbf_base);
+    vaddr = ((unsigned int)SEG_FBF_BASE);
     ko    = _v2p_translate( (page_table_t*) user_ptab, 
                          (vaddr >> 12),