Changeset 215 for soft/giet_vm/sys/sys_handler.c

Timestamp:

Sep 17, 2012, 10:47:46 AM (12 years ago)

Author:

karaoui

Message:

New components are now mandotory in the XML description:

• Timer/Icu? or Xicu
• Dma

The files giet_vsegs.ld and hard_config.h are now autogenerated by the xml2bin tool.

File:

• soft/giet_vm/sys/sys_handler.c (modified) (3 diffs)

soft/giet_vm/sys/sys_handler.c

@@ -139 +139 @@
 }
 
-/////////////////////////////////////////////////////////////////////////////
-// _vobj_get_vbase()
-// This function writes in vobj_buffer the virtual base address of a vobj 
-// identified by the (vspace_name / vobj_name ) couple.
-// The vobj_type argument is redundant, and for checking purpose.
-// returns 0: success, else: failed.
-/////////////////////////////////////////////////////////////////////////////
-unsigned int _vobj_get_vbase( char*                     vspace_name, 
-                              char*                     vobj_name,
-                              unsigned int      vobj_type, 
-                              unsigned int* vobj_vaddr )
+int _get_vobj( char* vspace_name, char* vobj_name, unsigned int vobj_type, mapping_vobj_t** res_vobj)
 {
     mapping_header_t* header = (mapping_header_t*)&seg_mapping_base;
@@ -175 +165 @@
                         return -1;                                                      //wrong type
 
-                    *vobj_vaddr = (unsigned int)vobj[vobj_id].vaddr;
+                    *res_vobj = &vobj[vobj_id];
+
                     return 0;
                 }
@@ -182 +173 @@
     } 
     return -2;          //not found 
-}
-
+
+}
+/////////////////////////////////////////////////////////////////////////////
+// _vobj_get_vbase()
+// This function writes in vobj_vaddr the virtual base address of a vobj 
+// identified by the (vspace_name / vobj_name ) couple.
+// The vobj_type argument is here only for the purpose of checking .
+// returns 0: success, else: failed.
+/////////////////////////////////////////////////////////////////////////////
+unsigned int _vobj_get_vbase( char*                     vspace_name, 
+                              char*                     vobj_name,
+                              unsigned int      vobj_type, 
+                              unsigned int* vobj_vaddr )
+{
+    mapping_vobj_t*   res_vobj;
+    unsigned int ret;
+    if( (ret = _get_vobj(vspace_name, vobj_name, vobj_type, &res_vobj)) )
+    {
+        return ret;
+    }
+    
+    *vobj_vaddr = res_vobj->vaddr;
+
+    return 0;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// _vobj_get_length()
+// This function writes in vobj_length the virtual base address of a vobj 
+// identified by the (vspace_name / vobj_name ) couple.
+// The vobj_type argument is here only for the purpose of checking .
+// returns 0: success, else: failed.
+/////////////////////////////////////////////////////////////////////////////
+unsigned int _vobj_get_length(char*                     vspace_name, 
+                              char*                     vobj_name,
+                              unsigned int      vobj_type, 
+                              unsigned int* vobj_length )
+{
+
+    mapping_vobj_t*   res_vobj;
+    unsigned int ret;
+    if( (ret = _get_vobj(vspace_name, vobj_name, vobj_type, &res_vobj)) )
+    {
+        return ret;
+    }
+    
+    *vobj_length = res_vobj->length;
+
+    return 0;
+}