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

EcnlProtoTool/trunk/asp3_dcre/kernel/mutex.c

@@ -4 +4 @@
  *      Advanced Standard Profile Kernel
  * 
- *  Copyright (C) 2005-2016 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2018 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -378 +378 @@
         }
         else {
-                CHECK_RSATR(mtxatr, TA_TPRI);                   /*［NGKI2025］*/
+                CHECK_VALIDATR(mtxatr, TA_TPRI);                /*［NGKI2025］*/
         }
 
@@ -473 +473 @@
 loc_mtx(ID mtxid)
 {
-        MTXCB   *p_mtxcb;
-        WINFO_MTX winfo_mtx;
-        ER              ercd;
+        MTXCB           *p_mtxcb;
+        WINFO_MTX       winfo_mtx;
+        ER                      ercd;
 
         LOG_LOC_MTX_ENTER(mtxid);
@@ -506 +506 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_MTX;
-                wobj_make_wait((WOBJCB *) p_mtxcb, (WINFO_WOBJ *) &winfo_mtx);
+                wobj_make_wait((WOBJCB *) p_mtxcb, TS_WAITING_MTX,
+                                                                                        (WINFO_WOBJ *) &winfo_mtx);
                 dispatch();
                 ercd = winfo_mtx.winfo.wercd;
@@ -576 +576 @@
 tloc_mtx(ID mtxid, TMO tmout)
 {
-        MTXCB   *p_mtxcb;
-        WINFO_MTX winfo_mtx;
-        TMEVTB  tmevtb;
-        ER              ercd;
+        MTXCB           *p_mtxcb;
+        WINFO_MTX       winfo_mtx;
+        TMEVTB          tmevtb;
+        ER                      ercd;
 
         LOG_TLOC_MTX_ENTER(mtxid, tmout);
@@ -614 +614 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_MTX;
-                wobj_make_wait_tmout((WOBJCB *) p_mtxcb, (WINFO_WOBJ *) &winfo_mtx,
-                                                                                                                &tmevtb, tmout);
+                wobj_make_wait_tmout((WOBJCB *) p_mtxcb, TS_WAITING_MTX,
+                                                                (WINFO_WOBJ *) &winfo_mtx, &tmevtb, tmout);
                 dispatch();
                 ercd = winfo_mtx.winfo.wercd;