fixes for multi L1

openair1/PHY/INIT/lte_init_ru.c

@@ -111,7 +111,7 @@ int phy_init_RU(RU_t *ru) {
 
     LOG_D(PHY,"[INIT] %s() RC.nb_L1_inst:%d \n", __FUNCTION__, RC.nb_L1_inst);
 
-    for (i=0; i<RC.nb_L1_inst; i++) {
+    for (i=0; i<ru->num_eNB; i++) {
       for (p=0;p<15;p++) {
         LOG_D(PHY,"[INIT] %s() nb_antenna_ports_eNB:%d \n", __FUNCTION__, ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB);
 	if (p<ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB || p==5) {

openair2/ENB_APP/enb_app.c

@@ -218,10 +218,11 @@ void *eNB_app_task(void *args_p)
   }
 
   /* Start the agent. If it is turned off in the configuration, it won't start */
-  /*RCconfig_flexran();
+  RCconfig_flexran();
+  int i;
   for (i = 0; i < RC.nb_L1_inst; i++) {
     flexran_agent_start(i);
-  }*/
+  }
 
 # if defined(ENABLE_USE_MME)
   /* Try to register each eNB */

openair2/ENB_APP/enb_config.c

@@ -182,8 +182,8 @@ void RCconfig_flexran() {
                 num_enbs, sizeof(flexran_agent_info_t *));
   }
 
-  for (i = 0; i < num_enbs; i++) {
-  //for (i = 0; i < nb_L1_inst; i++){
+  //for (i = 0; i < num_enbs; i++) {
+  for (i = 0; i < nb_L1_inst; i++){
     RC.flexran[i] = calloc(1, sizeof(flexran_agent_info_t));
     AssertFatal(RC.flexran[i],
                 "can't ALLOCATE %zu Bytes for flexran agent info (iteration %d/%d)\n",

openair2/LAYER2/MAC/config.c

@@ -1033,16 +1033,20 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
         printf("Waiting for PHY_config_req\n");
       }
     }
+printf("~~~~~~~~~~~~~~configured in rrc_mac_config_req_eNB with module_ID = %d \n", Mod_idP);
 
     if (radioResourceConfigCommon != NULL) {
-      PHY_Config_t phycfg;
-      phycfg.Mod_id = Mod_idP;
-      phycfg.CC_id  = CC_idP;
-      phycfg.cfg    = &RC.mac[Mod_idP]->config[CC_idP];
+      for(i=0;i<RC.nb_L1_inst;i++)
+      {
+        PHY_Config_t phycfg;
+        phycfg.Mod_id = i;//Mod_idP;
+        phycfg.CC_id  = CC_idP;
+        phycfg.cfg    = &RC.mac[Mod_idP]->config[CC_idP];
       
-      if (RC.mac[Mod_idP]->if_inst->PHY_config_req) RC.mac[Mod_idP]->if_inst->PHY_config_req(&phycfg); 
+        if (RC.mac[Mod_idP]->if_inst->PHY_config_req) RC.mac[Mod_idP]->if_inst->PHY_config_req(&phycfg); 
       
-      VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
+        VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
+      }
     }
     RC.mac[Mod_idP]->scheduler_mode = global_scheduler_mode;
 

openair2/RRC/LTE/rrc_eNB.c

@@ -7225,6 +7225,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
     msg_name_p = ITTI_MSG_NAME(msg_p);
     instance = ITTI_MSG_INSTANCE(msg_p);
     LOG_I(RRC,"Received message %s\n",msg_name_p);
+printf("~~~~~~~~~~~~instance = %d \n", instance);
 
     switch (ITTI_MSG_ID(msg_p)) {
     case TERMINATE_MESSAGE:
@@ -7347,6 +7348,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
       /* Messages from eNB app */
     case RRC_CONFIGURATION_REQ:
       LOG_I(RRC, "[eNB %d] Received %s : %p\n", instance, msg_name_p,&RRC_CONFIGURATION_REQ(msg_p));
+printf("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~for %d L1\n", ENB_INSTANCE_TO_MODULE_ID(instance));
       openair_rrc_eNB_configuration(ENB_INSTANCE_TO_MODULE_ID(instance), &RRC_CONFIGURATION_REQ(msg_p));
       break;
 

targets/RT/USER/lte-ru.c

@@ -2837,6 +2837,7 @@ void RCconfig_RU(void) {
         RC.ru[j]->num_eNB                           = RUParamList.paramarray[j][RU_ENB_LIST_IDX].numelt;
       else
 	    RC.ru[j]->num_eNB                           = 0;
+printf("~~~~~~~~~~~~~~~~~~~~ RC.ru[%d]->num_eNB = %d\n", j, RC.ru[j]->num_eNB);
       for (i=0;i<RC.ru[j]->num_eNB;i++) RC.ru[j]->eNB_list[i] = RC.eNB[RUParamList.paramarray[j][RU_ENB_LIST_IDX].iptr[i]][0];     
 
       if (config_isparamset(RUParamList.paramarray[j], RU_SDR_ADDRS)) {