Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/kernel/time_manage.c

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/kernel/time_manage.c (modified) (4 diffs)

EcnlProtoTool/trunk/asp3_dcre/kernel/time_manage.c

@@ -53 +53 @@
 #include "time_event.h"
 #include "target_timer.h"
+#include <sil.h>
 
 /*
@@ -98 +99 @@
 {
         ER              ercd;
+        bool_t lock;
 
         LOG_SET_TIM_ENTER(systim);
-        CHECK_TSKCTX_UNL();                                                     /*［NGKI3564］［NGKI3565］*/
-
-        lock_cpu();
+        //CHECK_TSKCTX_UNL();                                                   /*［NGKI3564］［NGKI3565］*/
+        CHECK_TSKCTX();
+        lock = sense_lock();
+
+        if (!lock)
+                lock_cpu();
         update_current_evttim();                                        /*［ASPD1059］*/
         systim_offset = systim - monotonic_evttim;      /*［ASPD1060］*/
         ercd = E_OK;
-        unlock_cpu();
+        if (!lock)
+                unlock_cpu();
 
   error_exit:
@@ -124 +130 @@
 {
         ER              ercd;
+        bool_t lock;
 
         LOG_GET_TIM_ENTER(p_systim);
-        CHECK_TSKCTX_UNL();                                                     /*［NGKI2350］［NGKI2351］*/
-
-        lock_cpu();
+        //CHECK_TSKCTX_UNL();                                                   /*［NGKI2350］［NGKI2351］*/
+        CHECK_TSKCTX();
+        lock = sense_lock();
+
+        if (!lock)
+                lock_cpu();
         update_current_evttim();                                        /*［ASPD1057］*/
         *p_systim = systim_offset + monotonic_evttim;   /*［ASPD1058］*/
         ercd = E_OK;
-        unlock_cpu();
+        if (!lock)
+                unlock_cpu();
 
   error_exit:
@@ -176 +187 @@
                 }
 
-                set_hrt_event();                                                /*［ASPD1056］*/
+                if (!in_signal_time) {
+                        set_hrt_event();                                        /*［ASPD1056］*/
+                }
                 ercd = E_OK;
         }