Code Review
/
o-du
/
phy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
O-RAN E Maintenance Release contribution for ODULOW
[o-du/phy.git]
/
wls_lib
/
test
/
phy
/
phy_main.c
diff --git
a/wls_lib/test/phy/phy_main.c
b/wls_lib/test/phy/phy_main.c
index
cf3dd61
..
2a48c0b
100644
(file)
--- a/
wls_lib/test/phy/phy_main.c
+++ b/
wls_lib/test/phy/phy_main.c
@@
-43,7
+43,8
@@
#define WLS_TEST_DEV_NAME "wls"
#define WLS_TEST_MSG_ID 1
#define WLS_TEST_MSG_SIZE 100
#define WLS_TEST_DEV_NAME "wls"
#define WLS_TEST_MSG_ID 1
#define WLS_TEST_MSG_SIZE 100
-#define WLS_TEST_MEM_SIZE 2126512128
+#define WLS_MAC_MEMORY_SIZE 0x3EA80000
+#define WLS_PHY_MEMORY_SIZE 0x18000000
#define NUM_PHY_MSGS 16
typedef void* WLS_HANDLE;
#define NUM_PHY_MSGS 16
typedef void* WLS_HANDLE;
@@
-53,7
+54,7
@@
uint64_t g_shmem_size;
WLS_HANDLE g_fapi_wls, g_phy_wls;
uint8_t phy_dpdk_init(void);
WLS_HANDLE g_fapi_wls, g_phy_wls;
uint8_t phy_dpdk_init(void);
-uint8_t phy_wls_init(const char *dev_name, u
nsigned long long mem_s
ize);
+uint8_t phy_wls_init(const char *dev_name, u
int64_t nWlsMacMemSize, uint64_t nWlsPhyMemS
ize);
uint64_t phy_fapi_recv();
uint8_t phy_fapi_send();
uint64_t phy_fapi_recv();
uint8_t phy_fapi_send();
@@
-72,7
+73,7
@@
int main()
printf("\n[PHY] DPDK Init - Done\n");
// WLS init
printf("\n[PHY] DPDK Init - Done\n");
// WLS init
- ret = phy_wls_init(WLS_TEST_DEV_NAME, WLS_
TEST_MEM
_SIZE);
+ ret = phy_wls_init(WLS_TEST_DEV_NAME, WLS_
MAC_MEMORY_SIZE, WLS_PHY_MEMORY
_SIZE);
if(ret)
{
printf("\n[PHY] WLS Init - Failed\n");
if(ret)
{
printf("\n[PHY] WLS Init - Failed\n");
@@
-114,7
+115,7
@@
uint8_t phy_dpdk_init(void)
int argc = RTE_DIM(argv);
/* initialize EAL first */
int argc = RTE_DIM(argv);
/* initialize EAL first */
- sprintf(whitelist, "-
w
%s", "0000:00:06.0");
+ sprintf(whitelist, "-
a
%s", "0000:00:06.0");
printf("[PHY] Calling rte_eal_init: ");
for (i = 0; i < RTE_DIM(argv); i++)
printf("[PHY] Calling rte_eal_init: ");
for (i = 0; i < RTE_DIM(argv); i++)
@@
-129,14
+130,14
@@
uint8_t phy_dpdk_init(void)
return SUCCESS;
}
return SUCCESS;
}
-uint8_t phy_wls_init(const char *dev_name, u
nsigned long long mem_s
ize)
+uint8_t phy_wls_init(const char *dev_name, u
int64_t nWlsMacMemSize, uint64_t nWlsPhyMemS
ize)
{
{
- g_phy_wls = WLS_Open(dev_name, WLS_SLAVE_CLIENT,
mem_s
ize);
+ g_phy_wls = WLS_Open(dev_name, WLS_SLAVE_CLIENT,
&nWlsMacMemSize, &nWlsPhyMemS
ize);
if(NULL == g_phy_wls)
{
return FAILURE;
}
if(NULL == g_phy_wls)
{
return FAILURE;
}
- g_shmem_size =
mem_s
ize;
+ g_shmem_size =
nWlsMacMemSize+nWlsPhyMemS
ize;
g_shmem = WLS_Alloc(g_phy_wls, g_shmem_size);
if (NULL == g_shmem)
g_shmem = WLS_Alloc(g_phy_wls, g_shmem_size);
if (NULL == g_shmem)