From 0b172df9f0ad61e6876111d887ed86c8c0899f37 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 10 Jul 1997 20:23:27 +0000 Subject: fixed milliseconds and microseconds to tick conversion routines. --- c/src/ada/rtems.adb | 21 ++++++++++----------- cpukit/ada/rtems.adb | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 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,26 +66,25 @@ package body RTEMS is end Milliseconds_To_Microseconds; - function Milliseconds_To_Ticks ( - Milliseconds : RTEMS.Unsigned32 + function Microseconds_To_Ticks ( + Microseconds : RTEMS.Unsigned32 ) return RTEMS.Interval is - Ticks_Per_Second : RTEMS.Interval; - pragma Import (C, Ticks_Per_Second, "_TOD_Ticks_per_second"); - + Microseconds_Per_Tick : RTEMS.Interval; + pragma Import (C, Microseconds_Per_Tick, "_TOD_Microseconds_per_tick"); begin - return Milliseconds / Ticks_Per_Second; + return Microseconds / Microseconds_Per_Tick; - end Milliseconds_To_Ticks; + end Microseconds_To_Ticks; - function Microseconds_To_Ticks ( - Microseconds : RTEMS.Unsigned32 + function Milliseconds_To_Ticks ( + Milliseconds : RTEMS.Unsigned32 ) return RTEMS.Interval is begin - return Milliseconds_To_Ticks( Microseconds / 1000 ); + return Microseconds_To_Ticks(Milliseconds_To_Microseconds(Milliseconds)); - end Microseconds_To_Ticks; + end Milliseconds_To_Ticks; function Build_Name ( C1 : 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,26 +66,25 @@ package body RTEMS is end Milliseconds_To_Microseconds; - function Milliseconds_To_Ticks ( - Milliseconds : RTEMS.Unsigned32 + function Microseconds_To_Ticks ( + Microseconds : RTEMS.Unsigned32 ) return RTEMS.Interval is - Ticks_Per_Second : RTEMS.Interval; - pragma Import (C, Ticks_Per_Second, "_TOD_Ticks_per_second"); - + Microseconds_Per_Tick : RTEMS.Interval; + pragma Import (C, Microseconds_Per_Tick, "_TOD_Microseconds_per_tick"); begin - return Milliseconds / Ticks_Per_Second; + return Microseconds / Microseconds_Per_Tick; - end Milliseconds_To_Ticks; + end Microseconds_To_Ticks; - function Microseconds_To_Ticks ( - Microseconds : RTEMS.Unsigned32 + function Milliseconds_To_Ticks ( + Milliseconds : RTEMS.Unsigned32 ) return RTEMS.Interval is begin - return Milliseconds_To_Ticks( Microseconds / 1000 ); + return Microseconds_To_Ticks(Milliseconds_To_Microseconds(Milliseconds)); - end Microseconds_To_Ticks; + end Milliseconds_To_Ticks; function Build_Name ( C1 : in Character; -- cgit v1.2.3