Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/kernel/sys_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/sys_manage.c (modified) (4 diffs)

EcnlProtoTool/trunk/asp3_dcre/kernel/sys_manage.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2015 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2019 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -184 +184 @@
                 }
                 else {
-                        request_dispatch();
+                        request_dispatch_retint();
                 }
         }
@@ -205 +205 @@
 get_tid(ID *p_tskid)
 {
+        bool_t lock;
         ER              ercd;
 
         LOG_GET_TID_ENTER(p_tskid);
-        CHECK_UNL();                                                            /*［NGKI2707］*/
-
-        lock_cpu();
+        //CHECK_UNL();                                                          /*［NGKI2707］*/
+        lock = sense_lock();
+
+        if (!lock)
+                lock_cpu();
         *p_tskid = (p_runtsk == NULL) ? TSK_NONE : TSKID(p_runtsk);
-        ercd = E_OK;
-        unlock_cpu();
+        ercd = E_OK;                                                            /*［NGKI2710］［NGKI2709］*/
+        if (!lock)
+                unlock_cpu();
 
   error_exit:
@@ -399 +403 @@
         enadsp = true;
         if (t_get_ipm() == TIPM_ENAALL) {
-                dspflg = true;
-                p_schedtsk = search_schedtsk();
+                set_dspflg();
                 if (p_runtsk->raster && p_runtsk->enater) {
                         task_terminate(p_runtsk);