Changeset 97

Timestamp:

06/12/2007 10:40:43 PM (5 years ago)

Author:

agr

Message:

remove bad projects

Location:

nano-RK

Files:

• projects/micro_climate (deleted)
• projects/sensor_test (deleted)
• projects/slam_signals (deleted)
• src/kernel/source/nrk_error.c (modified) (2 diffs)
• src/kernel/source/nrk_events.c (modified) (6 diffs)

nano-RK/src/kernel/source/nrk_error.c

@@ -39 +39 @@
 {
   nrk_cur_task_TCB->errno = error_code;
-} uint8_t nrk_errno_get () 
+} 
+
+uint8_t nrk_errno_get () 
 {
   return nrk_cur_task_TCB->errno;
 }
+
 void nrk_error_add (uint8_t n) 
 {
@@ -61 +64 @@
   
 #endif  /*  */
-} uint8_t nrk_error_get (uint8_t * task_id, uint8_t * code) 
+} 
+
+
+uint8_t nrk_error_get (uint8_t * task_id, uint8_t * code) 
 {
   if (error_num == 0)

nano-RK/src/kernel/source/nrk_events.c

@@ -73 +73 @@
         sig_mask=SIG(sig_id);
 
-        if( (sig_mask & _nrk_signal_list)==0) return NRK_ERROR;
+        if( (sig_mask & _nrk_signal_list)==0) return NRK_ERROR; 
 
         nrk_int_disable();
@@ -95 +95 @@
         nrk_int_enable();
 
-        return NRK_ERROR;
+        return NRK_OK;
 }
 
@@ -137 +137 @@
         sig_mask=SIG(sig_id);
         // Check if signal was created
-        if((sig_mask & _nrk_signal_list)==0 ) { nrk_kprintf( PSTR("Sig not created")); return NRK_ERROR;}
+        // Signal was not created
+        if((sig_mask & _nrk_signal_list)==0 ) { _nrk_errno_set(1); return NRK_ERROR;}
         
         //needs to be atomic otherwise run the risk of multiple tasks being scheduled late and not in order of priority.  
@@ -178 +179 @@
                 return NRK_OK;
         } 
+        // No task was waiting on the signal
+        _nrk_errno_set(2);
         return NRK_ERROR;
 }
@@ -210 +213 @@
         int8_t id;
         id=nrk_get_resource_index(rsrc);  
-        if(id==-1) return NRK_ERROR;    
-        if(id==NRK_MAX_RESOURCE_CNT) return -1;
+        if(id==-1) { _nrk_errno_set(1); return NRK_ERROR;}
+        if(id==NRK_MAX_RESOURCE_CNT) { _nrk_errno_set(2); return NRK_ERROR; }
         
         if(nrk_resource_value[id]==0)
@@ -234 +237 @@
         int8_t id=nrk_get_resource_index(rsrc); 
         int8_t task_ID;
-        if(id==-1) return NRK_ERROR;    
-        if(id>=NRK_MAX_RESOURCE_CNT) return NRK_ERROR;
+        if(id==-1) { _nrk_errno_set(1); return NRK_ERROR;}
+        if(id==NRK_MAX_RESOURCE_CNT) { _nrk_errno_set(2); return NRK_ERROR; }
 
         if(nrk_resource_value[id]<nrk_resource_count[id])