function to configure cellgroup at RRC

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -76,7 +76,7 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst)
     if (get_softmodem_params()->sa)
       ue_init_config_request(nr_ue_mac_inst, get_softmodem_params()->numerology);
 
-    if (rrc_inst && rrc_inst->scell_group_config) {
+    if (get_softmodem_params()->do_ra || get_softmodem_params()->phy_test) {
 
       int rc = rlc_module_init(0);
       AssertFatal(rc == 0, "%s: Could not initialize RLC layer\n", __FUNCTION__);

openair2/RRC/NR_UE/rrc_defs.h

@@ -191,7 +191,7 @@ typedef struct rrcPerNB {
   NR_MeasIdToAddMod_t *MeasId[MAX_MEAS_ID];
   NR_MeasGapConfig_t *measGapConfig;
   NR_UE_RRC_SRB_INFO_t Srb[NR_NUM_SRB];
-  bool active_DRBs[MAX_DRBS_PER_UE];
+  NR_RB_status_t status_DRBs[MAX_DRBS_PER_UE];
   bool active_RLC_entity[NR_MAX_NUM_LCID];
   NR_UE_RRC_SI_INFO SInfo;
   NR_RSRP_Range_t s_measure;
@@ -201,7 +201,6 @@ typedef struct NR_UE_RRC_INST_s {
   NR_MeasConfig_t        *meas_config;
   NR_CellGroupConfig_t   *cell_group_config;
   NR_ServingCellConfigCommonSIB_t *servingCellConfigCommonSIB;
-  NR_CellGroupConfig_t   *scell_group_config;
   NR_RadioBearerConfig_t *radio_bearer_config;
 
   rrcPerNB_t perNB[NB_CNX_UE];
@@ -215,9 +214,8 @@ typedef struct NR_UE_RRC_INST_s {
 
   // NR_MIB_t *mib;
 
-  // active BWPs
-  NR_BWP_DownlinkDedicated_t *bwpd;
-  NR_BWP_UplinkDedicated_t *ubwpd;
+  NR_BWP_Id_t dl_bwp_id;
+  NR_BWP_Id_t ul_bwp_id;
 
   /* KeNB as computed from parameters within USIM card */
   uint8_t kgnb[32];

openair2/RRC/NR_UE/rrc_proto.h

@@ -68,6 +68,10 @@ void init_nsa_message (NR_UE_RRC_INST_t *rrc, char* reconfig_file, char* rbconfi
 
 void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type, void *message, int msg_len);
 
+void nr_rrc_cellgroup_configuration(rrcPerNB_t *rrcNB,
+                                    instance_t instance,
+                                    NR_CellGroupConfig_t *cellGroupConfig);
+
 /**\brief interface between MAC and RRC thru SRB0 (RLC TM/no PDCP)
    \param module_id  module id
    \param CC_id      component carrier id