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

EcnlProtoTool/trunk/asp3_dcre/kernel/semaphore.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  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
  * 
@@ -186 +186 @@
         maxsem = pk_csem->maxsem;
 
-        CHECK_RSATR(sematr, TA_TPRI);
+        CHECK_VALIDATR(sematr, TA_TPRI);
         CHECK_PAR(0 <= isemcnt && isemcnt <= maxsem);
         CHECK_PAR(1 <= maxsem && maxsem <= TMAX_MAXSEM);
@@ -286 +286 @@
                         }
                         else {
-                                request_dispatch();
+                                request_dispatch_retint();
                         }
                 }
@@ -315 +315 @@
 wai_sem(ID semid)
 {
-        SEMCB   *p_semcb;
-        WINFO_SEM winfo_sem;
-        ER              ercd;
+        SEMCB           *p_semcb;
+        WINFO_SEM       winfo_sem;
+        ER                      ercd;
 
         LOG_WAI_SEM_ENTER(semid);
@@ -336 +336 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_SEM;
-                wobj_make_wait((WOBJCB *) p_semcb, (WINFO_WOBJ *) &winfo_sem);
+                wobj_make_wait((WOBJCB *) p_semcb, TS_WAITING_SEM,
+                                                                                        (WINFO_WOBJ *) &winfo_sem);
                 dispatch();
                 ercd = winfo_sem.winfo.wercd;
@@ -394 +394 @@
 twai_sem(ID semid, TMO tmout)
 {
-        SEMCB   *p_semcb;
-        WINFO_SEM winfo_sem;
-        TMEVTB  tmevtb;
-        ER              ercd;
+        SEMCB           *p_semcb;
+        WINFO_SEM       winfo_sem;
+        TMEVTB          tmevtb;
+        ER                      ercd;
 
         LOG_TWAI_SEM_ENTER(semid, tmout);
@@ -420 +420 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_SEM;
-                wobj_make_wait_tmout((WOBJCB *) p_semcb, (WINFO_WOBJ *) &winfo_sem,
-                                                                                                                &tmevtb, tmout);
+                wobj_make_wait_tmout((WOBJCB *) p_semcb, TS_WAITING_SEM,
+                                                                (WINFO_WOBJ *) &winfo_sem, &tmevtb, tmout);
                 dispatch();
                 ercd = winfo_sem.winfo.wercd;