Changeset 306 for asp3_wo_tecs/trunk/test/test_dlynse.c

Timestamp:

Jun 27, 2017, 10:53:32 AM (7 years ago)

Author:

ertl-honda

Message:

3.1.0を反映

File:

• asp3_wo_tecs/trunk/test/test_dlynse.c (modified) (7 diffs)

asp3_wo_tecs/trunk/test/test_dlynse.c

@@ -5 +5 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2007-2015 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2007-2016 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -52 +52 @@
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
  * 
- *  $Id: test_dlynse.c 482 2016-01-03 13:12:51Z ertl-hiro $
+ *  $Id: test_dlynse.c 738 2016-04-05 14:19:24Z ertl-hiro $
  */
 
@@ -75 +75 @@
 #include "target_kernel_impl.h"
 
-#define NO_LOOP         ULONG_C(1000000)
+#define NO_LOOP         1000000UL
 
-SYSTIM  empty_time;
+HRTCNT  empty_time;
 
 static void
@@ -90 +90 @@
         etime = fch_hrt();
         empty_time = etime - stime;
+#ifdef TCYC_HRTCNT
+        if (etime < stime) {
+                empty_time += TCYC_HRTCNT;
+        }
+#endif /* TCYC_HRTCNT */
         syslog(LOG_NOTICE, "empty loop: %u", empty_time);
         (void) syslog_fls_log();
@@ -97 +102 @@
 test_dly_nse(ulong_t dlytim)
 {
-        HRTCNT  stime, etime;
+        HRTCNT  stime, etime, diff;
         ulong_t delay_time;
         volatile ulong_t        i;
@@ -106 +111 @@
         }
         etime = fch_hrt();
-        delay_time = ((etime - stime) - empty_time) / 1000U;
+        diff = etime - stime;
+#ifdef TCYC_HRTCNT
+        if (etime < stime) {
+                diff += TCYC_HRTCNT;
+        }
+#endif /* TCYC_HRTCNT */
+        delay_time = (diff - empty_time) / 1000U;
         syslog(LOG_NOTICE, "sil_dly_nse(%lu): %lu %s", dlytim, delay_time,
                                                                         delay_time >= dlytim ? "OK" : "NG");
@@ -127 +138 @@
         test_dly_nse(SIL_DLY_TIM1 + SIL_DLY_TIM2 * 4);
         test_dly_nse(SIL_DLY_TIM1 + SIL_DLY_TIM2 * 5);
+        test_dly_nse(SIL_DLY_TIM1 + SIL_DLY_TIM2 * 6);
+        test_dly_nse(SIL_DLY_TIM1 + SIL_DLY_TIM2 * 7);
+        test_dly_nse(SIL_DLY_TIM1 + SIL_DLY_TIM2 * 8);
+        test_dly_nse(SIL_DLY_TIM1 + SIL_DLY_TIM2 * 9);
         test_dly_nse(SIL_DLY_TIM1 + SIL_DLY_TIM2 * 10);
         test_dly_nse(SIL_DLY_TIM1 + SIL_DLY_TIM2 * 20);