summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
7a62df6)
Signed-off-by: lal.harshita <Harshita.Lal@radisys.com>
Change-Id: Ib2dd39406825b09c1639763a0c4f7f64f250c1a8
PLTFRM_FLAGS+=-DODU_TEST_STUB
endif
ifeq ($(PHY), INTEL_L1)
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
ifeq ($(PHY_MODE),TIMER)
PLTFRM_FLAGS+=-DINTEL_TIMER_MODE
endif
char my_buffer2[4096 * 4] = { 0 };
char my_buffer[4096] = { 0 };
int my_buffer_idx = 0;
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__)
#define sigsegv_print(x, ...) my_buffer_idx += sprintf(&my_buffer[my_buffer_idx], x "\n", ##__VA_ARGS__)
S16 smWrReadWlsConfigParams (Void);
#endif
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;
static int SOpenWlsIntf()
{
uint8_t i;
hdl = WLS_Open(WLS_DEVICE_NAME, 1);
#endif
#else
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");
}
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");
}
+#else
+ hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, WLS_MEM_SIZE);
+#endif /*INTEL_L1_V20_03_ONWARDS*/
+
#endif
osCp.wls.intf = hdl;
#endif
osCp.wls.intf = hdl;
mtDynMemSz[i].reqdSz += (mtGlobMemoCfg.bkt[i].blkSize * mtGlobMemoCfg.bkt[i].numBlks);
}
osCp.wls.allocAddr = WLS_Alloc(osCp.wls.intf,
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);
nWlsMacMemorySize+nWlsPhyMemorySize);
+#elif INTEL_L1_V19_10
+ WLS_MEMORY_SIZE);
#else
(reqdMemSz + (4 * 1024 * 1024)));
#endif
#else
(reqdMemSz + (4 * 1024 * 1024)));
#endif