Fixes for incorrect TBS calculation and memory configuration [Issue-ID: ODUHIGH-338]

Change-Id: Iad02e772d2e9a09a0c2b85498f97d4309ec3d7f0
Signed-off-by: lal.harshita <Harshita.Lal@radisys.com>

diff --git a/src/cm/cm_math.c b/src/cm/cm_math.c
index 3c65dd6..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
 /*
 *

diff --git a/src/cm/cm_math.h b/src/cm/cm_math.h
index 83a5e63..a79d0ec 100755 (executable)
--- a/src/cm/cm_math.h
+++ b/src/cm/cm_math.h
@@ -31,6 +31,19 @@
 #ifndef __CMMATHH__
 #define __CMMATHH__
 
+#include <math.h>
+
+#ifdef SS_FLOAT
+/* Math library function prototypes */
+uint32_t cmAbs ARGS((F64 val));
+F64 cmPow ARGS((F64 x, F64 y));
+F64 cmFloor ARGS((F64 x));
+F64 cmLog ARGS((F64 x));
+F64 cmLog10 ARGS((F64 x));
+#endif
+
+float cmLog2(uint32_t x);
+
 #endif /* __CMMATHH__ */
 
 \f 

diff --git a/src/cm/cm_math.x b/src/cm/cm_math.x
deleted file mode 100755 (executable)
index f6bcea2..0000000
--- a/src/cm/cm_math.x
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
-################################################################################
-#   Copyright (c) [2017-2019] [Radisys]                                        #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-*******************************************************************************/
-
-/********************************************************************20**
-
-     Name:     common math library
-
-     Type:     C include file
-
-     Desc:     Extern defintions
-
-     File:     cm_math.x
-
-*********************************************************************21*/
-
-#ifndef __CMMATHX__
-#define __CMMATHX__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef SS_FLOAT
-
-/* environment dependent include files */
-#include <math.h>
-
-/* Math library function prototypes */
-uint32_t cmAbs ARGS((F64 val));
-F64 cmPow ARGS((F64 x, F64 y));
-F64 cmFloor ARGS((F64 x));
-F64 cmLog ARGS((F64 x));
-F64 cmLog10 ARGS((F64 x));
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CMMATHX__ */ 
-
-\f
-/********************************************************************30**
-
-         End of file
-**********************************************************************/

diff --git a/src/cm/common_def.h b/src/cm/common_def.h
index a130832..230445a 100644 (file)
--- a/src/cm/common_def.h
+++ b/src/cm/common_def.h
@@ -26,12 +26,12 @@
 #include <stdint.h>
 
 #include "cm_mem.h"
-#include "cm_math.h"
 #include "envopt.h"
 #include "envdep.h"
 #include "envind.h"
 #include "gen.h" 
 #include "ssi.h" 
+#include "cm_math.h"
 #include "cm5.h"
 #include "cm_tkns.h"
 #include "cm_mblk.h"
@@ -43,7 +43,6 @@
 #include "cm.h"
 #include "gen.x"           /* general */
 #include "ssi.x"           /* system services */
-#include "cm_math.x"
 #include "cm_tpt.x"
 #include "cm_tkns.x" 
 #include "cm_mblk.x"

diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c
index a6a5410..840cb7c 100644 (file)
--- a/src/mt/mt_ss.c
+++ b/src/mt/mt_ss.c
@@ -766,7 +766,7 @@ MtMemCfg mtMemoCfg =
         }
       },
       {
-        SS_DFLT_REGION + 5,                         /* region id */
+        SS_DFLT_REGION + 6,                         /* region id */
         MT_MAX_BKTS,                            /* number of buckets */
         MT_HEAP_SIZE,                           /* heap size */
         {