score: Merge tod implementation into one file

Delete TOD_MICROSECONDS_PER_SECOND, TOD_MICROSECONDS_TO_TICKS() and
TOD_MILLISECONDS_TO_TICKS().

6 files changed, 9 insertions, 15 deletions

diff --git a/c/src/ada-tests/support/init.c b/c/src/ada-tests/support/init.c
index ad98409c3c..983e51d578 100644
--- a/c/src/ada-tests/support/init.c
+++ b/c/src/ada-tests/support/init.c
@@ -51,8 +51,7 @@ uint32_t milliseconds_per_tick(void)
 
 uint32_t ticks_per_second(void)
 {
-  /* XXX HACK -- use public API */
-  return TOD_TICKS_PER_SECOND;
+  return rtems_clock_get_ticks_per_second();
 }
 
 uint32_t work_space_size(void)
diff --git a/c/src/lib/libbsp/i386/pc386/ide/ide.c b/c/src/lib/libbsp/i386/pc386/ide/ide.c
index 3288cd2d65..2c2ca911bb 100644
--- a/c/src/lib/libbsp/i386/pc386/ide/ide.c
+++ b/c/src/lib/libbsp/i386/pc386/ide/ide.c
@@ -63,8 +63,8 @@ static void pc386_ide_prestart_sleep (void)
  */
 static void pc386_ide_tasking_sleep (void)
 {
-  rtems_task_wake_after (TOD_MICROSECONDS_TO_TICKS (10000) ?
-                         TOD_MICROSECONDS_TO_TICKS (10000) : 1);
+  rtems_task_wake_after (RTEMS_MICROSECONDS_TO_TICKS (10000) ?
+                         RTEMS_MICROSECONDS_TO_TICKS (10000) : 1);
 }
 
 typedef void (*pc386_ide_sleeper)(void);
diff --git a/c/src/lib/libbsp/lm32/shared/startup/bspstart.c b/c/src/lib/libbsp/lm32/shared/startup/bspstart.c
index ef82ad0a07..5b51e474a4 100644
--- a/c/src/lib/libbsp/lm32/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/lm32/shared/startup/bspstart.c
@@ -21,12 +21,6 @@
 #include <bsp/bootcard.h>
 #include "../include/system_conf.h"
 #include "../console/uart.h"
-#include <rtems/score/heap.h>
-
-#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/timespec.h>
-#include <rtems/score/tod.h>
 
 /*
  *  bsp_start
diff --git a/c/src/lib/libcpu/bfin/clock/rtc.c b/c/src/lib/libcpu/bfin/clock/rtc.c
index 7032fe3387..657bf8fcd6 100644
--- a/c/src/lib/libcpu/bfin/clock/rtc.c
+++ b/c/src/lib/libcpu/bfin/clock/rtc.c
@@ -16,6 +16,7 @@
 #include <rtems/libio.h>
 #include <bsp.h>
 #include <libcpu/rtcRegs.h>
+#include <rtems/score/tod.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/c/src/libchip/network/cs8900.c b/c/src/libchip/network/cs8900.c
index 8cd907eecc..6d40fa78aa 100644
--- a/c/src/libchip/network/cs8900.c
+++ b/c/src/libchip/network/cs8900.c
@@ -258,7 +258,7 @@ cs8900_hardware_init (cs8900_device *cs)
 
   io_pp_bit_set_reg_16 (cs, CS8900_PP_SelfCTL, CS8900_SELF_CTRL_RESET);
 
-  rtems_task_wake_after (TOD_MILLISECONDS_TO_TICKS (20));
+  rtems_task_wake_after (RTEMS_MILLISECONDS_TO_TICKS (20));
 
   status = io_pp_get_reg_16 (cs, CS8900_PP_SelfST);
   if (status == 0) {
@@ -660,7 +660,7 @@ cs8900_rx_task (void *arg)
 
     sc = rtems_bsdnet_event_receive (CS8900_RX_OK_EVENT,
                                      RTEMS_WAIT | RTEMS_EVENT_ANY,
-                                     TOD_MILLISECONDS_TO_TICKS (250),
+                                     RTEMS_MILLISECONDS_TO_TICKS (250),
                                      &events);
 
     cs8900_rx_refill_queue (cs);
@@ -749,7 +749,7 @@ cs8900_tx_task (void *arg)
    * Wait for the link to come up.
    */
 
-  rtems_task_wake_after (TOD_MILLISECONDS_TO_TICKS (750));
+  rtems_task_wake_after (RTEMS_MILLISECONDS_TO_TICKS (750));
 
   /*
    * Loop processing the tx queue.
@@ -815,7 +815,7 @@ cs8900_tx_task (void *arg)
               cs->eth_stats.tx_wait_for_rdy4tx++;
               sc = rtems_bsdnet_event_receive (CS8900_TX_WAIT_EVENT,
                                                RTEMS_WAIT | RTEMS_EVENT_ANY,
-                                               TOD_MILLISECONDS_TO_TICKS (750),
+                                               RTEMS_MILLISECONDS_TO_TICKS (750),
                                                &events);
               if (sc == RTEMS_TIMEOUT)
               {
diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c
index d7c0b05dc4..b311080215 100644
--- a/c/src/libchip/network/open_eth.c
+++ b/c/src/libchip/network/open_eth.c
@@ -459,7 +459,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
           rtems_event_set events;
 	  rtems_bsdnet_event_receive (OPEN_ETH_TX_WAIT_EVENT,
 				      RTEMS_WAIT | RTEMS_EVENT_ANY,
-				      TOD_MILLISECONDS_TO_TICKS(500), &events);
+				      RTEMS_MILLISECONDS_TO_TICKS(500), &events);
 #endif
       }