[rtems commit] rtems: Add <rtems/rtems/clockimpl.h>

Sebastian Huber sebh at rtems.org
Wed Dec 2 06:45:59 UTC 2020


Module:    rtems
Branch:    master
Commit:    9c20b987cd663e10443f2a6dc9d6b1c1d3d94e83
Changeset: http://git.rtems.org/rtems/commit/?id=9c20b987cd663e10443f2a6dc9d6b1c1d3d94e83

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Nov 26 19:53:25 2020 +0100

rtems: Add <rtems/rtems/clockimpl.h>

---

 bsps/arm/altera-cyclone-v/rtc/rtc.c    |  1 +
 bsps/arm/lpc32xx/rtc/rtc-config.c      |  1 +
 bsps/bfin/shared/dev/rtc.c             |  1 +
 bsps/shared/dev/rtc/ds1375.c           |  1 +
 bsps/shared/dev/rtc/rtc-support.c      |  1 +
 cpukit/include/rtems/rtems/clock.h     | 30 --------------
 cpukit/include/rtems/rtems/clockimpl.h | 73 ++++++++++++++++++++++++++++++++++
 cpukit/rtems/src/clockset.c            |  2 +-
 cpukit/rtems/src/clocktodtoseconds.c   |  2 +-
 cpukit/rtems/src/clocktodvalidate.c    |  2 +-
 cpukit/rtems/src/taskwakewhen.c        |  2 +-
 cpukit/rtems/src/timercreate.c         |  2 +-
 testsuites/sptests/sp2038/init.c       |  1 +
 13 files changed, 84 insertions(+), 35 deletions(-)

diff --git a/bsps/arm/altera-cyclone-v/rtc/rtc.c b/bsps/arm/altera-cyclone-v/rtc/rtc.c
index d30bfec..3e8c68e 100644
--- a/bsps/arm/altera-cyclone-v/rtc/rtc.c
+++ b/bsps/arm/altera-cyclone-v/rtc/rtc.c
@@ -33,6 +33,7 @@
 #include <libchip/rtc.h>
 #include <assert.h>
 #include <rtems/score/todimpl.h>
+#include <rtems/rtems/clockimpl.h>
 #include <sys/filio.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/bsps/arm/lpc32xx/rtc/rtc-config.c b/bsps/arm/lpc32xx/rtc/rtc-config.c
index 52e2daf..268c2b6 100644
--- a/bsps/arm/lpc32xx/rtc/rtc-config.c
+++ b/bsps/arm/lpc32xx/rtc/rtc-config.c
@@ -24,6 +24,7 @@
 
 #include <bsp.h>
 #include <bsp/lpc32xx.h>
+#include <rtems/rtems/clockimpl.h>
 
 #include <time.h>
 
diff --git a/bsps/bfin/shared/dev/rtc.c b/bsps/bfin/shared/dev/rtc.c
index fa340a3..cb15ca0 100644
--- a/bsps/bfin/shared/dev/rtc.c
+++ b/bsps/bfin/shared/dev/rtc.c
@@ -20,6 +20,7 @@
 #include <bsp.h>
 #include <libcpu/rtcRegs.h>
 #include <rtems/score/todimpl.h>
+#include <rtems/rtems/clockimpl.h>
 
 /* The following are inside RTEMS -- we are violating visibility!!!
  * Perhaps an API could be defined to get days since 1 Jan.
diff --git a/bsps/shared/dev/rtc/ds1375.c b/bsps/shared/dev/rtc/ds1375.c
index 4a23a00..e517443 100644
--- a/bsps/shared/dev/rtc/ds1375.c
+++ b/bsps/shared/dev/rtc/ds1375.c
@@ -54,6 +54,7 @@
 #include <rtems/bspIo.h>
 #include <rtems/rtc.h>
 #include <rtems/score/sysstate.h>
+#include <rtems/rtems/clockimpl.h>
 #include <libchip/rtc.h>
 #include <libchip/ds1375-rtc.h>
 
diff --git a/bsps/shared/dev/rtc/rtc-support.c b/bsps/shared/dev/rtc/rtc-support.c
index 560d2ea..765bfe1 100644
--- a/bsps/shared/dev/rtc/rtc-support.c
+++ b/bsps/shared/dev/rtc/rtc-support.c
@@ -12,6 +12,7 @@
 #include <rtems/rtc.h>
 #include <rtems/tod.h>
 #include <rtems/libio.h>
+#include <rtems/rtems/clockimpl.h>
 
 #include <libchip/rtc.h>
 
diff --git a/cpukit/include/rtems/rtems/clock.h b/cpukit/include/rtems/rtems/clock.h
index 7f2887f..c3eea7d 100644
--- a/cpukit/include/rtems/rtems/clock.h
+++ b/cpukit/include/rtems/rtems/clock.h
@@ -267,36 +267,6 @@ time_t rtems_clock_get_uptime_seconds( void );
  */
 uint64_t rtems_clock_get_uptime_nanoseconds( void );
 
