summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Moyano <gabriel.moyano@dlr.de>2022-05-20 11:30:01 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2022-05-23 09:09:01 +0200
commitb3e4f5809d4a3b4d235cd175f39d1d95a0c2b128 (patch)
tree088ef90a55f78b0d33c389d3954944b4825b27ce
parentkern_ntptime.c: Add define in order to remove warning (diff)
downloadrtems-b3e4f5809d4a3b4d235cd175f39d1d95a0c2b128.tar.bz2
timepps.h: PPS_SYNC defined by default
Update #2349.
-rw-r--r--cpukit/include/sys/timepps.h1
-rw-r--r--cpukit/score/src/kern_ntptime.c10
-rw-r--r--testsuites/sptests/spntp01/init.c2
3 files changed, 2 insertions, 11 deletions
diff --git a/cpukit/include/sys/timepps.h b/cpukit/include/sys/timepps.h
index 2513298557..35dfdcbf66 100644
--- a/cpukit/include/sys/timepps.h
+++ b/cpukit/include/sys/timepps.h
@@ -26,6 +26,7 @@
#include <sys/time.h>
#ifdef __rtems__
#include <rtems/score/atomic.h>
+#define PPS_SYNC
#endif /* __rtems__ */
#define PPS_API_VERS_1 1
diff --git a/cpukit/score/src/kern_ntptime.c b/cpukit/score/src/kern_ntptime.c
index c1b4013e9b..8a16702736 100644
--- a/cpukit/score/src/kern_ntptime.c
+++ b/cpukit/score/src/kern_ntptime.c
@@ -538,16 +538,6 @@ kern_ntp_adjtime(struct thread *td, struct timex *ntv, int *retvalp)
ntv->jitcnt = pps_jitcnt;
ntv->stbcnt = pps_stbcnt;
#endif /* PPS_SYNC */
-#ifdef __rtems__
- ntv->ppsfreq = 0;
- ntv->jitter = 0;
- ntv->shift = 0;
- ntv->stabil = 0;
- ntv->jitcnt = 0;
- ntv->calcnt = 0;
- ntv->errcnt = 0;
- ntv->stbcnt = 0;
-#endif /* __rtems__ */
retval = ntp_is_time_error(time_status) ? TIME_ERROR : time_state;
NTP_UNLOCK();
diff --git a/testsuites/sptests/spntp01/init.c b/testsuites/sptests/spntp01/init.c
index eeee472e9d..eb5b1ca56c 100644
--- a/testsuites/sptests/spntp01/init.c
+++ b/testsuites/sptests/spntp01/init.c
@@ -81,7 +81,7 @@ T_TEST_CASE( NTP )
T_eq_long( tx.tolerance, 32500000 );
T_eq_long( tx.ppsfreq, 0 );
T_eq_long( tx.jitter, 0 );
- T_eq_int( tx.shift, 0 );
+ T_eq_int( tx.shift, 2 );
T_eq_long( tx.stabil, 0 );
T_eq_long( tx.jitcnt, 0 );
T_eq_long( tx.calcnt, 0 );