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

	* include/rtems++/rtemsEvent.h, include/rtems++/rtemsMessageQueue.h,
	include/rtems++/rtemsSemaphore.h, include/rtems++/rtemsTimer.h,
	src/rtemsTask.cc: Eliminate all public use of TOD conversion
	routines.

6 files changed, 13 insertions, 6 deletions

diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog
index f1965ab870..6c64385cbc 100644
--- a/c/src/librtems++/ChangeLog
+++ b/c/src/librtems++/ChangeLog
@@ -1,5 +1,12 @@
 2008-12-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* include/rtems++/rtemsEvent.h, include/rtems++/rtemsMessageQueue.h,
+	include/rtems++/rtemsSemaphore.h, include/rtems++/rtemsTimer.h,
+	src/rtemsTask.cc: Eliminate all public use of TOD conversion
+	routines.
+
+2008-12-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* include/rtems++/rtemsTimer.h: Use public API not
 	_TOD_Microseconds_per_tick.
 
diff --git a/c/src/librtems++/include/rtems++/rtemsEvent.h b/c/src/librtems++/include/rtems++/rtemsEvent.h
index e35d802670..6c4b60a879 100644
--- a/c/src/librtems++/include/rtems++/rtemsEvent.h
+++ b/c/src/librtems++/include/rtems++/rtemsEvent.h
@@ -114,7 +114,7 @@ const rtems_status_code rtemsEvent::receive(const rtems_event_set event_in,
     rtems_configuration_get_microseconds_per_tick() : micro_secs;
   set_status_code(rtems_event_receive(event_in,
                                       wait | condition,
-                                      TOD_MICROSECONDS_TO_TICKS(usecs),
+                                      RTEMS_MICROSECONDS_TO_TICKS(usecs),
                                       &event_out));
   return last_status_code();
 }
diff --git a/c/src/librtems++/include/rtems++/rtemsMessageQueue.h b/c/src/librtems++/include/rtems++/rtemsMessageQueue.h
index 894ba9427f..c517a36714 100644
--- a/c/src/librtems++/include/rtems++/rtemsMessageQueue.h
+++ b/c/src/librtems++/include/rtems++/rtemsMessageQueue.h
@@ -161,7 +161,7 @@ const rtems_status_code rtemsMessageQueue::receive(const void *buffer,
                                                      (void*) buffer,
                                                      &size,
                                                      wait ? RTEMS_WAIT : RTEMS_NO_WAIT,
-                                                     TOD_MICROSECONDS_TO_TICKS(usecs)));
+                                                     RTEMS_MICROSECONDS_TO_TICKS(usecs)));
 }
 
 const rtems_status_code rtemsMessageQueue::flush(uint32_t& count)
diff --git a/c/src/librtems++/include/rtems++/rtemsSemaphore.h b/c/src/librtems++/include/rtems++/rtemsSemaphore.h
index cadf4288b8..31f0c96baf 100644
--- a/c/src/librtems++/include/rtems++/rtemsSemaphore.h
+++ b/c/src/librtems++/include/rtems++/rtemsSemaphore.h
@@ -135,7 +135,7 @@ const rtems_status_code rtemsSemaphore::obtain(const bool wait,
   return
     set_status_code(rtems_semaphore_obtain(id,
                                            wait ? RTEMS_WAIT : RTEMS_NO_WAIT,
-                                           TOD_MICROSECONDS_TO_TICKS(usecs)));
+                                           RTEMS_MICROSECONDS_TO_TICKS(usecs)));
 }
 
 const rtems_status_code rtemsSemaphore::release(void)
diff --git a/c/src/librtems++/include/rtems++/rtemsTimer.h b/c/src/librtems++/include/rtems++/rtemsTimer.h
index cf6b76ab97..e106b7d1ec 100644
--- a/c/src/librtems++/include/rtems++/rtemsTimer.h
+++ b/c/src/librtems++/include/rtems++/rtemsTimer.h
@@ -98,7 +98,7 @@ const rtems_status_code rtemsTimer::fire_after(const rtems_interval micro_secs)
     (micro_secs < rtems_configuration_get_microseconds_per_tick()) ?
     rtems_configuration_get_microseconds_per_tick()  : micro_secs;
   return set_status_code(rtems_timer_fire_after(id,
-                                                TOD_MICROSECONDS_TO_TICKS(usecs),
+                                                RTEMS_MICROSECONDS_TO_TICKS(usecs),
                                                 common_handler,
                                                 this));
 }
@@ -110,7 +110,7 @@ const rtems_status_code rtemsTimer::repeat_fire_at(const rtems_interval micro_se
     (micro_secs < rtems_configuration_get_microseconds_per_tick()) ?
     rtems_configuration_get_microseconds_per_tick()  : micro_secs;
   return set_status_code(rtems_timer_fire_after(id,
-                                                TOD_MICROSECONDS_TO_TICKS(usecs),
+                                                RTEMS_MICROSECONDS_TO_TICKS(usecs),
                                                 common_handler,
                                                 this));
 }
diff --git a/c/src/librtems++/src/rtemsTask.cc b/c/src/librtems++/src/rtemsTask.cc
index 928cfc93f7..b40ae39a39 100644
--- a/c/src/librtems++/src/rtemsTask.cc
+++ b/c/src/librtems++/src/rtemsTask.cc
@@ -234,7 +234,7 @@ const rtems_status_code rtemsTask::wake_after(const rtems_interval micro_secs)
   rtems_interval usecs =
     (micro_secs < rtems_configuration_get_microseconds_per_tick()) ?
     rtems_configuration_get_microseconds_per_tick() : micro_secs;
-  return set_status_code(rtems_task_wake_after(TOD_MICROSECONDS_TO_TICKS(usecs)));
+  return set_status_code(rtems_task_wake_after(RTEMS_MICROSECONDS_TO_TICKS(usecs)));
 }
 
 const rtems_status_code rtemsTask::wake_when(const rtems_time_of_day& tod)