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

EcnlProtoTool/trunk/asp3_dcre/kernel/time_event.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-2019 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -49 +49 @@
 
 /*
+ *  TCYC_HRTCNTの定義のチェック
+ */
+#if defined(USE_64BIT_HRTCNT) && defined(TCYC_HRTCNT)
+#error TCYC_HRTCNT must not be defined when USE_64BIT_HRTCNT.
+#endif
+
+/*
  *  TSTEP_HRTCNTの範囲チェック
  */
@@ -56 +63 @@
 
 /*
- *  HRTCNT_BOUNDの範囲チェック
- */
+ *  HRTCNT_BOUNDの定義のチェック
+ */
+#ifndef USE_64BIT_HRTCNT
+
 #if HRTCNT_BOUND >= 4294000000U
 #error HRTCNT_BOUND is too large.
@@ -67 +76 @@
 #endif /* HRTCNT_BOUND >= TCYC_HRTCNT */
 #endif /* TCYC_HRTCNT */
+
+#else /* USE_64BIT_HRTCNT */
+
+#ifdef HRTCNT_BOUND
+#error USE_64BIT_HRTCNT is not supported on this target.
+#endif /* HRTCNT_BOUND */
+
+#endif /* USE_64BIT_HRTCNT */
 
 /*
@@ -367 +384 @@
         }
 #endif /* TCYC_HRTCNT */
+        current_hrtcnt = new_hrtcnt;                                    /*［ASPD1016］*/
 
         previous_evttim = current_evttim;
         current_evttim += (EVTTIM) hrtcnt_advance;              /*［ASPD1015］*/
-        current_hrtcnt = new_hrtcnt;                                    /*［ASPD1016］*/
         boundary_evttim = current_evttim - BOUNDARY_MARGIN;     /*［ASPD1011］*/
 
@@ -407 +424 @@
 
         if (p_last_tmevtn < p_top_tmevtn) {
+                /*
+                 *  タイムイベントがない場合
+                 */
+#ifdef USE_64BIT_HRTCNT
+                target_hrt_clear_event();
+#else /* USE_64BIT_HRTCNT */
                 target_hrt_set_event(HRTCNT_BOUND);                     /*［ASPD1007］*/
+#endif /* USE_64BIT_HRTCNT */
         }
         else if (EVTTIM_LE(top_evttim, current_evttim)) {
@@ -414 +438 @@
         else {
                 hrtcnt = (HRTCNT)(top_evttim - current_evttim);
+#ifdef USE_64BIT_HRTCNT
+                target_hrt_set_event(hrtcnt);
+#else /* USE_64BIT_HRTCNT */
                 if (hrtcnt > HRTCNT_BOUND) {
                         target_hrt_set_event(HRTCNT_BOUND);             /*［ASPD1006］*/
@@ -420 +447 @@
                         target_hrt_set_event(hrtcnt);                   /*［ASPD1002］*/
                 }
+#endif /* USE_64BIT_HRTCNT */
         }
 }
@@ -442 +470 @@
  *  
  */
-#ifdef TOPPERS_tmeenq
+#ifdef TOPPERS_tmeenqrel
 
 void
-tmevtb_enqueue(TMEVTB *p_tmevtb, RELTIM time)
+tmevtb_enqueue_reltim(TMEVTB *p_tmevtb, RELTIM time)
 {
         /*
@@ -467 +495 @@
 }
 
-#endif /* TOPPERS_tmeenq */
+#endif /* TOPPERS_tmeenqrel */
 
 /*
@@ -502 +530 @@
 
 bool_t
-check_adjtim(int_t adjtim)
+check_adjtim(int32_t adjtim)
 {
         if (adjtim > 0) {
                 return(p_last_tmevtn >= p_top_tmevtn    /*［NGKI3588］*/
-                                        && EVTTIM_LE(top_evttim, current_evttim - TMAX_ADJTIM));
+                                        && EVTTIM_LE(top_evttim + TMAX_ADJTIM, current_evttim));
         }
         else if (adjtim < 0) {                                          /*［NGKI3589］*/
@@ -559 +587 @@
         TMEVTB  *p_tmevtb;
         bool_t  callflag;
+#ifndef TOPPERS_OMIT_SYSLOG
+        uint_t  nocall = 0;
+#endif /* TOPPERS_OMIT_SYSLOG */
 
         assert(sense_context());
@@ -587 +618 @@
                         (*(p_tmevtb->callback))(p_tmevtb->arg);
                         callflag = true;
+#ifndef TOPPERS_OMIT_SYSLOG
+                        nocall += 1;
+#endif /* TOPPERS_OMIT_SYSLOG */
                 }
         } while (callflag);                                                             /*［ASPD1020］*/
 
+#ifndef TOPPERS_OMIT_SYSLOG
+        /*
+         *  タイムイベントが処理されなかった場合．
+         */
+        if (nocall == 0) {
+                syslog_0(LOG_NOTICE, "no time event is processed in hrt interrupt.");
+        }
+#endif /* TOPPERS_OMIT_SYSLOG */
+
         /*
          *  高分解能タイマ割込みの発生タイミングを設定する［ASPD1025］．