maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not call RCconfig_NR_L1 twice in monolithic mode

Browse Source
This commit is contained in:
francescomani
2024-02-08 13:59:28 +01:00
parent ff1cc7b378
commit 29ddb924e3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-softmodem.c
+4 -3
View File
@@ -299,7 +299,6 @@ static int create_gNB_tasks(ngran_node_t node_type, configmodule_interface_t *cf
RCconfig_verify(cfg, node_type); RCconfig_verify(cfg, node_type);
RCconfig_NR_L1();
RCconfig_nr_prs(); RCconfig_nr_prs();
if (RC.nb_nr_macrlc_inst > 0) if (RC.nb_nr_macrlc_inst > 0)
@@ -682,11 +681,13 @@ int main( int argc, char **argv ) {
#endif #endif
LOG_I(HW, "Version: %s\n", PACKAGE_VERSION); LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
if (RC.nb_nr_L1_inst > 0)
RCconfig_NR_L1();
// don't create if node doesn't connect to RRC/S1/GTP // don't create if node doesn't connect to RRC/S1/GTP
const ngran_node_t node_type = get_node_type(); const ngran_node_t node_type = get_node_type();
if (RC.nb_nr_L1_inst > 0)
RCconfig_NR_L1();
if (NFAPI_MODE != NFAPI_MODE_PNF) { if (NFAPI_MODE != NFAPI_MODE_PNF) {
int ret = create_gNB_tasks(node_type, uniqCfg); int ret = create_gNB_tasks(node_type, uniqCfg);
AssertFatal(ret == 0, "cannot create ITTI tasks\n"); AssertFatal(ret == 0, "cannot create ITTI tasks\n");
openair2/GNB_APP/gnb_config.c
-1
View File
@@ -809,7 +809,6 @@ void RCconfig_nr_prs(void)
void RCconfig_NR_L1(void) void RCconfig_NR_L1(void)
{ {
int j = 0; int j = 0;
if (RC.gNB == NULL) { if (RC.gNB == NULL) {
RC.gNB = (PHY_VARS_gNB **)malloc((1 + NUMBER_OF_gNB_MAX) * sizeof(PHY_VARS_gNB *)); RC.gNB = (PHY_VARS_gNB **)malloc((1 + NUMBER_OF_gNB_MAX) * sizeof(PHY_VARS_gNB *));
LOG_I(NR_PHY, "RC.gNB = %p\n", RC.gNB); LOG_I(NR_PHY, "RC.gNB = %p\n", RC.gNB);