X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fmt_ss.c;h=b91b442da97b13fc7427cf35dd64a866138e464a;hb=a50cee433ee06d6a8a4215c274432ab4ad8fdb26;hp=03e7a28ac94c4aa2b3a5a9847369bc886fe9d64e;hpb=15cfc9c3834a5c77b0cfbbe8b6cb0c576db140e6;p=o-du%2Fl2.git

diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c
index 03e7a28ac..b91b442da 100644
--- a/src/mt/mt_ss.c
+++ b/src/mt/mt_ss.c
@@ -164,25 +164,11 @@
 #include <hugetlbfs.h>
 #endif
 
-#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
-S16 rgBatchProc (Void);
-#endif
-#ifdef RLC_MAC_DAT_REQ_RBUF
-S16 rgDlDatReqBatchProc ARGS(( 
-         Void));
-#endif
-#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
-S16 rgBatchProc ARGS((
-    Void));
-#endif  
-
 #ifdef  TENB_T2K3K_SPECIFIC_CHANGES
 /* general purpose debug zone  */
 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,13 +875,19 @@ 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;
    void *hdl = NULLP;
 #define WLS_DEVICE_NAME "wls0"
 
-   char *my_argv[] = {"gnodeb", "-c3", "--proc-type=auto", "--file-prefix", WLS_DEVICE_NAME, "--iova-mode=pa"};
+   char *my_argv[] = {"gnodeb", "-c3", "--proc-type=auto", "--file-prefix", "gnb0", "--iova-mode=pa"};
    printf("\nCalling rte_eal_init: ");
    for (i = 0; i < RTE_DIM(my_argv); i++)
    {
@@ -914,16 +906,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 +1585,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
@@ -4650,9 +4643,6 @@ Void YsPhyRecvMsg();
 #endif
       /* get a message from the demand queue */
       /* RT Processing */
-#ifdef RLC_MAC_DAT_REQ_RBUF
-      rgDlDatReqBatchProc();
-#endif
 
       ret = mtTskHdlMsg(sTsk); 
       if (ret != ROK)
@@ -4660,9 +4650,6 @@ Void YsPhyRecvMsg();
 	 /* exit the for loop here */
 	 break;
       }
-#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
-      rgBatchProc();
-#endif  
    }
 
    return (NULLP);