diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-02 18:23:59 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-04-02 18:23:59 +0000 |
commit | 812da546889eea0b6dea7eb2954f46a4c43d1314 (patch) | |
tree | 22fc95d921c3544de770454a2f9c604d5d0a27a2 /cpukit/rtems/include/rtems/rtems | |
parent | 2007-04-02 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-812da546889eea0b6dea7eb2954f46a4c43d1314.tar.bz2 |
2007-04-02 Joel Sherrill <joel@OARcorp.com>
* itron/src/itrontime.c, libcsupport/src/__gettod.c,
posix/include/rtems/posix/time.h, posix/include/rtems/posix/timer.h,
posix/src/clockgettime.c, posix/src/clocksettime.c,
posix/src/nanosleep.c, posix/src/posixtimespecsubtract.c,
posix/src/posixtimespectointerval.c, posix/src/ptimer1.c,
posix/src/sleep.c, rtems/Makefile.am,
rtems/include/rtems/rtems/clock.h, rtems/include/rtems/rtems/timer.h,
rtems/include/rtems/rtems/types.h, rtems/src/clockget.c,
rtems/src/clockset.c, rtems/src/clocktodtoseconds.c,
rtems/src/clocktodvalidate.c, rtems/src/taskwakewhen.c,
score/Makefile.am, score/include/rtems/score/tod.h,
score/inline/rtems/score/tod.inl, score/src/coretod.c,
score/src/coretodset.c: Convert from Classic API style TOD_Control as
fundamental time structure to POSIX struct timespec. Add
clock_get_uptime().
* rtems/src/clockgetuptime.c, score/src/coretodget.c,
score/src/coretodgetuptime.c: New files.
* score/src/coretodtickle.c, score/src/coretodtoseconds.c,
score/src/coretodvalidate.c: Removed.
Diffstat (limited to '')
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/clock.h | 37 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/timer.h | 2 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/types.h | 25 |
3 files changed, 62 insertions, 2 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/rtems/include/rtems/rtems/clock.h index 67fa8ab4cd..8c20780ad1 100644 --- a/cpukit/rtems/include/rtems/rtems/clock.h +++ b/cpukit/rtems/include/rtems/rtems/clock.h @@ -32,6 +32,8 @@ extern "C" { #endif #include <rtems/score/tod.h> +#include <rtems/score/watchdog.h> +#include <rtems/rtems/status.h> #include <rtems/rtems/types.h> /* @@ -122,6 +124,41 @@ rtems_status_code rtems_clock_set_nanoseconds_extension( rtems_nanoseconds_extension_routine routine ); +/* + * rtems_clock_get_uptime + * + * DESCRIPTION: + * + * This directive returns the system uptime. + * + * Input parameters: + * routine - pointer to the time structure + * + * Output parameters: + * RTEMS_SUCCESSFUL - if successful + * error code - if unsuccessful + */ +rtems_status_code rtems_clock_get_uptime( + struct timespec *uptime +); + +/** @brief _TOD_Validate + * + * This function returns TRUE if THE_TOD contains + * a valid time of day, and FALSE otherwise. + */ +boolean _TOD_Validate( + rtems_time_of_day *the_tod +); + +/** @brief _TOD_To_seconds + * + * This function returns the number seconds between the epoch and THE_TOD. + */ +Watchdog_Interval _TOD_To_seconds( + rtems_time_of_day *the_tod +); + #ifdef __cplusplus } #endif diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h index 8048754fd4..a246678480 100644 --- a/cpukit/rtems/include/rtems/rtems/timer.h +++ b/cpukit/rtems/include/rtems/rtems/timer.h @@ -41,8 +41,8 @@ extern "C" { #endif #include <rtems/score/object.h> -#include <rtems/score/tod.h> #include <rtems/score/watchdog.h> +#include <rtems/rtems/clock.h> #include <rtems/rtems/attr.h> /* diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h index 71af603de0..310c979ef9 100644 --- a/cpukit/rtems/include/rtems/rtems/types.h +++ b/cpukit/rtems/include/rtems/rtems/types.h @@ -61,7 +61,30 @@ typedef Heap_Information_block region_information_block; */ typedef Watchdog_Interval rtems_interval; -typedef TOD_Control rtems_time_of_day; + + +/** + * The following record defines the time of control block. This + * control block is used to maintain the current time of day. + * + * @note This is an RTEID style time/date. + */ +typedef struct { + /** This field is the year, A.D. */ + uint32_t year; + /** This field is the month, 1 -> 12 */ + uint32_t month; + /** This field is the day, 1 -> 31 */ + uint32_t day; + /** This field is the hour, 0 -> 23 */ + uint32_t hour; + /** This field is the minute, 0 -> 59 */ + uint32_t minute; + /** This field is the second, 0 -> 59 */ + uint32_t second; + /** This field is the elapsed ticks between secs */ + uint32_t ticks; +} rtems_time_of_day; /* * Define the type for an RTEMS API task mode. |