Changes for L1 V20.03 onwards

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

diff --git a/build/odu/makefile b/build/odu/makefile
index ac5db97..fd75f8a 100644 (file)
--- a/build/odu/makefile
+++ b/build/odu/makefile
@@ -87,7 +87,7 @@ ifeq ($(NODE),TEST_STUB)
        PLTFRM_FLAGS+=-DODU_TEST_STUB
 endif
 ifeq ($(PHY), INTEL_L1)
-       PLTFRM_FLAGS+=-DSS_USE_WLS_MEM -DINTEL_WLS_MEM -DDEBUG_MODE
+       PLTFRM_FLAGS+=-DSS_USE_WLS_MEM -DINTEL_WLS_MEM -DDEBUG_MODE -DINTEL_L1_V20_03_ONWARDS
 ifeq ($(PHY_MODE),TIMER)
        PLTFRM_FLAGS+=-DINTEL_TIMER_MODE
 endif

diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c
index 03e7a28..3c12a8d 100644 (file)
--- a/src/mt/mt_ss.c
+++ b/src/mt/mt_ss.c
@@ -181,8 +181,6 @@ S16 rgBatchProc ARGS((
 char            my_buffer2[4096 * 4] = { 0 };
 char            my_buffer[4096] = { 0 };
 int             my_buffer_idx = 0;
-uint64_t        nWlsMacMemorySize = 0;
-uint64_t        nWlsPhyMemorySize = 0;
 
 
 #define sigsegv_print(x, ...)    my_buffer_idx += sprintf(&my_buffer[my_buffer_idx], x "\n", ##__VA_ARGS__)
@@ -889,6 +887,12 @@ S8 gWrWlsDeviceName[MAX_WLS_DEVICE_NAME_LEN];
 S16 smWrReadWlsConfigParams (Void);
 #endif
 
+/*WLS Memory Size variables*/
+#ifdef INTEL_L1_V20_03_ONWARDS
+uint64_t        nWlsMacMemorySize = 0;
+uint64_t        nWlsPhyMemorySize = 0;
+#endif
+
 static int SOpenWlsIntf()
 {
    uint8_t i;
@@ -914,16 +918,17 @@ static int SOpenWlsIntf()
    hdl = WLS_Open(WLS_DEVICE_NAME, 1);
 #endif
 #else
-#ifdef INTEL_L1_V19_10
-   hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, WLS_MEM_SIZE);
-#elif INTEL_L1
-   hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, &nWlsMacMemorySize, &nWlsPhyMemorySize);
 
+#ifdef INTEL_L1_V20_03_ONWARDS
+   hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, &nWlsMacMemorySize, &nWlsPhyMemorySize);
    if(hdl == NULL)
    {
       printf("\nERROR: WLS_Open > DEVICE_NAME mismatch. WLS Device Name should be same as 'wls_dev_name' parameter in 'phycfg_xran.xml' file");
    }
-#endif
+#else
+   hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, WLS_MEM_SIZE);
+#endif /*INTEL_L1_V20_03_ONWARDS*/
+
 #endif
 
    osCp.wls.intf = hdl;
@@ -1592,10 +1597,10 @@ static S16 SAllocateWlsDynMem()
       mtDynMemSz[i].reqdSz += (mtGlobMemoCfg.bkt[i].blkSize * mtGlobMemoCfg.bkt[i].numBlks);
    }
    osCp.wls.allocAddr = WLS_Alloc(osCp.wls.intf,
-#ifdef INTEL_L1_V19_10
-        WLS_MEMORY_SIZE);
-#elif INTEL_L1
+#ifdef INTEL_L1_V20_03_ONWARDS
     nWlsMacMemorySize+nWlsPhyMemorySize);   
+#elif INTEL_L1_V19_10
+        WLS_MEMORY_SIZE);
 #else
    (reqdMemSz + (4 * 1024 * 1024)));
 #endif