diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-25 15:10:11 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-26 11:55:47 +0200 |
| commit | 88c74ab115b5135d4d93050596905d6ee573dd1e (patch) | |
| tree | 395b852dd384040e20a6f178e913dddccac436bf /cpukit/rtems/include | |
| parent | score: Create object implementation header (diff) | |
| download | rtems-88c74ab115b5135d4d93050596905d6ee573dd1e.tar.bz2 | |
score: Merge tod implementation into one file
Delete TOD_MICROSECONDS_PER_SECOND, TOD_MICROSECONDS_TO_TICKS() and
TOD_MILLISECONDS_TO_TICKS().
Diffstat (limited to '')
| -rw-r--r-- | cpukit/rtems/include/rtems/rtems/clock.h | 1 | ||||
| -rw-r--r-- | cpukit/rtems/include/rtems/rtems/support.h | 6 | ||||
| -rw-r--r-- | cpukit/rtems/include/rtems/rtems/types.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/rtems/include/rtems/rtems/clock.h index 3254b59dc1..3c32ccd0dd 100644 --- a/cpukit/rtems/include/rtems/rtems/clock.h +++ b/cpukit/rtems/include/rtems/rtems/clock.h @@ -30,7 +30,6 @@ #ifndef _RTEMS_RTEMS_CLOCK_H #define _RTEMS_RTEMS_CLOCK_H -#include <rtems/score/tod.h> #include <rtems/score/watchdog.h> #include <rtems/rtems/status.h> #include <rtems/rtems/types.h> diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/rtems/include/rtems/rtems/support.h index e2e01b0b15..80da79bc58 100644 --- a/cpukit/rtems/include/rtems/rtems/support.h +++ b/cpukit/rtems/include/rtems/rtems/support.h @@ -19,6 +19,7 @@ #define _RTEMS_RTEMS_SUPPORT_H #include <rtems/rtems/types.h> +#include <rtems/config.h> #ifdef __cplusplus extern "C" { @@ -32,14 +33,13 @@ extern "C" { /** * @brief Returns the number of micro seconds for the milli seconds value @a _ms. */ -#define RTEMS_MILLISECONDS_TO_MICROSECONDS(_ms) \ - TOD_MILLISECONDS_TO_MICROSECONDS(_ms) +#define RTEMS_MILLISECONDS_TO_MICROSECONDS(_ms) ((uint32_t)(_ms) * 1000UL) /** * @brief Returns the number of ticks for the milli seconds value @a _ms. */ #define RTEMS_MILLISECONDS_TO_TICKS(_ms) \ - (TOD_MILLISECONDS_TO_MICROSECONDS(_ms) / \ + (RTEMS_MILLISECONDS_TO_MICROSECONDS(_ms) / \ rtems_configuration_get_microseconds_per_tick()) /** diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h index 60a787db5f..ae121e06f4 100644 --- a/cpukit/rtems/include/rtems/rtems/types.h +++ b/cpukit/rtems/include/rtems/rtems/types.h @@ -26,7 +26,6 @@ #include <rtems/score/heap.h> #include <rtems/score/object.h> #include <rtems/score/priority.h> -#include <rtems/score/tod.h> #include <rtems/score/watchdog.h> #include <rtems/rtems/modes.h> #if defined(RTEMS_MULTIPROCESSING) |