X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fmt_ss.c;fp=src%2Fmt%2Fmt_ss.c;h=3c12a8d3107bdd27effee431cf7fc8fbd033c7c1;hb=71278e10d44c0ee8855fec565c95aa0bb9135183;hp=03e7a28ac94c4aa2b3a5a9847369bc886fe9d64e;hpb=7a62df669e493c0d9bc6e83e57ae271607547bab;p=o-du%2Fl2.git diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index 03e7a28ac..3c12a8d31 100644 --- 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