unified handling of cellgroup config at MAC

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -852,7 +852,7 @@ int main(int argc, char **argv)
   //Configure UE
   NR_BCCH_BCH_Message_t *mib = get_new_MIB_NR(scc);
   nr_rrc_mac_config_req_mib(0, 0, mib->message.choice.mib, false);
-  nr_rrc_mac_config_req_scg(0, 0, secondaryCellGroup);
+  nr_rrc_mac_config_req_cg(0, 0, secondaryCellGroup);
 
   UE_mac->state = UE_CONNECTED;
   UE_mac->ra.ra_state = RA_SUCCEEDED;

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -691,7 +691,6 @@ int main(int argc, char *argv[])
 
   //Configure UE
   NR_UE_RRC_INST_t rrcue = {0};
-  rrcue.scell_group_config = secondaryCellGroup;
   nr_l2_init_ue(&rrcue);
 
   NR_UE_MAC_INST_t* UE_mac = get_mac_inst(0);