removing unused functions
This commit is contained in:
francescomani
@@ -30,95 +30,4 @@
|
|||||||
|
|
||||||
#include "nr_rrc_config.h"
|
#include "nr_rrc_config.h"
|
||||||
|
|
||||||
void rrc_config_rlc_bearer(uint8_t Mod_id,
|
|
||||||
int CC_id,
|
|
||||||
rlc_bearer_config_t *rlc_config
|
|
||||||
){
|
|
||||||
rlc_config->LogicalChannelIdentity[CC_id] = 0;
|
|
||||||
rlc_config->servedRadioBearer_present[CC_id] = 0;
|
|
||||||
rlc_config->srb_Identity[CC_id] = 0;
|
|
||||||
rlc_config->drb_Identity[CC_id] = 0;
|
|
||||||
rlc_config->reestablishRLC[CC_id] = 0;
|
|
||||||
rlc_config->rlc_Config_present[CC_id] = 0;
|
|
||||||
rlc_config->ul_AM_sn_FieldLength[CC_id] = 0;
|
|
||||||
rlc_config->t_PollRetransmit[CC_id] = 0;
|
|
||||||
rlc_config->pollPDU[CC_id] = 0;
|
|
||||||
rlc_config->pollByte[CC_id] = 0;
|
|
||||||
rlc_config->maxRetxThreshold[CC_id] = 0;
|
|
||||||
rlc_config->dl_AM_sn_FieldLength[CC_id] = 0;
|
|
||||||
rlc_config->dl_AM_t_Reassembly[CC_id] = 0;
|
|
||||||
rlc_config->t_StatusProhibit[CC_id] = 0;
|
|
||||||
rlc_config->ul_UM_sn_FieldLength[CC_id] = 0;
|
|
||||||
rlc_config->dl_UM_sn_FieldLength[CC_id] = 0;
|
|
||||||
rlc_config->dl_UM_t_Reassembly[CC_id] = 0;
|
|
||||||
rlc_config->priority[CC_id] = 0;
|
|
||||||
rlc_config->prioritisedBitRate[CC_id] = 0;
|
|
||||||
rlc_config->bucketSizeDuration[CC_id] = 0;
|
|
||||||
rlc_config->allowedServingCells[CC_id] = 0;
|
|
||||||
rlc_config->subcarrierspacing[CC_id] = 0;
|
|
||||||
rlc_config->maxPUSCH_Duration[CC_id] = 0;
|
|
||||||
rlc_config->configuredGrantType1Allowed[CC_id] = 0;
|
|
||||||
rlc_config->logicalChannelGroup[CC_id] = 0;
|
|
||||||
rlc_config->schedulingRequestID[CC_id] = 0;
|
|
||||||
rlc_config->logicalChannelSR_Mask[CC_id] = 0;
|
|
||||||
rlc_config->logicalChannelSR_DelayTimerApplied[CC_id] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rrc_config_mac_cellgroup(uint8_t Mod_id,
|
|
||||||
int CC_id,
|
|
||||||
mac_cellgroup_t *mac_cellgroup_config
|
|
||||||
){
|
|
||||||
mac_cellgroup_config->DRX_Config_PR[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_onDurationTimer_PR[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->subMilliSeconds[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->milliSeconds[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_InactivityTimer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_HARQ_RTT_TimerDL[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_HARQ_RTT_TimerUL[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_RetransmissionTimerDL[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_RetransmissionTimerUL[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_LongCycleStartOffset_PR[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_LongCycleStartOffset[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_ShortCycle[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_ShortCycleTimer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->drx_SlotOffset[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->schedulingRequestId[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->sr_ProhibitTimer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->sr_TransMax[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->periodicBSR_Timer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->retxBSR_Timer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->logicalChannelSR_DelayTimer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->tag_Id[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->timeAlignmentTimer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->PHR_Config_PR[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->phr_PeriodicTimer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->phr_ProhibitTimer[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->phr_Tx_PowerFactorChange[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->multiplePHR[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->phr_Type2SpCell[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->phr_Type2OtherCell[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->phr_ModeOtherCG[CC_id] = 0;
|
|
||||||
mac_cellgroup_config->skipUplinkTxDynamic[CC_id] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rrc_config_physicalcellgroup(uint8_t Mod_id,
|
|
||||||
int CC_id,
|
|
||||||
physicalcellgroup_t *physicalcellgroup_config
|
|
||||||
){
|
|
||||||
physicalcellgroup_config->harq_ACK_SpatialBundlingPUCCH[CC_id] = 0;
|
|
||||||
physicalcellgroup_config->harq_ACK_SpatialBundlingPUSCH[CC_id] = 0;
|
|
||||||
physicalcellgroup_config->p_NR[CC_id] = 0;
|
|
||||||
physicalcellgroup_config->pdsch_HARQ_ACK_Codebook[CC_id] = 0;
|
|
||||||
physicalcellgroup_config->tpc_SRS_RNTI[CC_id] = 0;
|
|
||||||
physicalcellgroup_config->tpc_PUCCH_RNTI[CC_id] = 0;
|
|
||||||
physicalcellgroup_config->tpc_PUSCH_RNTI[CC_id] = 0;
|
|
||||||
physicalcellgroup_config->sp_CSI_RNTI[CC_id] = 0;
|
|
||||||
physicalcellgroup_config->RNTI_Value[CC_id] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rrc_config_rachdedicated(uint8_t Mod_id,
|
|
||||||
int CC_id,
|
|
||||||
physicalcellgroup_t *physicalcellgroup_config
|
|
||||||
){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -136,80 +136,6 @@ void openair_nr_rrc_on(const protocol_ctxt_t *const ctxt_pP) {
|
|||||||
///---------------------------------------------------------------------------------------------------------------///
|
///---------------------------------------------------------------------------------------------------------------///
|
||||||
///---------------------------------------------------------------------------------------------------------------///
|
///---------------------------------------------------------------------------------------------------------------///
|
||||||
|
|
||||||
void rrc_gNB_process_SgNBAdditionRequest(
|
|
||||||
const protocol_ctxt_t *const ctxt_pP,
|
|
||||||
rrc_gNB_ue_context_t *ue_context_pP
|
|
||||||
) {
|
|
||||||
rrc_gNB_generate_SgNBAdditionRequestAcknowledge(ctxt_pP,ue_context_pP);
|
|
||||||
}
|
|
||||||
|
|
||||||
void rrc_gNB_generate_SgNBAdditionRequestAcknowledge(
|
|
||||||
const protocol_ctxt_t *const ctxt_pP,
|
|
||||||
rrc_gNB_ue_context_t *const ue_context_pP) {
|
|
||||||
//uint8_t size;
|
|
||||||
//uint8_t buffer[100];
|
|
||||||
//int CC_id = ue_context_pP->ue_context.primaryCC_id;
|
|
||||||
//OCTET_STRING_t *secondaryCellGroup;
|
|
||||||
NR_CellGroupConfig_t *cellGroupconfig;
|
|
||||||
struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_BearerToAddModList;
|
|
||||||
struct NR_MAC_CellGroupConfig *mac_CellGroupConfig;
|
|
||||||
struct NR_PhysicalCellGroupConfig *physicalCellGroupConfig;
|
|
||||||
struct NR_SpCellConfig *spCellConfig;
|
|
||||||
//struct NR_CellGroupConfig__sCellToAddModList *sCellToAddModList;
|
|
||||||
cellGroupconfig = CALLOC(1,sizeof(NR_CellGroupConfig_t));
|
|
||||||
cellGroupconfig->rlc_BearerToAddModList = CALLOC(1,sizeof(struct NR_CellGroupConfig__rlc_BearerToAddModList));
|
|
||||||
cellGroupconfig->mac_CellGroupConfig = CALLOC(1,sizeof(struct NR_MAC_CellGroupConfig));
|
|
||||||
cellGroupconfig->physicalCellGroupConfig = CALLOC(1,sizeof(struct NR_PhysicalCellGroupConfig));
|
|
||||||
cellGroupconfig->spCellConfig = CALLOC(1,sizeof(struct NR_SpCellConfig));
|
|
||||||
//cellGroupconfig->sCellToAddModList = CALLOC(1,sizeof(struct NR_CellGroupConfig__sCellToAddModList));
|
|
||||||
rlc_BearerToAddModList = cellGroupconfig->rlc_BearerToAddModList;
|
|
||||||
mac_CellGroupConfig = cellGroupconfig->mac_CellGroupConfig;
|
|
||||||
physicalCellGroupConfig = cellGroupconfig->physicalCellGroupConfig;
|
|
||||||
spCellConfig = cellGroupconfig->spCellConfig;
|
|
||||||
//sCellToAddModList = cellGroupconfig->sCellToAddModList;
|
|
||||||
rlc_bearer_config_t *rlc_config;
|
|
||||||
rlc_config = CALLOC(1,sizeof(rlc_bearer_config_t));
|
|
||||||
//Fill rlc_bearer config value
|
|
||||||
rrc_config_rlc_bearer(ctxt_pP->module_id,
|
|
||||||
ue_context_pP->ue_context.primaryCC_id,
|
|
||||||
rlc_config
|
|
||||||
);
|
|
||||||
//Fill rlc_bearer config to structure
|
|
||||||
do_RLC_BEARER(ctxt_pP->module_id,
|
|
||||||
ue_context_pP->ue_context.primaryCC_id,
|
|
||||||
rlc_BearerToAddModList,
|
|
||||||
rlc_config);
|
|
||||||
mac_cellgroup_t *mac_cellgroup_config;
|
|
||||||
mac_cellgroup_config = CALLOC(1,sizeof(mac_cellgroup_t));
|
|
||||||
//Fill mac_cellgroup_config config value
|
|
||||||
rrc_config_mac_cellgroup(ctxt_pP->module_id,
|
|
||||||
ue_context_pP->ue_context.primaryCC_id,
|
|
||||||
mac_cellgroup_config
|
|
||||||
);
|
|
||||||
//Fill mac_cellgroup config to structure
|
|
||||||
do_MAC_CELLGROUP(ctxt_pP->module_id,
|
|
||||||
ue_context_pP->ue_context.primaryCC_id,
|
|
||||||
mac_CellGroupConfig,
|
|
||||||
mac_cellgroup_config);
|
|
||||||
physicalcellgroup_t *physicalcellgroup_config;
|
|
||||||
physicalcellgroup_config = CALLOC(1,sizeof(physicalcellgroup_t));
|
|
||||||
//Fill physicalcellgroup_config config value
|
|
||||||
rrc_config_physicalcellgroup(ctxt_pP->module_id,
|
|
||||||
ue_context_pP->ue_context.primaryCC_id,
|
|
||||||
physicalcellgroup_config
|
|
||||||
);
|
|
||||||
//Fill physicalcellgroup config to structure
|
|
||||||
do_PHYSICALCELLGROUP(ctxt_pP->module_id,
|
|
||||||
ue_context_pP->ue_context.primaryCC_id,
|
|
||||||
physicalCellGroupConfig,
|
|
||||||
physicalcellgroup_config);
|
|
||||||
do_SpCellConfig(RC.nrrrc[ctxt_pP->module_id],
|
|
||||||
spCellConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
///---------------------------------------------------------------------------------------------------------------///
|
|
||||||
///---------------------------------------------------------------------------------------------------------------///
|
|
||||||
|
|
||||||
static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration) {
|
static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration) {
|
||||||
LOG_D(RRC,"%s()\n\n\n\n",__FUNCTION__);
|
LOG_D(RRC,"%s()\n\n\n\n",__FUNCTION__);
|
||||||
if (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type)) {
|
if (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user