Merge "[Epic-ID: ODUHIGH-405][Task-ID: ODUHIGH-437] Establishing communication betwee...

[o-du/l2.git] / src / cm / cm_math.c

diff --git a/src/cm/cm_math.c b/src/cm/cm_math.c
index 0b1044c..4167831 100755 (executable)
--- a/src/cm/cm_math.c
+++ b/src/cm/cm_math.c
@@ -40,13 +40,9 @@
 #include "ssi.h"                /* system services interface */
 
 #include "cm_math.h"
-#include "cm_math.x"
-
 #include <stdlib.h>
-
 #include <math.h>
 
-
 #ifdef SS_FLOAT
 /*
 *
@@ -61,18 +57,10 @@
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-PUBLIC U32 cmAbs
-(
-F64          val
-)
-#else
-PUBLIC U32 cmAbs(val)
-F64          val;
-#endif
+uint32_t cmAbs(F64  val)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
-   RETVALUE((U32) abs((int) val));/* G++ */
+   return ((uint32_t) abs((int) val));/* G++ */
 #endif
 } /* end of cmAbs */
 #endif /* SS_FLOAT */
@@ -92,20 +80,10 @@ F64          val;
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-PUBLIC F64 cmPow
-(
-F64          x,
-F64          y
-)
-#else
-PUBLIC F64 cmPow(x, y)
-F64           x;
-F64           y;
-#endif
+F64 cmPow(F64 x,F64 y)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
-   RETVALUE((F64) pow((F64)x, (F64)y));
+   return ((F64) pow((F64)x, (F64)y));
 #endif
 } /* end of cmPow */
 #endif /* SS_FLOAT */
@@ -125,18 +103,10 @@ F64           y;
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-PUBLIC F64 cmFloor
-(
-F64          x
-)
-#else
-PUBLIC F64 cmFloor(x)
-F64           x;
-#endif
+F64 cmFloor(F64  x)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
-   RETVALUE((F64) floor((F64)x));
+   return ((F64) floor((F64)x));
 #endif
 
 } /* end of cmFloor */
@@ -156,18 +126,10 @@ F64           x;
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-PUBLIC F64 cmLog
-(
-F64          x
-)
-#else
-PUBLIC F64 cmLog(x)
-F64           x;
-#endif
+F64 cmLog(F64 x)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
-   RETVALUE((F64) log((F64)x));
+   return ((F64) log((F64)x));
 #endif
 
 } /* end of cmLog */
@@ -187,22 +149,32 @@ F64           x;
 *       File:  cm_math.c
 *
 */
-#ifdef ANSI
-PUBLIC F64 cmLog10
-(
-F64          x
-)
-#else
-PUBLIC F64 cmLog10(x)
-F64           x;
-#endif
+F64 cmLog10(F64 x)
 {
 #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX))
-   RETVALUE((F64) log10((F64)x));
+   return ((F64) log10((F64)x));
 #endif
 } /* end of cmLog10 */
 #endif /* SS_FLOAT */
 
+/*
+*
+*       Fun:   cmLog
+*
+*       Desc:  common primitive for computing the base 2 logrithm of x.
+*
+*       Ret:   log2(x)
+*
+*       Notes: None
+*
+*       File:  cm_math.c
+*
+*/
+float cmLog2(uint32_t x)
+{
+   return ((float) log2(x));
+}
+
 /**********************************************************************
          End of file
 **********************************************************************/