Commit 509a78b5 authored by jperaldi's avatar jperaldi

Multi cell implementation broke 5G part. Multi cell is not available for 5G...

Multi cell implementation broke 5G part. Multi cell is not available for 5G but L1+proxy works as is. Need to force to 1 cell with static configuration
parent cd8da4db
...@@ -860,7 +860,14 @@ add_boolean_option(LINUX_LIST False "used only in lists.c: either u ...@@ -860,7 +860,14 @@ add_boolean_option(LINUX_LIST False "used only in lists.c: either u
add_boolean_option(DRIVER2013 True "only relevant for EXMIMO") add_boolean_option(DRIVER2013 True "only relevant for EXMIMO")
add_boolean_option(EXMIMO_IOT True "????") add_boolean_option(EXMIMO_IOT True "????")
add_boolean_option(LOCALIZATION False "???") add_boolean_option(LOCALIZATION False "???")
add_integer_option(MAX_NUM_CCs 2 "????") if ($ENV{NR_ENABLE})
add_integer_option(MAX_NUM_CCs 1 "????")
Message("Cell configuration for NR is 1. MULTI CELLS NOT IMPLEMENTED")
else()
add_integer_option(MAX_NUM_CCs 2 "????")
Message("Cell configuration for LTE is ${MAX_NUM_CCs}: MULTI CELLS IS IMPLEMENTED")
endif()
add_boolean_option(SMBV False "Rohde&Schwarz SMBV100A vector signal generator") add_boolean_option(SMBV False "Rohde&Schwarz SMBV100A vector signal generator")
add_boolean_option(DEBUG_PHY False "Enable PHY layer debugging options") add_boolean_option(DEBUG_PHY False "Enable PHY layer debugging options")
add_boolean_option(DEBUG_PHY_PROC False "Enable debugging of PHY layer procedures") add_boolean_option(DEBUG_PHY_PROC False "Enable debugging of PHY layer procedures")
...@@ -2772,7 +2779,7 @@ target_link_libraries (lte-uesoftmodem lttng-ust) ...@@ -2772,7 +2779,7 @@ target_link_libraries (lte-uesoftmodem lttng-ust)
if ($ENV{NR_ENABLE}) if ($ENV{NR_ENABLE})
add_boolean_option(NR_ENABLE TRUE "Flag for NR compilation") add_boolean_option(NR_ENABLE TRUE "Flag for NR compilation")
else() else()
add_boolean_option(NR_ENABLE FALSE "Flag for NR compilation") add_boolean_option(NR_ENABLE FALSE "Flag for NR compilation")
endif() endif()
Message("NR_ENABLE flag is ${NR_ENABLE}") Message("NR_ENABLE flag is ${NR_ENABLE}")
......
...@@ -240,22 +240,22 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){ ...@@ -240,22 +240,22 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
if (NFAPI_MODE == NFAPI_MODE_VNF) { //If VNF, oai_nfapi functions send respective p7 msgs to PNF for which nPDUs is greater than 0 if (NFAPI_MODE == NFAPI_MODE_VNF) { //If VNF, oai_nfapi functions send respective p7 msgs to PNF for which nPDUs is greater than 0
if(number_ul_tti_pdu>0) { if(number_ul_tti_pdu>0) {
UL_tti_req->header.phy_id = Sched_INFO->CC_id + 1; //UL_tti_req->header.phy_id = Sched_INFO->CC_id + 1;
oai_nfapi_ul_tti_req(UL_tti_req); oai_nfapi_ul_tti_req(UL_tti_req);
} }
if (number_ul_dci_pdu>0) { if (number_ul_dci_pdu>0) {
UL_dci_req->header.phy_id = Sched_INFO->CC_id + 1; //UL_dci_req->header.phy_id = Sched_INFO->CC_id + 1;
oai_nfapi_ul_dci_req(UL_dci_req); oai_nfapi_ul_dci_req(UL_dci_req);
} }
if (number_tx_data_pdu>0) { if (number_tx_data_pdu>0) {
TX_req->header.phy_id = Sched_INFO->CC_id + 1; //TX_req->header.phy_id = Sched_INFO->CC_id + 1;
oai_nfapi_tx_data_req(TX_req); oai_nfapi_tx_data_req(TX_req);
} }
if (number_dl_pdu>0) { if (number_dl_pdu>0) {
DL_req->header.phy_id = Sched_INFO->CC_id + 1; //DL_req->header.phy_id = Sched_INFO->CC_id + 1;
oai_nfapi_dl_tti_req(DL_req); oai_nfapi_dl_tti_req(DL_req);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment