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

EcnlProtoTool/trunk/asp3_dcre/kernel/alarm.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
  * 
@@ -164 +164 @@
         ALMINIB         *p_alminib;
         ATR                     almatr;
-        T_NFYINFO       nfyinfo, *p_nfyinfo;
-        ER                      ercd, rercd;
+        T_NFYINFO       *p_nfyinfo;
+        ER                      ercd;
 
         LOG_ACRE_ALM_ENTER(pk_calm);
@@ -171 +171 @@
 
         almatr = pk_calm->almatr;
-        nfyinfo = pk_calm->nfyinfo;
-
-        CHECK_RSATR(almatr, TA_NULL);
-        rercd = check_nfyinfo(&nfyinfo);
-        if (rercd != E_OK) {
-                ercd = rercd;
+
+        CHECK_VALIDATR(almatr, TA_NULL);
+        ercd = check_nfyinfo(&(pk_calm->nfyinfo));
+        if (ercd != E_OK) {
                 goto error_exit;
         }
@@ -189 +187 @@
                 p_alminib = (ALMINIB *)(p_almcb->p_alminib);
                 p_alminib->almatr = almatr;
-                if (nfyinfo.nfymode == TNFY_HANDLER) {
-                        p_alminib->exinf = nfyinfo.nfy.handler.exinf;
-                        p_alminib->nfyhdr = (NFYHDR)(nfyinfo.nfy.handler.tmehdr);
+                if (pk_calm->nfyinfo.nfymode == TNFY_HANDLER) {
+                        p_alminib->exinf = pk_calm->nfyinfo.nfy.handler.exinf;
+                        p_alminib->nfyhdr = (NFYHDR)(pk_calm->nfyinfo.nfy.handler.tmehdr);
                 }
                 else {
                         p_nfyinfo = &aalm_nfyinfo_table[p_alminib - aalminib_table];
-                        *p_nfyinfo = nfyinfo;
+                        *p_nfyinfo = pk_calm->nfyinfo;
                         p_alminib->exinf = (intptr_t) p_nfyinfo;
                         p_alminib->nfyhdr = notify_handler;
@@ -283 +281 @@
                         p_almcb->almsta = true;
                 }
-                tmevtb_enqueue(&(p_almcb->tmevtb), almtim);
+                tmevtb_enqueue_reltim(&(p_almcb->tmevtb), almtim);
                 ercd = E_OK;
         }
@@ -385 +383 @@
         /*
          *  通知ハンドラを，CPUロック解除状態で呼び出す．
+         *
+         *  アラーム通知の生成／削除はタスクからしか行えないため，アラーム
+         *  通知初期化ブロックをCPUロック解除状態で参照しても問題ない．
          */
         unlock_cpu();