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

Timestamp:

Jun 12, 2012, 4:21:27 PM (12 years ago)

Author:

karaoui

Message:

giet-vm new version

File:

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

soft/giet_vm/sys/sys_handler.c

@@ -12 +12 @@
 
 #include <sys_handler.h>
-#include <boot_handler.h>
+//#include <boot_handler.h>
 #include <drivers.h>
 #include <ctx_handler.h>
@@ -49 +49 @@
     &_sys_ukn,          /* 0x18 */
     &_sys_ukn,          /* 0x19 */
-    &_mwmr_base,        /* 0x1A */
+    &_vobj_get_vbase,   /* 0x1A */
     &_sys_ukn,          /* 0x1B */
     &_sys_ukn,          /* 0x1C */
@@ -117 +117 @@
                             unsigned int*       buffer)
 {
-    mapping_header_t*   header  = (mapping_header_t*)&seg_boot_mapping_base;
+    mapping_header_t*   header  = (mapping_header_t*)&seg_mapping_base;
     mapping_cluster_t*  cluster = _get_cluster_base( header );
 
@@ -131 +131 @@
 }
 /////////////////////////////////////////////////////////////////////////////
-// _mwmr_base()
-// returns in buffer argument the base address of the MWMR channel
-// identified by the (vspace_name / channel_name) couple.
+// _vobj_get_base()
+// returns 0: success, else: failed.
+// give access to the base address of a vobj identified by the (vspace_name / channel_name ) couple.
+// The "type" argument is here for checking purpose.
 /////////////////////////////////////////////////////////////////////////////
-unsigned int _mwmr_base( char* vspace_name,
-                         char* channel_name,
-                         unsigned int* buffer )
+unsigned int _vobj_get_vbase( char* vspace_name, char* vobj_name,
+                        unsigned vobj_type, unsigned int* vobj_buffer)
 {
-    mapping_header_t* header = (mapping_header_t*)&seg_boot_mapping_base;
+    mapping_header_t* header = (mapping_header_t*)&seg_mapping_base;
     mapping_vspace_t* vspace = _get_vspace_base( header );
-    mapping_vseg_t*   vseg   = _get_vseg_base( header );
+    mapping_vobj_t*    vobj  = _get_vobj_base( header );
 
     unsigned int    vspace_id;
-    unsigned int    vseg_id;
+    unsigned int    vobj_id;
+        
 
     // scan vspaces 
@@ -151 +152 @@
         if ( _strncmp( vspace[vspace_id].name, vspace_name, 31) == 0 )
         {
-            // scan vsegs
-            for ( vseg_id = vspace[vspace_id].vseg_offset ; 
-                  vseg_id < (vspace[vspace_id].vseg_offset + vspace[vspace_id].vsegs) ;
-                  vseg_id++ )
+            // scan vobjs
+            for(vobj_id= vspace[vspace_id].vobj_offset; vobj_id < (vspace[vspace_id].vobj_offset + vspace[vspace_id].vobjs); vobj_id++)
             {
-                if ( _strncmp( vseg[vseg_id].name, channel_name, 31) == 0 )
+
+                if ( _strncmp( vobj[vobj_id].name, vobj_name, 31) == 0 )
                 {
-                    *buffer = vseg[vseg_id].vbase;
+                    if(vobj[vobj_id].type != vobj_type)
+                        return -1;//wrong type
+
+                    *vobj_buffer = (unsigned int)vobj[vobj_id].vaddr;
                     return 0;
                 }
@@ -165 +168 @@
     }
     // not found !!!
-    return 1;
+    return -2;
 }