-/**
- * @brief TOD Validate
- *
- * This support function returns true if @a the_tod contains
- * a valid time of day, and false otherwise.
- *
- * @param[in] the_tod is the TOD structure to validate
- *
- * @retval This method returns true if the TOD is valid and false otherwise.
- *
- * @note This routine only works for leap-years through 2099.
- */
-bool _TOD_Validate(
-  const rtems_time_of_day *the_tod
-);
-
-/**
- * @brief TOD to Seconds
- *
- * This function returns the number seconds between the epoch and @a the_tod.
- *
- * @param[in] the_tod is the TOD structure to convert to seconds
- *
- * @retval This method returns the number of seconds since epoch represented
- *         by @a the_tod
- */
-Watchdog_Interval _TOD_To_seconds(
-  const rtems_time_of_day *the_tod
-);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/cpukit/include/rtems/rtems/clockimpl.h b/cpukit/include/rtems/rtems/clockimpl.h
new file mode 100644
index 0000000..eff1231
--- /dev/null
+++ b/cpukit/include/rtems/rtems/clockimpl.h
@@ -0,0 +1,73 @@
+/**
+ * @file
+ *
+ * @ingroup RTEMSImplClassicClock
+ *
+ * @brief This header file provides interfaces used by the Clock Manager
+ *   implementation.
+ */
+
+/* COPYRIGHT (c) 1989-2013.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#ifndef _RTEMS_RTEMS_CLOCKIMPL_H
+#define _RTEMS_RTEMS_CLOCKIMPL_H
+
+#include <rtems/rtems/clock.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup RTEMSImplClassicClock Clock Manager
+ *
+ * @ingroup RTEMSImplClassic
+ *
+ * @brief This group contains the Clock Manager implementation.
+ *
+ * @{
+ */
+
+/**
+ * @brief TOD Validate
+ *
+ * This support function returns true if @a the_tod contains
+ * a valid time of day, and false otherwise.
+ *
+ * @param[in] the_tod is the TOD structure to validate
+ *
+ * @retval This method returns true if the TOD is valid and false otherwise.
+ *
+ * @note This routine only works for leap-years through 2099.
+ */
+bool _TOD_Validate(
+  const rtems_time_of_day *the_tod
+);
+
+/**
+ * @brief TOD to Seconds
+ *
+ * This function returns the number seconds between the epoch and @a the_tod.
+ *
+ * @param[in] the_tod is the TOD structure to convert to seconds
+ *
+ * @retval This method returns the number of seconds since epoch represented
+ *         by @a the_tod
+ */
+Watchdog_Interval _TOD_To_seconds(
+  const rtems_time_of_day *the_tod
+);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTEMS_RTEMS_CLOCKIMPL_H */
diff --git a/cpukit/rtems/src/clockset.c b/cpukit/rtems/src/clockset.c
index a42cde7..5850339 100644
--- a/cpukit/rtems/src/clockset.c
+++ b/cpukit/rtems/src/clockset.c
@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/rtems/clock.h>
+#include <rtems/rtems/clockimpl.h>
 #include <rtems/score/todimpl.h>
 #include <rtems/config.h>
 
diff --git a/cpukit/rtems/src/clocktodtoseconds.c b/cpukit/rtems/src/clocktodtoseconds.c
index 30bfba8..d1a8017 100644
--- a/cpukit/rtems/src/clocktodtoseconds.c
+++ b/cpukit/rtems/src/clocktodtoseconds.c
@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/rtems/clock.h>
+#include <rtems/rtems/clockimpl.h>
 #include <rtems/score/todimpl.h>
 
 #define TOD_SECONDS_AT_2100_03_01_00_00 4107538800UL
diff --git a/cpukit/rtems/src/clocktodvalidate.c b/cpukit/rtems/src/clocktodvalidate.c
index 55cff44..a0f8416 100644
--- a/cpukit/rtems/src/clocktodvalidate.c
+++ b/cpukit/rtems/src/clocktodvalidate.c
@@ -18,7 +18,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/rtems/clock.h>
+#include <rtems/rtems/clockimpl.h>
 #include <rtems/score/todimpl.h>
 #include <rtems/config.h>
 
diff --git a/cpukit/rtems/src/taskwakewhen.c b/cpukit/rtems/src/taskwakewhen.c
index 23789e1..3946775 100644
--- a/cpukit/rtems/src/taskwakewhen.c
+++ b/cpukit/rtems/src/taskwakewhen.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <rtems/rtems/tasks.h>
-#include <rtems/rtems/clock.h>
+#include <rtems/rtems/clockimpl.h>
 #include <rtems/score/threadimpl.h>
 #include <rtems/score/todimpl.h>
 #include <rtems/score/watchdogimpl.h>
diff --git a/cpukit/rtems/src/timercreate.c b/cpukit/rtems/src/timercreate.c
index db92941..cadcecb 100644
--- a/cpukit/rtems/src/timercreate.c
+++ b/cpukit/rtems/src/timercreate.c
@@ -19,7 +19,7 @@
 #endif
 
 #include <rtems/rtems/timerimpl.h>
-#include <rtems/rtems/clock.h>
+#include <rtems/rtems/clockimpl.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
 #include <rtems/score/assert.h>
diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c
index 8d81cb1..a3f09d4 100644
--- a/testsuites/sptests/sp2038/init.c
+++ b/testsuites/sptests/sp2038/init.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include <rtems.h>
+#include <rtems/rtems/clockimpl.h>
 
 const char rtems_test_name[] = "SP 2038";
 



More information about the vc mailing list