From 0b172df9f0ad61e6876111d887ed86c8c0899f37 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 10 Jul 1997 20:23:27 +0000 Subject: [PATCH] fixed milliseconds and microseconds to tick conversion routines. --- c/src/ada/rtems.adb | 25 ++++++++++++------------- cpukit/ada/rtems.adb | 25 ++++++++++++------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/c/src/ada/rtems.adb b/c/src/ada/rtems.adb index 311fe57827..3071a79ecb 100644 --- a/c/src/ada/rtems.adb +++ b/c/src/ada/rtems.adb @@ -66,27 +66,26 @@ package body RTEMS is end Milliseconds_To_Microseconds; - function Milliseconds_To_Ticks ( - Milliseconds : RTEMS.Unsigned32 - ) return RTEMS.Interval is - Ticks_Per_Second : RTEMS.Interval; - pragma Import (C, Ticks_Per_Second, "_TOD_Ticks_per_second"); - - begin - - return Milliseconds / Ticks_Per_Second; - - end Milliseconds_To_Ticks; - function Microseconds_To_Ticks ( Microseconds : RTEMS.Unsigned32 ) return RTEMS.Interval is + Microseconds_Per_Tick : RTEMS.Interval; + pragma Import (C, Microseconds_Per_Tick, "_TOD_Microseconds_per_tick"); begin - return Milliseconds_To_Ticks( Microseconds / 1000 ); + return Microseconds / Microseconds_Per_Tick; end Microseconds_To_Ticks; + function Milliseconds_To_Ticks ( + Milliseconds : RTEMS.Unsigned32 + ) return RTEMS.Interval is + begin + + return Microseconds_To_Ticks(Milliseconds_To_Microseconds(Milliseconds)); + + end Milliseconds_To_Ticks; + function Build_Name ( C1 : in Character; C2 : in Character; diff --git a/cpukit/ada/rtems.adb b/cpukit/ada/rtems.adb index 311fe57827..3071a79ecb 100644 --- a/cpukit/ada/rtems.adb +++ b/cpukit/ada/rtems.adb @@ -66,27 +66,26 @@ package body RTEMS is end Milliseconds_To_Microseconds; - function Milliseconds_To_Ticks ( - Milliseconds : RTEMS.Unsigned32 - ) return RTEMS.Interval is - Ticks_Per_Second : RTEMS.Interval; - pragma Import (C, Ticks_Per_Second, "_TOD_Ticks_per_second"); - - begin - - return Milliseconds / Ticks_Per_Second; - - end Milliseconds_To_Ticks; - function Microseconds_To_Ticks ( Microseconds : RTEMS.Unsigned32 ) return RTEMS.Interval is + Microseconds_Per_Tick : RTEMS.Interval; + pragma Import (C, Microseconds_Per_Tick, "_TOD_Microseconds_per_tick"); begin - return Milliseconds_To_Ticks( Microseconds / 1000 ); + return Microseconds / Microseconds_Per_Tick; end Microseconds_To_Ticks; + function Milliseconds_To_Ticks ( + Milliseconds : RTEMS.Unsigned32 + ) return RTEMS.Interval is + begin + + return Microseconds_To_Ticks(Milliseconds_To_Microseconds(Milliseconds)); + + end Milliseconds_To_Ticks; + function Build_Name ( C1 : in Character; C2 : in Character;