updated fdd_DownlinkSubframe in enb_config.c , do_SIB1 and rrc_message_types.h

openair2/COMMON/rrc_messages_types.h

@@ -205,7 +205,7 @@ typedef struct RrcConfigurationReq_s {
 
   long			  si_WindowLength_BR_r13                    [MAX_NUM_CCs];
   long			  si_RepetitionPattern_r13                  [MAX_NUM_CCs];
-  BOOLEAN_t		  fdd_DownlinkOrTddSubframeBitmapBR_r13     [MAX_NUM_CCs];
+  BOOLEAN_t		 * fdd_DownlinkOrTddSubframeBitmapBR_r13     [MAX_NUM_CCs];
   uint64_t		  fdd_DownlinkOrTddSubframeBitmapBR_val_r13 [MAX_NUM_CCs];
   uint16_t		  fdd_UplinkSubframeBitmapBR_r13            [MAX_NUM_CCs];
   long			  startSymbolBR_r13                         [MAX_NUM_CCs];

openair2/ENB_APP/enb_config.c

@@ -22,10 +22,10 @@
 /*
    enb_config.c
    -------------------
-  AUTHOR  : Lionel GAUTHIER, navid nikaein, Laurent Winckel
-  COMPANY : EURECOM
-  EMAIL   : Lionel.Gauthier@eurecom.fr, navid.nikaein@eurecom.fr
-*/
+AUTHOR  : Lionel GAUTHIER, navid nikaein, Laurent Winckel
+COMPANY : EURECOM
+EMAIL   : Lionel.Gauthier@eurecom.fr, navid.nikaein@eurecom.fr
+ */
 
 #include <string.h>
 #include <libconfig.h>
@@ -3771,8 +3771,6 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
                   RRC_CONFIGURATION_REQ(msg_p).bandwidthReducedAccessRelatedInfo_r13[j] = TRUE;
                   if (!config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_WINDOWLENGTH_BR, &si_WindowLength_BR_r13) ||
                       !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_REPETITIONPATTERN, &si_RepetitionPattern_r13) ||
-                        !config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDD_SFB_BR, &fdd_DownlinkOrTddSubframeBitmapBR_r13) ||
-                        !config_setting_lookup_int64(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDDSFB_BR_VAL, &fdd_DownlinkOrTddSubframeBitmapBR_val_r13) ||
                       !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_FDD_ULSUBFRAMEBITMAPBR, &fdd_UplinkSubframeBitmapBR_r13) ||
                       !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_STARTSYMBOLBR, &startSymbolBR_r13) ||
                       !config_setting_lookup_int(setting_br13, ENB_CONFIG_STRING_SI_HOPPINGCONFIGCOMMON, &si_HoppingConfigCommon_r13))
@@ -3782,13 +3780,29 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
                         RC.config_file_name, i);
 
                   }
-		    RRC_CONFIGURATION_REQ(msg_p).si_WindowLength_BR_r13[j] = si_WindowLength_BR_r13;
-		    RRC_CONFIGURATION_REQ(msg_p).si_RepetitionPattern_r13[j] = si_RepetitionPattern_r13;
+
+                  bool fdd_downlink_exist = config_setting_lookup_string(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDD_SFB_BR, &fdd_DownlinkOrTddSubframeBitmapBR_r13);
+                  if (fdd_downlink_exist)
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = CALLOC(1, sizeof(BOOLEAN_t));
                     if (!strcmp(fdd_DownlinkOrTddSubframeBitmapBR_r13, "subframePattern40-r13"))
-		      RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = FALSE;
+                      *RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = FALSE;
                     else
-		      RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = TRUE;
+                      *RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = TRUE;
+                    
+                    config_setting_lookup_int64(setting_br13, ENB_CONFIG_STRING_FDD_DLORTDDSFB_BR_VAL, &fdd_DownlinkOrTddSubframeBitmapBR_val_r13);
                     RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_val_r13[j] = fdd_DownlinkOrTddSubframeBitmapBR_val_r13;
+ 
+                  }
+                  else
+                  {
+                    RRC_CONFIGURATION_REQ(msg_p).fdd_DownlinkOrTddSubframeBitmapBR_r13[j] = NULL;
+                  }
+
+
+                    RRC_CONFIGURATION_REQ(msg_p).si_WindowLength_BR_r13[j] = si_WindowLength_BR_r13;
+                  RRC_CONFIGURATION_REQ(msg_p).si_RepetitionPattern_r13[j] = si_RepetitionPattern_r13;
+                 
                   RRC_CONFIGURATION_REQ(msg_p).fdd_UplinkSubframeBitmapBR_r13[j] = fdd_UplinkSubframeBitmapBR_r13;
                   RRC_CONFIGURATION_REQ(msg_p).si_HoppingConfigCommon_r13[j] = si_HoppingConfigCommon_r13;
                   RRC_CONFIGURATION_REQ(msg_p).startSymbolBR_r13[j] = startSymbolBR_r13;
@@ -4236,8 +4250,8 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
         }
       }
     }
-}
-int RCconfig_gtpu() {
+  }
+  int RCconfig_gtpu() {
     config_t          cfg;
     config_setting_t *setting                       = NULL;
     config_setting_t *subsetting                    = NULL;
@@ -4317,10 +4331,10 @@ int RCconfig_gtpu() {
         }
       }
     }
-}
+  }
 
 
-int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
+  int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
     config_t          cfg;
     config_setting_t *setting                       = NULL;
     config_setting_t *subsetting                    = NULL;
@@ -4585,9 +4599,9 @@ int RCconfig_S1(MessageDef *msg_p, uint32_t i) {
       }
     }
     return;
-}
+  }
 
-void RCConfig(const char *config_file_name) {
+  void RCConfig(const char *config_file_name) {
 
     config_t          cfg;
     config_setting_t *setting                       = NULL;
@@ -4638,4 +4652,4 @@ void RCConfig(const char *config_file_name) {
     }
 
     return;
-}
+  }

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -587,12 +587,15 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
 	    ASN_SEQUENCE_ADD(&sib1_1310->bandwidthReducedAccessRelatedInfo_r13->schedulingInfoList_BR_r13->list, schedulinginfo_br_13);
           }
 
+
+          if (configuration->fdd_DownlinkOrTddSubframeBitmapBR_r13[CC_id])
+          {
               sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13
                   = calloc(1, sizeof(struct SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13));
               memset(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13, 0,
                  sizeof(sizeof(struct SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13)));
 
-          if (configuration->bandwidthReducedAccessRelatedInfo_r13[CC_id])
+              if (*configuration->fdd_DownlinkOrTddSubframeBitmapBR_r13[CC_id])
               {
                   sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present
                          = SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13_PR_subframePattern10_r13;
@@ -613,6 +616,12 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
                   sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern40_r13.bits_unused = 0;
               }
 
+          }
+          else
+          {
+              sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13 = NULL;
+          }
+
           sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_UplinkSubframeBitmapBR_r13 = calloc(1, sizeof(BIT_STRING_t));
           memset(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_UplinkSubframeBitmapBR_r13, 0, sizeof(BIT_STRING_t));
           sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_UplinkSubframeBitmapBR_r13->buf = calloc(2, sizeof(uint8_t));