Skip to content

O
OpenXG-RAN
Commit 0870b93c authored by rmagueta's avatar rmagueta
Browse files
Options

Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into... 

Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts
parents f4ee04fd c3c925bd
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 43 deletions
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @ 0870b93c
......@@ -1176,15 +1176,11 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
NR_ServingCellConfigCommon_t *scc) {
NR_RLC_BearerConfig_t *rlc_BearerConfig = NULL;
NR_RLC_BearerConfig_t *rlc_BearerConfig2 = NULL;
NR_RLC_Config_t *rlc_Config = NULL;
NR_RLC_Config_t *rlc_Config2 = NULL;
NR_LogicalChannelConfig_t *logicalChannelConfig = NULL;
NR_LogicalChannelConfig_t *logicalChannelConfig2= NULL;
NR_MAC_CellGroupConfig_t *mac_CellGroupConfig = NULL;
NR_PhysicalCellGroupConfig_t *physicalCellGroupConfig = NULL;
long *logicalChannelGroup = NULL;
long *logicalChannelGroup2 = NULL;
cellGroupConfig->cellGroupId = 0;
......@@ -1225,7 +1221,12 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
rlc_BearerConfig->mac_LogicalChannelConfig = logicalChannelConfig;
ASN_SEQUENCE_ADD(&cellGroupConfig->rlc_BearerToAddModList->list, rlc_BearerConfig);
/*
// SRB2
NR_RLC_BearerConfig_t *rlc_BearerConfig2 = NULL;
NR_RLC_Config_t *rlc_Config2 = NULL;
NR_LogicalChannelConfig_t *logicalChannelConfig2= NULL;
long *logicalChannelGroup2 = NULL;
rlc_BearerConfig2 = calloc(1, sizeof(NR_RLC_BearerConfig_t));
rlc_BearerConfig2->logicalChannelIdentity = 2;
rlc_BearerConfig2->servedRadioBearer = calloc(1, sizeof(*rlc_BearerConfig2->servedRadioBearer));
......@@ -1259,6 +1260,7 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
logicalChannelConfig2->ul_SpecificParameters->logicalChannelSR_DelayTimerApplied = 0;
rlc_BearerConfig2->mac_LogicalChannelConfig = logicalChannelConfig2;
ASN_SEQUENCE_ADD(&cellGroupConfig->rlc_BearerToAddModList->list, rlc_BearerConfig2);
*/
cellGroupConfig->rlc_BearerToReleaseList = NULL;
......
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @ 0870b93c
......@@ -164,29 +164,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
secondaryCellGroup->rlc_BearerToAddModList = calloc(1,sizeof(*secondaryCellGroup->rlc_BearerToAddModList));
ASN_SEQUENCE_ADD(&secondaryCellGroup->rlc_BearerToAddModList->list, RLC_BearerConfig);
if (get_softmodem_params()->sa) {
NR_RLC_BearerConfig_t *RLC_BearerConfig_srb1 = calloc(1,sizeof(*RLC_BearerConfig_srb1));
nr_rlc_bearer_init(RLC_BearerConfig_srb1, NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity);
nr_drb_config(RLC_BearerConfig_srb1->rlc_Config, NR_RLC_Config_PR_am);
nr_rlc_bearer_init_ul_spec(RLC_BearerConfig_srb1->mac_LogicalChannelConfig);
// FIXME: this should be obtained in nr_rlc_bearer_init_ul_spec()
*RLC_BearerConfig_srb1->mac_LogicalChannelConfig->ul_SpecificParameters->logicalChannelGroup = 0;
ASN_SEQUENCE_ADD(&secondaryCellGroup->rlc_BearerToAddModList->list, RLC_BearerConfig_srb1);
NR_RLC_BearerConfig_t *RLC_BearerConfig_srb2 = calloc(1,sizeof(*RLC_BearerConfig_srb2));
nr_rlc_bearer_init(RLC_BearerConfig_srb2, NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity);
nr_drb_config(RLC_BearerConfig_srb2->rlc_Config, NR_RLC_Config_PR_am);
nr_rlc_bearer_init_ul_spec(RLC_BearerConfig_srb2->mac_LogicalChannelConfig);
// FIXME: this should be obtained in nr_rlc_bearer_init_ul_spec()
*RLC_BearerConfig_srb2->mac_LogicalChannelConfig->ul_SpecificParameters->logicalChannelGroup = 0;
RLC_BearerConfig_srb2->logicalChannelIdentity = 2;
RLC_BearerConfig_srb2->servedRadioBearer->choice.srb_Identity = 2;
ASN_SEQUENCE_ADD(&secondaryCellGroup->rlc_BearerToAddModList->list, RLC_BearerConfig_srb2);
}
secondaryCellGroup->mac_CellGroupConfig=calloc(1,sizeof(*secondaryCellGroup->mac_CellGroupConfig));
secondaryCellGroup->mac_CellGroupConfig->drx_Config = NULL;
secondaryCellGroup->mac_CellGroupConfig->schedulingRequestConfig = calloc(1,sizeof(*secondaryCellGroup->mac_CellGroupConfig->schedulingRequestConfig));
secondaryCellGroup->mac_CellGroupConfig->schedulingRequestConfig->schedulingRequestToAddModList = calloc(1,sizeof(*secondaryCellGroup->mac_CellGroupConfig->schedulingRequestConfig->schedulingRequestToAddModList));
NR_SchedulingRequestToAddMod_t *SchedulingRequestConf = calloc(1,sizeof(*SchedulingRequestConf));
......@@ -1278,24 +1257,6 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
e_NR_SecurityConfig__keyToUse key_to_use) {
rbconfig->srb_ToAddModList = NULL;
if (get_softmodem_params()->sa) {
rbconfig->srb_ToAddModList = calloc(1,sizeof(*rbconfig->srb_ToAddModList));
NR_SRB_ToAddMod_t *srb1_ToAddMod = calloc(1,sizeof(*srb1_ToAddMod));
srb1_ToAddMod->srb_Identity = 1;
srb1_ToAddMod->reestablishPDCP = NULL;
srb1_ToAddMod->discardOnPDCP = NULL;
srb1_ToAddMod->pdcp_Config = NULL;
ASN_SEQUENCE_ADD(&rbconfig->srb_ToAddModList->list,srb1_ToAddMod);
NR_SRB_ToAddMod_t *srb2_ToAddMod = calloc(1,sizeof(*srb2_ToAddMod));
srb2_ToAddMod->srb_Identity = 2;
srb2_ToAddMod->reestablishPDCP = NULL;
srb2_ToAddMod->discardOnPDCP = NULL;
srb2_ToAddMod->pdcp_Config = NULL;
ASN_SEQUENCE_ADD(&rbconfig->srb_ToAddModList->list,srb2_ToAddMod);
}
rbconfig->srb3_ToRelease = NULL;
rbconfig->drb_ToAddModList = calloc(1,sizeof(*rbconfig->drb_ToAddModList));
NR_DRB_ToAddMod_t *drb_ToAddMod = calloc(1,sizeof(*drb_ToAddMod));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment