maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaming SR config function

Browse Source
This commit is contained in:
francescomani
2022-04-13 10:58:28 +02:00
parent 11ced194cd
commit cfda6c7b1d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/NR/MESSAGES/asn1_msg.c
+1 -1
View File
@@ -1185,7 +1185,7 @@ void fill_initial_SpCellConfig(int uid,
srs_res0->spatialRelationInfo->referenceSignal.choice.csi_RS_Index=0;
ASN_SEQUENCE_ADD(&srs_Config->srs_ResourceToAddModList->list,srs_res0);
schedulingrequest_config(scc, cellGroupConfig->mac_CellGroupConfig, pucch_Config);
scheduling_request_config(scc, cellGroupConfig->mac_CellGroupConfig, pucch_Config);
set_dl_DataToUL_ACK(pucch_Config, configuration->minRXTXTIME);
openair2/RRC/NR/nr_rrc_config.c
+3 -3
View File
@@ -473,9 +473,9 @@ void set_SR_periodandoffset(NR_SchedulingRequestResourceConfig_t *schedulingRequ
schedulingRequestResourceConfig->periodicityAndOffset->choice.sl640 = sr_slot;
}
void schedulingrequest_config(NR_ServingCellConfigCommon_t *scc,
NR_MAC_CellGroupConfig_t *mac_CellGroupConfig,
NR_PUCCH_Config_t *pucch_Config) {
void scheduling_request_config(NR_ServingCellConfigCommon_t *scc,
NR_MAC_CellGroupConfig_t *mac_CellGroupConfig,
NR_PUCCH_Config_t *pucch_Config) {
mac_CellGroupConfig->schedulingRequestConfig = calloc(1, sizeof(*mac_CellGroupConfig->schedulingRequestConfig));
mac_CellGroupConfig->schedulingRequestConfig->schedulingRequestToAddModList = CALLOC(1,sizeof(*mac_CellGroupConfig->schedulingRequestConfig->schedulingRequestToAddModList));
openair2/RRC/NR/nr_rrc_config.h
+3 -3
View File
@@ -117,9 +117,9 @@ void config_pucch_resset0(NR_PUCCH_Config_t *pucch_Config, int uid, int curr_bwp
void config_pucch_resset1(NR_PUCCH_Config_t *pucch_Config, NR_UE_NR_Capability_t *uecap);
void set_dl_DataToUL_ACK(NR_PUCCH_Config_t *pucch_Config, int min_feedback_time);
void set_pucch_power_config(NR_PUCCH_Config_t *pucch_Config, int do_csirs);
void schedulingrequest_config(NR_ServingCellConfigCommon_t *scc,
NR_MAC_CellGroupConfig_t *mac_CellGroupConfig,
NR_PUCCH_Config_t *pucch_Config);
void scheduling_request_config(NR_ServingCellConfigCommon_t *scc,
NR_MAC_CellGroupConfig_t *mac_CellGroupConfig,
NR_PUCCH_Config_t *pucch_Config);
void config_csirs(NR_ServingCellConfigCommon_t *servingcellconfigcommon,
NR_CSI_MeasConfig_t *csi_MeasConfig,
int uid,
openair2/RRC/NR/rrc_gNB_reconfig.c
+1 -1
View File
@@ -861,7 +861,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
config_pucch_resset0(pucch_Config, uid, curr_bwp, uecap); // <= 2 bits
config_pucch_resset1(pucch_Config, uecap); // > 2 bits
schedulingrequest_config(servingcellconfigcommon, secondaryCellGroup->mac_CellGroupConfig, pucch_Config);
scheduling_request_config(servingcellconfigcommon, secondaryCellGroup->mac_CellGroupConfig, pucch_Config);
pucch_Config->schedulingRequestResourceToReleaseList=NULL;
pucch_Config->multi_CSI_PUCCH_ResourceList=NULL;