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

EcnlProtoTool/trunk/asp3_dcre/kernel/wait.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-2018 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -54 +54 @@
 
 void
-make_wait_tmout(WINFO *p_winfo, TMEVTB *p_tmevtb, TMO tmout)
+make_wait_tmout(uint_t tstat, WINFO *p_winfo, TMEVTB *p_tmevtb, TMO tmout)
 {
+        p_runtsk->tstat = tstat;
         make_non_runnable(p_runtsk);
         p_runtsk->p_winfo = p_winfo;
@@ -66 +67 @@
                 p_tmevtb->callback = (CBACK) wait_tmout;
                 p_tmevtb->arg = (void *) p_runtsk;
-                tmevtb_enqueue(p_tmevtb, (RELTIM) tmout);
+                tmevtb_enqueue_reltim(p_tmevtb, (RELTIM) tmout);
         }
 }
@@ -99 +100 @@
         make_non_wait(p_tcb);
         if (p_runtsk != p_schedtsk) {
-                request_dispatch();
+                request_dispatch_retint();
         }
 
@@ -119 +120 @@
         make_non_wait(p_tcb);
         if (p_runtsk != p_schedtsk) {
-                request_dispatch();
+                request_dispatch_retint();
         }
 
@@ -155 +156 @@
 
 void
-wobj_make_wait(WOBJCB *p_wobjcb, WINFO_WOBJ *p_winfo_wobj)
+wobj_make_wait(WOBJCB *p_wobjcb, uint_t tstat, WINFO_WOBJ *p_winfo_wobj)
 {
-        make_wait(&(p_winfo_wobj->winfo));
+        make_wait(tstat, &(p_winfo_wobj->winfo));
         wobj_queue_insert(p_wobjcb);
         p_winfo_wobj->p_wobjcb = p_wobjcb;
@@ -167 +168 @@
 
 void
-wobj_make_wait_tmout(WOBJCB *p_wobjcb, WINFO_WOBJ *p_winfo_wobj,
-                                                                TMEVTB *p_tmevtb, TMO tmout)
+wobj_make_wait_tmout(WOBJCB *p_wobjcb, uint_t tstat,
+                                                WINFO_WOBJ *p_winfo_wobj, TMEVTB *p_tmevtb, TMO tmout)
 {
-        make_wait_tmout(&(p_winfo_wobj->winfo), p_tmevtb, tmout);
+        make_wait_tmout(tstat, &(p_winfo_wobj->winfo), p_tmevtb, tmout);
         wobj_queue_insert(p_wobjcb);
         p_winfo_wobj->p_wobjcb = p_wobjcb;