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

EcnlProtoTool/trunk/asp3_dcre/kernel/cyclic.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
  * 
@@ -175 +175 @@
         CYCINIB         *p_cycinib;
         ATR                     cycatr;
-        T_NFYINFO       nfyinfo, *p_nfyinfo;
-        RELTIM          cyctim;
-        RELTIM          cycphs;
-        ER                      ercd, rercd;
+        RELTIM          cyctim, cycphs;
+        T_NFYINFO       *p_nfyinfo;
+        ER                      ercd;
 
         LOG_ACRE_CYC_ENTER(pk_ccyc);
@@ -184 +183 @@
 
         cycatr = pk_ccyc->cycatr;
-        nfyinfo = pk_ccyc->nfyinfo;
         cyctim = pk_ccyc->cyctim;
         cycphs = pk_ccyc->cycphs;
 
-        CHECK_RSATR(cycatr, TA_STA);
-        rercd = check_nfyinfo(&nfyinfo);
-        if (rercd != E_OK) {
-                ercd = rercd;
+        CHECK_VALIDATR(cycatr, TA_STA);
+        ercd = check_nfyinfo(&(pk_ccyc->nfyinfo));
+        if (ercd != E_OK) {
                 goto error_exit;
         }
@@ -206 +203 @@
                 p_cycinib = (CYCINIB *)(p_cyccb->p_cycinib);
                 p_cycinib->cycatr = cycatr;
-                if (nfyinfo.nfymode == TNFY_HANDLER) {
-                        p_cycinib->exinf = nfyinfo.nfy.handler.exinf;
-                        p_cycinib->nfyhdr = (NFYHDR)(nfyinfo.nfy.handler.tmehdr);
+                if (pk_ccyc->nfyinfo.nfymode == TNFY_HANDLER) {
+                        p_cycinib->exinf = pk_ccyc->nfyinfo.nfy.handler.exinf;
+                        p_cycinib->nfyhdr = (NFYHDR)(pk_ccyc->nfyinfo.nfy.handler.tmehdr);
                 }
                 else {
                         p_nfyinfo = &acyc_nfyinfo_table[p_cycinib - acycinib_table];
-                        *p_nfyinfo = nfyinfo;
+                        *p_nfyinfo = pk_ccyc->nfyinfo;
                         p_cycinib->exinf = (intptr_t) p_nfyinfo;
                         p_cycinib->nfyhdr = notify_handler;
@@ -221 +218 @@
                 if ((p_cyccb->p_cycinib->cycatr & TA_STA) != 0U) {
                         p_cyccb->cycsta = true;
-                        tmevtb_enqueue(&(p_cyccb->tmevtb), p_cyccb->p_cycinib->cycphs);
+                        tmevtb_enqueue_reltim(&(p_cyccb->tmevtb),
+                                                                                p_cyccb->p_cycinib->cycphs);
                 }
                 else {
@@ -311 +309 @@
                  *  初回の起動のためのタイムイベントを登録する［ASPD1036］．
                  */
-                tmevtb_enqueue(&(p_cyccb->tmevtb), p_cyccb->p_cycinib->cycphs);
+                tmevtb_enqueue_reltim(&(p_cyccb->tmevtb), p_cyccb->p_cycinib->cycphs);
                 ercd = E_OK;
         }
@@ -414 +412 @@
         /*
          *  通知ハンドラを，CPUロック解除状態で呼び出す．
+         *
+         *  周期通知の生成／削除はタスクからしか行えないため，周期通知初期
+         *  化ブロックをCPUロック解除状態で参照しても問題ない．
          */
         unlock_cpu();