2008-12-16 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libblock/src/bdbuf.c, libmisc/capture/capture-cli.c,
	libmisc/capture/capture.c, libmisc/mw-fb/mw_uid.c,
	rtems/include/rtems/rtems/support.h, score/Makefile.am,
	score/include/rtems/score/tod.h, score/src/coretod.c,
	score/src/coretodtickle.c: Eliminate all public use of TOD conversion
	routines. Eliminate _TOD_Microseconds_per_tick and let every place
	use the field directly from the Configuration Table. This required
	moving some methods from macros to bodies.
	* score/src/coretodmsecstoticks.c, score/src/coretodtickspersec.c,
	score/src/coretodusectoticks.c: New files.

1 files changed, 17 insertions, 23 deletions

diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h
index 44d4df862e..fb3ac98140 100644
--- a/cpukit/score/include/rtems/score/tod.h
+++ b/cpukit/score/include/rtems/score/tod.h
@@ -101,14 +101,6 @@ extern "C" {
   (((1987 - 1970 + 1)  * TOD_SECONDS_PER_NON_LEAP_YEAR) + \
   (4 * TOD_SECONDS_PER_DAY))
 
-/**  @brief Ticks per Second
- *  
- *  This macro calculates the number of ticks per second.
- */
-
-#define TOD_TICKS_PER_SECOND \
-           (TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick)
-
 /** @brief RTEMS Epoch Year
  *
  *  The following constant define the earliest year to which an
@@ -148,12 +140,6 @@ SCORE_EXTERN Timestamp_Control _TOD_Uptime;
 #define _TOD_Seconds_since_epoch() \
   _Timestamp_Get_seconds(&_TOD_Now)
 
-/** @brief Microseconds per Clock Tick
- *
- *  The following contains the number of microseconds per tick.
- */
-SCORE_EXTERN uint32_t   _TOD_Microseconds_per_tick;
-
 /** @brief _TOD_Handler_initialization
  *
  *  This routine performs the initialization necessary for this handler.
@@ -224,8 +210,9 @@ void _TOD_Tickle_ticks( void );
  *
  *  @note This must be a macro so it can be used in "static" tables.
  */
-#define TOD_MICROSECONDS_TO_TICKS(_us) \
-    ((_us) / _TOD_Microseconds_per_tick)
+uint32_t TOD_MICROSECONDS_TO_TICKS(
+  uint32_t microseconds
+);
 
 /** @brief TOD_MILLISECONDS_TO_TICKS
  *
@@ -233,20 +220,27 @@ void _TOD_Tickle_ticks( void );
  *
  *  @note This must be a macro so it can be used in "static" tables.
  */
-
-#define TOD_MILLISECONDS_TO_TICKS(_ms) \
-    (TOD_MILLISECONDS_TO_MICROSECONDS(_ms) / _TOD_Microseconds_per_tick)
-
+uint32_t TOD_MILLISECONDS_TO_TICKS(
+  uint32_t microseconds
+);
 
 /** @brief How many ticks in a second?
  *
- *  This macro returns the number of ticks in a second.
+ *  This method returns the number of ticks in a second.
  *
  *  @note If the clock tick value does not multiply evenly into a second
  *        then this number of ticks will be slightly shorter than a second.
  */
-#define TOD_TICKS_PER_SECOND \
-  (TOD_MICROSECONDS_PER_SECOND / _TOD_Microseconds_per_tick)
+uint32_t TOD_TICKS_PER_SECOND_method(void);
+
+/** @brief Method to return number of ticks in a second
+ *
+ *  This method exists to hide the fact that TOD_TICKS_PER_SECOND can no
+ *  be implemented as a macro in a .h file due to visibility issues.
+ *  The Configuration Table is not available to SuperCore .h files but
+ *  is available to their .c files.
+ */
+#define TOD_TICKS_PER_SECOND TOD_TICKS_PER_SECOND_method()
 
 #ifndef __RTEMS_APPLICATION__
 #include <rtems/score/tod.inl>