X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_sys_info_hdl.c;h=7ce598fb507dd78d1f7d5e523f0ea16324c45a63;hb=c07f2e2ea6dc72a400d16322e73780ad40e0ffb2;hp=ecf04e73f18298cd677859197cd131db513ac9f3;hpb=172422f2fd260c5dd92aca0e9ac387fb60fc2a71;p=o-du%2Fl2.git diff --git a/src/du_app/du_sys_info_hdl.c b/src/du_app/du_sys_info_hdl.c index ecf04e73f..7ce598fb5 100644 --- a/src/du_app/du_sys_info_hdl.c +++ b/src/du_app/du_sys_info_hdl.c @@ -24,6 +24,8 @@ #include "legtp.h" #include "du_app_mac_inf.h" #include "du_cfg.h" +#include "du_app_rlc_inf.h" +#include "du_mgr.h" #include "du_utils.h" #include "BCCH-BCH-Message.h" #include "MIB.h" @@ -55,6 +57,7 @@ #include "SIB1.h" #include "odu_common_codec.h" #include "du_sys_info_hdl.h" +#include "du_f1ap_conversions.h" void FreeSib1Msg(SIB1_t *sib1Msg); uint8_t FreqInfoUlret = RFAILED; @@ -127,21 +130,21 @@ uint8_t BuildMib(MIB_t *mib) * ****************************************************************/ void FreeMibPdu(BCCH_BCH_Message_t *bcchMsg) { - if(!bcchMsg) - { - if(!bcchMsg->message.choice.mib) - { - if(!(bcchMsg->message.choice.mib->systemFrameNumber.buf)) - { - if(!bcchMsg->message.choice.mib->spare.buf) - { - DU_FREE(bcchMsg->message.choice.mib->spare.buf,\ - bcchMsg->message.choice.mib->spare.size); - } - DU_FREE(bcchMsg->message.choice.mib->systemFrameNumber.buf, - bcchMsg->message.choice.mib->systemFrameNumber.size); - } - DU_FREE(bcchMsg->message.choice.mib, sizeof(MIB_t)); + if(bcchMsg) + { + if(bcchMsg->message.choice.mib) + { + if((bcchMsg->message.choice.mib->systemFrameNumber.buf)) + { + if(bcchMsg->message.choice.mib->spare.buf) + { + DU_FREE(bcchMsg->message.choice.mib->spare.buf,\ + bcchMsg->message.choice.mib->spare.size); + } + DU_FREE(bcchMsg->message.choice.mib->systemFrameNumber.buf, + bcchMsg->message.choice.mib->systemFrameNumber.size); + } + DU_FREE(bcchMsg->message.choice.mib, sizeof(MIB_t)); } DU_FREE(bcchMsg, sizeof(BCCH_BCH_Message_t)); } @@ -170,42 +173,44 @@ uint8_t BuildMibPdu() DU_ALLOC(bcchMsg, sizeof(BCCH_BCH_Message_t)); if(!bcchMsg) { - DU_LOG("\nERROR --> Memory allocation failure in BuildMibPdu"); - break; + DU_LOG("\nERROR --> Memory allocation failure in BuildMibPdu"); + break; } bcchMsg->message.present = BCCH_BCH_MessageType_PR_mib; DU_ALLOC(bcchMsg->message.choice.mib, sizeof(MIB_t)); if(!bcchMsg->message.choice.mib) { - DU_LOG("\nERROR --> Memory allocation failure in BuildMibPdu"); - break; + DU_LOG("\nERROR --> Memory allocation failure in BuildMibPdu"); + break; } if(BuildMib(bcchMsg->message.choice.mib) != ROK) { - break; + break; } xer_fprint(stdout, &asn_DEF_BCCH_BCH_Message, bcchMsg); memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; - encRetVal = aper_encode(&asn_DEF_BCCH_BCH_Message, 0, - bcchMsg, PrepFinalEncBuf, encBuf); + encRetVal = uper_encode(&asn_DEF_BCCH_BCH_Message, 0, + bcchMsg, PrepFinalEncBuf, encBuf); printf("\nencbufSize:%d\n", encBufSize); if(encRetVal.encoded == -1) { - DU_LOG("\nERROR --> DU APP: Could not encode BCCH BCH Message Type structure(at %s)\n", - encRetVal.failed_type?\ - encRetVal.failed_type->name - :"unknown"); - break; + DU_LOG("\nERROR --> DU APP: Could not encode BCCH BCH Message Type structure(at %s)\n", + encRetVal.failed_type?\ + encRetVal.failed_type->name + :"unknown"); + break; } +#ifdef DEBUG_ASN_PRINT /* Print encoded buffer */ for(int i=0; i< encBufSize; i++) { - printf("%x\t",encBuf[i]); + printf("%x\t",encBuf[i]); } printf("\n"); +#endif ret = ROK; break; @@ -234,16 +239,16 @@ uint8_t BuildMibPdu() * ****************************************************************/ void FreeMibMsg( MIB_t *mibMsg) { - if(!mibMsg) + if(mibMsg) { - if(!(mibMsg->systemFrameNumber.buf)) + if((mibMsg->systemFrameNumber.buf)) { - if(!mibMsg->spare.buf) - { - DU_FREE(mibMsg->spare.buf, mibMsg->spare.size); - } - DU_FREE(mibMsg->systemFrameNumber.buf, - mibMsg->systemFrameNumber.size); + if(mibMsg->spare.buf) + { + DU_FREE(mibMsg->spare.buf, mibMsg->spare.size); + } + DU_FREE(mibMsg->systemFrameNumber.buf, + mibMsg->systemFrameNumber.size); } DU_FREE(mibMsg, sizeof(MIB_t)); } @@ -272,34 +277,36 @@ uint8_t BuildMibMsg() DU_ALLOC(mibMsg, sizeof(MIB_t)); if(!mibMsg) { - DU_LOG("\nERROR --> DU APP: MIB msg memory allocation failure"); - return RFAILED; + DU_LOG("\nERROR --> DU APP: MIB msg memory allocation failure"); + return RFAILED; } if(BuildMib(mibMsg) != ROK) { - break; + break; } xer_fprint(stdout, &asn_DEF_MIB, mibMsg); memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; - encRetVal = aper_encode(&asn_DEF_MIB, 0, - mibMsg, PrepFinalEncBuf, encBuf); + encRetVal = uper_encode(&asn_DEF_MIB, 0, + mibMsg, PrepFinalEncBuf, encBuf); printf("\nencbufSize:%d\n", encBufSize); if(encRetVal.encoded == -1) { - DU_LOG("\nERROR --> DU APP: Could not encode MIB structure(at %s)\n", - encRetVal.failed_type?\ - encRetVal.failed_type->name - :"unknown"); - break; + DU_LOG("\nERROR --> DU APP: Could not encode MIB structure(at %s)\n", + encRetVal.failed_type?\ + encRetVal.failed_type->name + :"unknown"); + break; } +#ifdef DEBUG_ASN_PRINT /* Print encoded buffer */ for(int i=0; i< encBufSize; i++) { - printf("%x\t",encBuf[i]); + printf("%x\t",encBuf[i]); } printf("\n"); +#endif /* Free allocated memory */ ret = ROK; @@ -330,7 +337,6 @@ uint8_t BuildMibMsg() uint8_t BuildCellIdentity(CellIdentity_t *cellIdentity) { cellIdentity->size = ODU_VALUE_FIVE*sizeof(uint8_t); - cellIdentity->bits_unused = ODU_VALUE_FOUR; DU_ALLOC(cellIdentity->buf, cellIdentity->size); if(!cellIdentity->buf) @@ -338,8 +344,7 @@ uint8_t BuildCellIdentity(CellIdentity_t *cellIdentity) DU_LOG("\nERROR --> DU APP: CellIdentity memory allocation failure"); return RFAILED; } - memset(cellIdentity->buf, 0, cellIdentity->size); - cellIdentity->buf[4] = duCfgParam.sib1Params.cellIdentity; + fillBitString(cellIdentity, ODU_VALUE_FOUR, ODU_VALUE_FIVE, duCfgParam.sib1Params.cellIdentity); return ROK; } @@ -441,7 +446,7 @@ uint8_t BuildPlmnList(CellAccessRelatedInfo_t *cellAccessInfo) *plmnIdInfo; DU_ALLOC(cellAccessInfo->plmn_IdentityList.list.array, - cellAccessInfo->plmn_IdentityList.list.size); + cellAccessInfo->plmn_IdentityList.list.size); if(!cellAccessInfo->plmn_IdentityList.list.array) { DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); @@ -451,11 +456,11 @@ uint8_t BuildPlmnList(CellAccessRelatedInfo_t *cellAccessInfo) for(idx=0; idxplmn_IdentityList.list.array[idx], - sizeof(PLMN_IdentityInfo_t)); + sizeof(PLMN_IdentityInfo_t)); if(!cellAccessInfo->plmn_IdentityList.list.array[idx]) { - DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); - return RFAILED; + DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); + return RFAILED; } } @@ -464,7 +469,7 @@ uint8_t BuildPlmnList(CellAccessRelatedInfo_t *cellAccessInfo) elementCnt = ODU_VALUE_ONE; plmnIdInfo = &cellAccessInfo->plmn_IdentityList.list.array[idx]->\ - plmn_IdentityList; + plmn_IdentityList; plmnIdInfo->list.count = elementCnt; plmnIdInfo->list.size = elementCnt * sizeof(PLMN_IdentitY_t *); DU_ALLOC(plmnIdInfo->list.array, plmnIdInfo->list.size); @@ -477,16 +482,16 @@ uint8_t BuildPlmnList(CellAccessRelatedInfo_t *cellAccessInfo) for(idx1=0; idx1list.array[idx1], - sizeof(PLMN_IdentitY_t)); + sizeof(PLMN_IdentitY_t)); if(!(plmnIdInfo->list.array[idx1])) { - DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); - return RFAILED; + DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); + return RFAILED; } } idx1 = 0; DU_ALLOC(plmnIdInfo->list.array[idx1]->mcc, - sizeof(MCC_t)); + sizeof(MCC_t)); if(!plmnIdInfo->list.array[idx1]->mcc) { DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); @@ -496,32 +501,32 @@ uint8_t BuildPlmnList(CellAccessRelatedInfo_t *cellAccessInfo) elementCnt = ODU_VALUE_THREE; plmnIdInfo->list.array[idx1]->mcc->list.count = elementCnt; plmnIdInfo->list.array[idx1]->mcc->list.size =\ - elementCnt * sizeof(MCC_MNC_Digit_t *); + elementCnt * sizeof(MCC_MNC_Digit_t *); DU_ALLOC(plmnIdInfo->list.array[idx1]->mcc->list.array, - plmnIdInfo->list.array[idx1]->mcc->list.size) + plmnIdInfo->list.array[idx1]->mcc->list.size) if(!(plmnIdInfo->list.array[idx1]->mcc->list.array)) { - DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); - return RFAILED; + DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); + return RFAILED; } for(idx2=0; idx2list.array[idx1]->mcc->list.array[idx2], - sizeof(MCC_MNC_Digit_t)); + sizeof(MCC_MNC_Digit_t)); if(!plmnIdInfo->list.array[idx1]->mcc->list.array[idx2]) { - DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); - return RFAILED; + DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); + return RFAILED; } *(plmnIdInfo->list.array[idx1]->mcc->list.array[idx2])=\ - duCfgParam.sib1Params.plmn.mcc[idx2]; + duCfgParam.sib1Params.plmn.mcc[idx2]; } idx2 = 0; plmnIdInfo->list.array[idx1]->mnc.list.count = elementCnt; plmnIdInfo->list.array[idx1]->mnc.list.size =\ - elementCnt * sizeof(MCC_MNC_Digit_t *); + elementCnt * sizeof(MCC_MNC_Digit_t *); DU_ALLOC(plmnIdInfo->list.array[idx1]->mnc.list.array,\ - plmnIdInfo->list.array[idx1]->mnc.list.size); + plmnIdInfo->list.array[idx1]->mnc.list.size); if(!plmnIdInfo->list.array[idx1]->mnc.list.array) { DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); @@ -530,14 +535,14 @@ uint8_t BuildPlmnList(CellAccessRelatedInfo_t *cellAccessInfo) for(idx2=0; idx2list.array[idx1]->mnc.list.array[idx2], - sizeof(MCC_MNC_Digit_t)); + sizeof(MCC_MNC_Digit_t)); if(!plmnIdInfo->list.array[idx1]->mnc.list.array[idx2]) { - DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); - return RFAILED; + DU_LOG("\nERROR --> DU APP: BuildPlmnList memory allocation failure"); + return RFAILED; } *(plmnIdInfo->list.array[idx1]->mnc.list.array[idx2])=\ - duCfgParam.sib1Params.plmn.mnc[idx2]; + duCfgParam.sib1Params.plmn.mnc[idx2]; } /* Tracking Area Code */ @@ -566,7 +571,7 @@ uint8_t BuildPlmnList(CellAccessRelatedInfo_t *cellAccessInfo) /* cellReservedForOperatorUse */ cellAccessInfo->plmn_IdentityList.list.array[idx]->\ - cellReservedForOperatorUse = duCfgParam.sib1Params.cellResvdForOpUse; + cellReservedForOperatorUse = duCfgParam.sib1Params.cellResvdForOpUse; return ROK; @@ -608,8 +613,8 @@ uint8_t BuildSibMapInfoList(SIB_Mapping_t *sibMapInfo) DU_ALLOC(sibMapInfo->list.array[itr], sizeof(SIB_TypeInfo_t)); if(!sibMapInfo->list.array[itr]) { - DU_LOG("\nERROR --> DU APP: BuildSibMapInfoList memory allocation failure"); - return RFAILED; + DU_LOG("\nERROR --> DU APP: BuildSibMapInfoList memory allocation failure"); + return RFAILED; } } @@ -665,8 +670,8 @@ uint8_t BuildSiSchedInfoList(struct SI_SchedulingInfo__schedulingInfoList *si_Sc DU_ALLOC(si_SchedulingInfoList->list.array[itr], sizeof(struct SchedulingInfo)); if(!si_SchedulingInfoList->list.array[itr]) { - DU_LOG("\nERROR --> DU APP: BuildSiSchedInfoList memory allocation failure"); - return RFAILED; + DU_LOG("\nERROR --> DU APP: BuildSiSchedInfoList memory allocation failure"); + return RFAILED; } } @@ -694,7 +699,7 @@ uint8_t BuildSiSchedInfoList(struct SI_SchedulingInfo__schedulingInfoList *si_Sc * * @details * - * Function : BuildScsSpecificCarrierListDl + * Function : BuildScsSpecificCarrierListDlSib * * Functionality: * Builds Subcarrier specific carrier list for downlink @@ -704,7 +709,7 @@ uint8_t BuildSiSchedInfoList(struct SI_SchedulingInfo__schedulingInfoList *si_Sc * RFAILED - failure * * ****************************************************************/ -uint8_t BuildScsSpecificCarrierListDl( struct FrequencyInfoDL_SIB__scs_SpecificCarrierList *scsCarrierList) +uint8_t BuildScsSpecificCarrierListDlSib( struct FrequencyInfoDL_SIB__scs_SpecificCarrierList *scsCarrierList) { uint8_t idx; ScsSpecCarrier duScsSpecCarrier; @@ -723,8 +728,8 @@ uint8_t BuildScsSpecificCarrierListDl( struct FrequencyInfoDL_SIB__scs_SpecificC DU_ALLOC(scsCarrierList->list.array[idx], sizeof(SCS_SpecificCarrier_t)); if(!scsCarrierList->list.array[idx]) { - DU_LOG("\nERROR --> DU APP : SCS Specific Carrier list memory allocation failed"); - return RFAILED; + DU_LOG("\nERROR --> DU APP : SCS Specific Carrier list memory allocation failed"); + return RFAILED; } } @@ -734,7 +739,7 @@ uint8_t BuildScsSpecificCarrierListDl( struct FrequencyInfoDL_SIB__scs_SpecificC scsCarrierList->list.array[idx]->carrierBandwidth = duScsSpecCarrier.scsBw; return ROK; -} /* End of BuildScsSpecificCarrierListDl */ +} /* End of BuildScsSpecificCarrierListDlSib */ /******************************************************************* * @@ -760,7 +765,7 @@ uint8_t BuildCommonSerachSpaceList( struct PDCCH_ConfigCommon__commonSearchSpace duPdcchCfg = duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pdcchCfg; - DU_ALLOC(searchSpclist->list.array, searchSpclist->list.size) + DU_ALLOC(searchSpclist->list.array, searchSpclist->list.size); if(!searchSpclist->list.array) { DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); @@ -772,8 +777,8 @@ uint8_t BuildCommonSerachSpaceList( struct PDCCH_ConfigCommon__commonSearchSpace DU_ALLOC(searchSpclist->list.array[idx], sizeof(SearchSpace_t)); if(!searchSpclist->list.array[idx]) { - DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); - return RFAILED; + DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); + return RFAILED; } } @@ -794,109 +799,108 @@ uint8_t BuildCommonSerachSpaceList( struct PDCCH_ConfigCommon__commonSearchSpace /* Monitoring Slot periodicity and offset */ DU_ALLOC(searchSpace->monitoringSlotPeriodicityAndOffset,\ - sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset)); + sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset)); if(!searchSpace->monitoringSlotPeriodicityAndOffset) { DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); return RFAILED; } - searchSpace->monitoringSlotPeriodicityAndOffset->present = \ - duPdcchCfg.monitorSlotPrdAndOffPresent; + searchSpace->monitoringSlotPeriodicityAndOffset->present = duPdcchCfg.monitorSlotPrdAndOffPresent; + switch(searchSpace->monitoringSlotPeriodicityAndOffset->present) { case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1: - { - //searchSpace->monitoringSlotPeriodicityAndOffset->choice.s11 = duPdcchCfg.monitorSlotPrdAndOff; - break; - } + { + //searchSpace->monitoringSlotPeriodicityAndOffset->choice.s11 = duPdcchCfg.monitorSlotPrdAndOff; + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl4: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl5: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl8: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl10: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl16: - { - //TODO; - break; - } + { + //TODO; + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl20: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl40: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl80: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl160: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl320: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl640: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1280: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2560: - { - //TODO - break; - } + { + //TODO + break; + } default: - { - DU_LOG("\nERROR --> DU APP : Invalid value:Montoring slot periodicity and offset"); - return RFAILED; - } + { + DU_LOG("\nERROR --> DU APP : Invalid value:Montoring slot periodicity and offset"); + return RFAILED; + } } /* Monitoring Symbols Within Slot */ - DU_ALLOC(searchSpace->monitoringSymbolsWithinSlot,\ - sizeof(BIT_STRING_t)); + DU_ALLOC(searchSpace->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t)); if(!searchSpace->monitoringSymbolsWithinSlot) { DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); return RFAILED; } - searchSpace->monitoringSymbolsWithinSlot->size = 2*sizeof(uint8_t); - DU_ALLOC(searchSpace->monitoringSymbolsWithinSlot->buf, \ - searchSpace->monitoringSymbolsWithinSlot->size ); + searchSpace->monitoringSymbolsWithinSlot->size = 2 * sizeof(uint8_t); + + DU_ALLOC(searchSpace->monitoringSymbolsWithinSlot->buf, searchSpace->monitoringSymbolsWithinSlot->size); if(!searchSpace->monitoringSymbolsWithinSlot->buf) { DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); @@ -907,8 +911,7 @@ uint8_t BuildCommonSerachSpaceList( struct PDCCH_ConfigCommon__commonSearchSpace searchSpace->monitoringSymbolsWithinSlot->bits_unused = 2; /* Number of candidates per aggregation level */ - DU_ALLOC(searchSpace->nrofCandidates,\ - sizeof(struct SearchSpace__nrofCandidates)); + DU_ALLOC(searchSpace->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates)); if(!searchSpace->nrofCandidates) { DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); @@ -921,8 +924,7 @@ uint8_t BuildCommonSerachSpaceList( struct PDCCH_ConfigCommon__commonSearchSpace searchSpace->nrofCandidates->aggregationLevel16 = duPdcchCfg.numCandAggLvl16; /* Search Space type and DCI Format */ - DU_ALLOC(searchSpace->searchSpaceType,\ - sizeof( struct SearchSpace__searchSpaceType)); + DU_ALLOC(searchSpace->searchSpaceType, sizeof( struct SearchSpace__searchSpaceType)); if(!searchSpace->searchSpaceType) { DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); @@ -933,40 +935,44 @@ uint8_t BuildCommonSerachSpaceList( struct PDCCH_ConfigCommon__commonSearchSpace switch(searchSpace->searchSpaceType->present) { case SearchSpace__searchSpaceType_PR_NOTHING: - { - //TODO - break; - } + { + //TODO + break; + } case SearchSpace__searchSpaceType_PR_common: - { - DU_ALLOC(searchSpace->searchSpaceType->choice.common, sizeof(struct SearchSpace__searchSpaceType__common)); - if(!searchSpace->searchSpaceType->choice.common) - { - DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); - return RFAILED; - } - - DU_ALLOC(searchSpace->searchSpaceType->choice.common->\ - dci_Format0_0_AndFormat1_0, sizeof(struct \ - SearchSpace__searchSpaceType__common__dci_Format0_0_AndFormat1_0)); - if(!searchSpace->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0) - { - DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); - return RFAILED; - } - break; - } + { + DU_ALLOC(searchSpace->searchSpaceType->choice.common, sizeof(struct SearchSpace__searchSpaceType__common)); + if(!searchSpace->searchSpaceType->choice.common) + { + DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); + return RFAILED; + } + + searchSpace->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0 = NULLP; + DU_ALLOC(searchSpace->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0, \ + sizeof(struct SearchSpace__searchSpaceType__common__dci_Format0_0_AndFormat1_0)); + if(!searchSpace->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0) + { + DU_LOG("\nERROR --> DU APP : Common search space list memory alloc failed"); + return RFAILED; + } + + searchSpace->searchSpaceType->choice.common->dci_Format2_0 = NULLP; + searchSpace->searchSpaceType->choice.common->dci_Format2_1 = NULLP; + searchSpace->searchSpaceType->choice.common->dci_Format2_2 = NULLP; + searchSpace->searchSpaceType->choice.common->dci_Format2_3 = NULLP; + break; + } case SearchSpace__searchSpaceType_PR_ue_Specific: - { - break; - } + { + break; + } default: - { - DU_LOG("\nERROR --> DU_APP: Invalid Search Space type"); - return RFAILED; - } + { + DU_LOG("\nERROR --> DU_APP: Invalid Search Space type"); + return RFAILED; + } } - return ROK; }/* BuildCommonSerachSpaceList */ @@ -1000,95 +1006,94 @@ uint8_t BuildPdcchCfgCommon(struct BWP_DownlinkCommon__pdcch_ConfigCommon *pdcch switch(pdcchCfg->present) { case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_NOTHING: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_release: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_setup: - { - DU_ALLOC(pdcchCfg->choice.setup, sizeof(PDCCH_ConfigCommon_t)); - if(!pdcchCfg->choice.setup) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - pdcchSetup = pdcchCfg->choice.setup; - - /* Control Resource Set Zero */ - DU_ALLOC(pdcchSetup->controlResourceSetZero, sizeof(ControlResourceSetZero_t)); - if(!pdcchSetup->controlResourceSetZero) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - *pdcchSetup->controlResourceSetZero = duPdcchCfg.ctrlRsrcSetZero; - - /* Search space zero */ - DU_ALLOC(pdcchSetup->searchSpaceZero, sizeof(SearchSpaceZero_t)); - if(!pdcchSetup->searchSpaceZero) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - *pdcchSetup->searchSpaceZero = duPdcchCfg.searchSpcZero; - - /* Common Search Space List */ - DU_ALLOC(pdcchSetup->commonSearchSpaceList,\ - sizeof(struct PDCCH_ConfigCommon__commonSearchSpaceList)); - if(!pdcchSetup->commonSearchSpaceList) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - elementCnt = ODU_VALUE_ONE; - pdcchSetup->commonSearchSpaceList->list.count = elementCnt; - pdcchSetup->commonSearchSpaceList->list.size = elementCnt * sizeof(SearchSpace_t *); - ret = BuildCommonSerachSpaceList(pdcchSetup->commonSearchSpaceList); - if(ret != ROK) - { - return RFAILED; - } - CommonSerachSpaceListret=ROK; - - /* Search Space for SIB1 */ - DU_ALLOC(pdcchSetup->searchSpaceSIB1, sizeof(SearchSpaceId_t)); - if(!pdcchSetup->searchSpaceSIB1) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - *pdcchSetup->searchSpaceSIB1 = duPdcchCfg.searchSpcSib1; - - /* Serach Space for Paging */ - DU_ALLOC(pdcchSetup->pagingSearchSpace, sizeof(SearchSpaceId_t)); - if(!pdcchSetup->pagingSearchSpace) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - *pdcchSetup->pagingSearchSpace = duPdcchCfg.pagingSearchSpc; - - /* Search space for Random Access */ - DU_ALLOC(pdcchSetup->ra_SearchSpace, sizeof(SearchSpaceId_t)); - if(!pdcchSetup->ra_SearchSpace) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - *pdcchSetup->ra_SearchSpace = duPdcchCfg.raSearchSpc; - - break; - } + { + DU_ALLOC(pdcchCfg->choice.setup, sizeof(PDCCH_ConfigCommon_t)); + if(!pdcchCfg->choice.setup) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + pdcchSetup = pdcchCfg->choice.setup; + + /* Control Resource Set Zero */ + DU_ALLOC(pdcchSetup->controlResourceSetZero, sizeof(ControlResourceSetZero_t)); + if(!pdcchSetup->controlResourceSetZero) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + *pdcchSetup->controlResourceSetZero = duPdcchCfg.ctrlRsrcSetZero; + + /* Search space zero */ + DU_ALLOC(pdcchSetup->searchSpaceZero, sizeof(SearchSpaceZero_t)); + if(!pdcchSetup->searchSpaceZero) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + *pdcchSetup->searchSpaceZero = duPdcchCfg.searchSpcZero; + + /* Common Search Space List */ + DU_ALLOC(pdcchSetup->commonSearchSpaceList, sizeof(struct PDCCH_ConfigCommon__commonSearchSpaceList)); + if(!pdcchSetup->commonSearchSpaceList) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + elementCnt = ODU_VALUE_ONE; + pdcchSetup->commonSearchSpaceList->list.count = elementCnt; + pdcchSetup->commonSearchSpaceList->list.size = elementCnt * sizeof(SearchSpace_t *); + ret = BuildCommonSerachSpaceList(pdcchSetup->commonSearchSpaceList); + if(ret != ROK) + { + DU_LOG("\nERROR --> DU APP : Failed to fill common search space list"); + return RFAILED; + } + CommonSerachSpaceListret=ROK; + + /* Search Space for SIB1 */ + DU_ALLOC(pdcchSetup->searchSpaceSIB1, sizeof(SearchSpaceId_t)); + if(!pdcchSetup->searchSpaceSIB1) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + *pdcchSetup->searchSpaceSIB1 = duPdcchCfg.searchSpcSib1; + + /* Search Space for Paging */ + DU_ALLOC(pdcchSetup->pagingSearchSpace, sizeof(SearchSpaceId_t)); + if(!pdcchSetup->pagingSearchSpace) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + *pdcchSetup->pagingSearchSpace = duPdcchCfg.pagingSearchSpc; + + /* Search space for Random Access */ + DU_ALLOC(pdcchSetup->ra_SearchSpace, sizeof(SearchSpaceId_t)); + if(!pdcchSetup->ra_SearchSpace) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + *pdcchSetup->ra_SearchSpace = duPdcchCfg.raSearchSpc; + break; + } default : - { - DU_LOG("\nERROR --> DU APP : Invalid PDCCH Config type"); - return RFAILED; - } + { + DU_LOG("\nERROR --> DU APP : Invalid PDCCH Config type"); + return RFAILED; + } } return ROK; @@ -1125,79 +1130,80 @@ uint8_t BuildPdschCfgCommon(struct BWP_DownlinkCommon__pdsch_ConfigCommon *pdsch switch(pdschCfg->present) { case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_NOTHING: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_release: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_setup: - { - DU_ALLOC(pdschCfg->choice.setup, sizeof(PDSCH_ConfigCommon_t)); - if(!pdschCfg->choice.setup) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - pdschSetup = pdschCfg->choice.setup; - - /* Time Domain Allocation List */ - DU_ALLOC(pdschSetup->pdsch_TimeDomainAllocationList, \ - sizeof(PDSCH_TimeDomainResourceAllocationList_t)); - if(!pdschSetup->pdsch_TimeDomainAllocationList) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - elementCnt = duPdschCfg.numTimeDomRsrcAlloc; - pdschSetup->pdsch_TimeDomainAllocationList->list.count = elementCnt; - pdschSetup->pdsch_TimeDomainAllocationList->list.size = elementCnt * sizeof(PDSCH_TimeDomainResourceAllocation_t *); - - DU_ALLOC(pdschSetup->pdsch_TimeDomainAllocationList->list.array,\ - pdschSetup->pdsch_TimeDomainAllocationList->list.size); - if(!pdschSetup->pdsch_TimeDomainAllocationList->list.array) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - - for(idx=0; idxpdsch_TimeDomainAllocationList->list.array[idx],\ - sizeof(PDSCH_TimeDomainResourceAllocation_t)); - if(!pdschSetup->pdsch_TimeDomainAllocationList->list.array[idx]) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - } - - for(idx = 0; idx < pdschSetup->pdsch_TimeDomainAllocationList->list.count; idx++) - { - timeDomRsrcAllocInfo = pdschSetup->pdsch_TimeDomainAllocationList->list.array[idx]; - - /* K0 */ - DU_ALLOC(timeDomRsrcAllocInfo->k0, sizeof(long)); - if(!timeDomRsrcAllocInfo->k0) - { - DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); - return RFAILED; - } - *timeDomRsrcAllocInfo->k0 = duPdschCfg.timeDomAlloc[idx].k0; - - timeDomRsrcAllocInfo->mappingType = duPdschCfg.timeDomAlloc[idx].mapType; - timeDomRsrcAllocInfo->startSymbolAndLength = duPdschCfg.timeDomAlloc[idx].sliv; - } - break; - } + { + DU_ALLOC(pdschCfg->choice.setup, sizeof(PDSCH_ConfigCommon_t)); + if(!pdschCfg->choice.setup) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + pdschSetup = pdschCfg->choice.setup; + + /* Time Domain Allocation List */ + DU_ALLOC(pdschSetup->pdsch_TimeDomainAllocationList, sizeof(PDSCH_TimeDomainResourceAllocationList_t)); + if(!pdschSetup->pdsch_TimeDomainAllocationList) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + + elementCnt = duPdschCfg.numTimeDomRsrcAlloc; + pdschSetup->pdsch_TimeDomainAllocationList->list.count = elementCnt; + pdschSetup->pdsch_TimeDomainAllocationList->list.size = \ + elementCnt * sizeof(PDSCH_TimeDomainResourceAllocation_t *); + + DU_ALLOC(pdschSetup->pdsch_TimeDomainAllocationList->list.array,\ + pdschSetup->pdsch_TimeDomainAllocationList->list.size); + if(!pdschSetup->pdsch_TimeDomainAllocationList->list.array) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + + for(idx=0; idxpdsch_TimeDomainAllocationList->list.array[idx],\ + sizeof(PDSCH_TimeDomainResourceAllocation_t)); + if(!pdschSetup->pdsch_TimeDomainAllocationList->list.array[idx]) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + } + + for(idx = 0; idx < pdschSetup->pdsch_TimeDomainAllocationList->list.count; idx++) + { + timeDomRsrcAllocInfo = pdschSetup->pdsch_TimeDomainAllocationList->list.array[idx]; + + /* K0 */ + DU_ALLOC(timeDomRsrcAllocInfo->k0, sizeof(long)); + if(!timeDomRsrcAllocInfo->k0) + { + DU_LOG("\nERROR --> DU APP : PDCCH Config memory alloc failed"); + return RFAILED; + } + *timeDomRsrcAllocInfo->k0 = duPdschCfg.timeDomAlloc[idx].k0; + + timeDomRsrcAllocInfo->mappingType = duPdschCfg.timeDomAlloc[idx].mapType; + timeDomRsrcAllocInfo->startSymbolAndLength = duPdschCfg.timeDomAlloc[idx].sliv; + } + break; + } default: - { - DU_LOG("\nERROR --> DU APP: Invalid PDSCH Configuration type"); - return RFAILED; - } + { + DU_LOG("\nERROR --> DU APP: Invalid PDSCH Configuration type"); + return RFAILED; + } } return ROK; @@ -1221,40 +1227,39 @@ uint8_t BuildPdschCfgCommon(struct BWP_DownlinkCommon__pdsch_ConfigCommon *pdsch * ****************************************************************/ uint8_t BuildBwpDlCommon(BWP_DownlinkCommon_t *bwp) { - uint8_t ret; - DlCfgCommon duDlCfg; - - duDlCfg = duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg; + DlCfgCommon duDlCfg = duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg; + /* Generic Parameters */ bwp->genericParameters.locationAndBandwidth = duDlCfg.locAndBw; bwp->genericParameters.subcarrierSpacing = duDlCfg.dlScsCarrier.scs; /* PDCCH Config Common */ - DU_ALLOC(bwp->pdcch_ConfigCommon, \ - sizeof(struct BWP_DownlinkCommon__pdcch_ConfigCommon)); + DU_ALLOC(bwp->pdcch_ConfigCommon, sizeof(struct BWP_DownlinkCommon__pdcch_ConfigCommon)); if(!bwp->pdcch_ConfigCommon) { DU_LOG("\nERROR --> DU APP : DL BWP memory allocation failed"); return RFAILED; } - ret=BuildPdcchCfgCommon(bwp->pdcch_ConfigCommon); - if(ret != ROK) + if((BuildPdcchCfgCommon(bwp->pdcch_ConfigCommon)) != ROK) { + DU_LOG("\nERROR --> DU APP : Failed to fill PDCCH config common in BuildBwpDlCommon()"); return RFAILED; } + /* PDSCH Config Common */ - DU_ALLOC(bwp->pdsch_ConfigCommon, \ - sizeof(struct BWP_DownlinkCommon__pdsch_ConfigCommon)); + DU_ALLOC(bwp->pdsch_ConfigCommon, sizeof(struct BWP_DownlinkCommon__pdsch_ConfigCommon)); if(!bwp->pdsch_ConfigCommon) { DU_LOG("\nERROR --> DU APP : DL BWP memory allocation failed"); return RFAILED; } - ret=BuildPdschCfgCommon(bwp->pdsch_ConfigCommon); - if(ret != ROK) + + if((BuildPdschCfgCommon(bwp->pdsch_ConfigCommon)) != ROK) { + DU_LOG("\nERROR --> DU APP : Failed to fill PDSCH config common in BuildBwpDlCommon()"); return RFAILED; } + return ROK; } /* BuildBwpDlCommon */ @@ -1286,6 +1291,139 @@ uint8_t BuildBcchConfig(BCCH_Config_t *bcchCfg) return ROK; }/* BuildBcchConfig */ +/******************************************************************* + * + * @brief fills First PDCCH monitoring Paging occasions + * + * @details + * + * Function : fillFirstPdcchMonitoringOcc + * + * Functionality: + * Fills PDCCH Monitoring PO in PCCH configuration + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t fillFirstPdcchMonitoringOcc(struct PCCH_Config__firstPDCCH_MonitoringOccasionOfPO *firstPO,\ + PcchCfg *srcPcchCfg) +{ + uint8_t numPO = 0, poIdx = 0; + + firstPO->present = srcPcchCfg->firstPDCCHMontioringType; + + numPO = srcPcchCfg->ns; + if(numPO == 0) + { + DU_LOG("\nINFO --> DU APP : Paging Occasions is ZERO, no need to fill further"); + return ROK; + } + + /*Note: Valid values for each number of PO is from Spec 36.331: PCCH-COnfig*/ + switch(firstPO->present) + { + case PCCH_Config__firstPDCCH_MonitoringOccasionOfPO_PR_NOTHING: + { + break; + } + case PCCH_Config__firstPDCCH_MonitoringOccasionOfPO_PR_sCS15KHZoneT: + { + DU_ALLOC(firstPO->choice.sCS15KHZoneT, \ + sizeof(struct PCCH_Config__firstPDCCH_MonitoringOccasionOfPO__sCS15KHZoneT)); + + if(firstPO->choice.sCS15KHZoneT == NULLP) + { + DU_LOG("\nERROR --> DU APP : FirstPdcchMonitoringPO Memory allocation failure"); + return RFAILED; + } + firstPO->choice.sCS15KHZoneT->list.count = numPO; + firstPO->choice.sCS15KHZoneT->list.size = numPO * sizeof(long *); + + DU_ALLOC(firstPO->choice.sCS15KHZoneT->list.array, firstPO->choice.sCS15KHZoneT->list.size); + if(!firstPO->choice.sCS15KHZoneT->list.array) + { + DU_LOG("\nERROR --> DU APP : FirstPdcchMonitoringPO Memory allocation failure"); + return RFAILED; + } + + for(poIdx = 0; poIdx < numPO; poIdx++) + { + /* Spec 36.331: PCCH-Config: firstPDCCH-MonitoringOccasionOfPO [MAX of sCS15KHZoneT] + * Since FirstPDCCHMonitoring_PO is not valid thus no need to continue further*/ + if(srcPcchCfg->firstPDCCHMontioringInfo[poIdx] > 139) + { + DU_LOG("\nERROR --> DU APP : Invalid Paging Ocassion value for 15kHz"); + return RFAILED; + } + DU_ALLOC(firstPO->choice.sCS15KHZoneT->list.array[poIdx], sizeof(long)); + if(!firstPO->choice.sCS15KHZoneT->list.array[poIdx]) + { + DU_LOG("\nERROR --> DU APP : FirstPdcchMonitoringPO Memory allocation failure"); + return RFAILED; + } + } + + poIdx = 0; + *firstPO->choice.sCS15KHZoneT->list.array[poIdx] = srcPcchCfg->firstPDCCHMontioringInfo[poIdx]; + + break; + } + case PCCH_Config__firstPDCCH_MonitoringOccasionOfPO_PR_sCS30KHZoneT_SCS15KHZhalfT: + { + DU_ALLOC(firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT, \ + sizeof(struct PCCH_Config__firstPDCCH_MonitoringOccasionOfPO__sCS30KHZoneT_SCS15KHZhalfT)); + + if(firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT == NULLP) + { + DU_LOG("\nERROR --> DU APP : FirstPdcchMonitoringPO Memory allocation failure"); + return RFAILED; + } + firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT->list.count = numPO; + firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT->list.size = numPO * sizeof(long *); + + DU_ALLOC(firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT->list.array, \ + firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT->list.size); + + if(!firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT->list.array) + { + DU_LOG("\nERROR --> DU APP : FirstPdcchMonitoringPO Memory allocation failure"); + return RFAILED; + } + + for(poIdx = 0; poIdx < numPO; poIdx++) + { + /* Spec 36.331: PCCH-Config:firstPDCCH-MonitoringOccasionOfPO [MAX of sCS30KHZoneT-SCS15KHZhalfT] + * Since FirstPDCCHMonitoring_PO is not valid thus no need to continue further*/ + if(srcPcchCfg->firstPDCCHMontioringInfo[poIdx] > 279) + { + DU_LOG("\nERROR --> DU APP : Invalid Paging Ocassion value for 30kHz or 15kHz HAlFT"); + return RFAILED; + } + DU_ALLOC(firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT->list.array[poIdx], sizeof(long)); + if(!firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT->list.array[poIdx]) + { + DU_LOG("\nERROR --> DU APP : FirstPdcchMonitoringPO Memory allocation failure"); + return RFAILED; + } + } + + poIdx = 0; + *firstPO->choice.sCS30KHZoneT_SCS15KHZhalfT->list.array[poIdx] = srcPcchCfg->firstPDCCHMontioringInfo[poIdx]; + break; + } + //TODO for other cases + default: + { + DU_LOG("\nERROR --> DU APP : Invalid firstPDCCH-MonitoringOccasionOfPO"); + return RFAILED; + + break; + } + } + return ROK; +} /******************************************************************* * * @brief Builds PCCH configuration @@ -1308,48 +1446,87 @@ uint8_t BuildPcchConfig(PCCH_Config_t *pcchCfg) duPcchCfg = duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg; - pcchCfg->defaultPagingCycle = duPcchCfg.dfltPagingCycle; - pcchCfg->nAndPagingFrameOffset.present = duPcchCfg.nAndPagingFrmOffPresent; + pcchCfg->defaultPagingCycle = convertPagingCycleValueToEnum(duPcchCfg.dfltPagingCycle); + pcchCfg->nAndPagingFrameOffset.present = duPcchCfg.nAndPagingFrmOffsetType; switch(pcchCfg->nAndPagingFrameOffset.present) { + /**Note: PagingFrame Offset Value differs for each Paging Duration + *(oneT, halfT,...). The Range of Offset given in Spec 38.331,Pcch-Config*/ case PCCH_Config__nAndPagingFrameOffset_PR_NOTHING: - { - //TODO - break; - } + { + //TODO + break; + } case PCCH_Config__nAndPagingFrameOffset_PR_oneT: - { - //TODO - break; - } + { + pcchCfg->nAndPagingFrameOffset.choice.oneT = NULLD; + break; + } case PCCH_Config__nAndPagingFrameOffset_PR_halfT: - { - //TODO - break; - } + { + /*Spec 38.331: PCCH_Config: nAndPagingFrameOffset [MAX value of halfT] */ + if(duPcchCfg.pageFrameOffset > 1) + { + DU_LOG("\nERROR --> DU APP : Invalid PagingFrameOffset for HALF_T"); + return RFAILED; + } + pcchCfg->nAndPagingFrameOffset.choice.halfT = duPcchCfg.pageFrameOffset; + break; + } case PCCH_Config__nAndPagingFrameOffset_PR_quarterT: - { - //TODO - break; - } + { + /*Spec 38.331: PCCH_Config: nAndPagingFrameOffset [MAX value of quarterT] */ + if(duPcchCfg.pageFrameOffset > 3) + { + DU_LOG("\nERROR --> DU APP : Invalid PagingFrameOffset for QUARTER_T"); + return RFAILED; + } + pcchCfg->nAndPagingFrameOffset.choice.quarterT = duPcchCfg.pageFrameOffset; + break; + } case PCCH_Config__nAndPagingFrameOffset_PR_oneEighthT: - { - //TODO - break; - } + { + /*Spec 38.331: PCCH_Config: nAndPagingFrameOffset [MAX value of oneEighthT] */ + if(duPcchCfg.pageFrameOffset > 7) + { + DU_LOG("\nERROR --> DU APP : Invalid PagingFrameOffset for ONE_EIGHTH_T"); + return RFAILED; + } + pcchCfg->nAndPagingFrameOffset.choice.oneEighthT = duPcchCfg.pageFrameOffset; + break; + } case PCCH_Config__nAndPagingFrameOffset_PR_oneSixteenthT: - { - //TODO - break; - } + { + /*Spec 38.331: PCCH_Config: nAndPagingFrameOffset [MAX value of oneSixteenthT] */ + if(duPcchCfg.pageFrameOffset > 15) + { + DU_LOG("\nERROR --> DU APP : Invalid PagingFrameOffset for ONE_SIXTEENTH_T"); + return RFAILED; + } + pcchCfg->nAndPagingFrameOffset.choice.oneSixteenthT = duPcchCfg.pageFrameOffset; + break; + } default: - { - DU_LOG("\nERROR --> DU APP : Invalid nAndPagingFrameOffset configuration"); - return RFAILED; - } + { + DU_LOG("\nERROR --> DU APP : Invalid nAndPagingFrameOffset configuration"); + return RFAILED; + } + } + pcchCfg->ns = convertNsValueToEnum(duPcchCfg.ns); + + DU_ALLOC(pcchCfg->firstPDCCH_MonitoringOccasionOfPO, \ + sizeof(struct PCCH_Config__firstPDCCH_MonitoringOccasionOfPO)); + if(pcchCfg->firstPDCCH_MonitoringOccasionOfPO == NULLP) + { + DU_LOG("\nERROR --> DU APP : BuildPcchConfig >> Memory Allocation fails"); + return RFAILED; } - pcchCfg->ns = duPcchCfg.numPagingOcc; + if(fillFirstPdcchMonitoringOcc(pcchCfg->firstPDCCH_MonitoringOccasionOfPO, &duPcchCfg) == RFAILED) + { + DU_LOG("\nERROR --> DU APP : BuildPcchConfig >> Filling of Paging Occ failed"); + return RFAILED; + } return ROK; }/* BuildPcchConfig */ @@ -1359,7 +1536,7 @@ uint8_t BuildPcchConfig(PCCH_Config_t *pcchCfg) * * @details * - * Function : BuildFreqInfoDl + * Function : BuildFreqInfoDlSib * * Functionality: * Builds Frequency Info for Downlink @@ -1370,7 +1547,7 @@ uint8_t BuildPcchConfig(PCCH_Config_t *pcchCfg) * * ****************************************************************/ -uint8_t BuildFreqInfoDl(FrequencyInfoDL_SIB_t *frequencyInfoDL) +uint8_t BuildFreqInfoDlSib(FrequencyInfoDL_SIB_t *frequencyInfoDL) { uint8_t ret; uint8_t idx; @@ -1384,10 +1561,10 @@ uint8_t BuildFreqInfoDl(FrequencyInfoDL_SIB_t *frequencyInfoDL) elementCnt = ODU_VALUE_ONE; frequencyInfoDL->frequencyBandList.list.count = elementCnt; frequencyInfoDL->frequencyBandList.list.size = \ - elementCnt * sizeof(NR_MultiBandInfo_t *); + elementCnt * sizeof(NR_MultiBandInfo_t *); DU_ALLOC(frequencyInfoDL->frequencyBandList.list.array, \ - frequencyInfoDL->frequencyBandList.list.size); + frequencyInfoDL->frequencyBandList.list.size); if(!frequencyInfoDL->frequencyBandList.list.array) { DU_LOG("\nERROR --> DU APP : SIB1 DL Configuration memory allocation failed"); @@ -1397,11 +1574,11 @@ uint8_t BuildFreqInfoDl(FrequencyInfoDL_SIB_t *frequencyInfoDL) for(idx = 0; idx < elementCnt; idx++) { DU_ALLOC(frequencyInfoDL->frequencyBandList.list.array[idx],\ - sizeof(NR_MultiBandInfo_t)); + sizeof(NR_MultiBandInfo_t)); if(!frequencyInfoDL->frequencyBandList.list.array[idx]) { - DU_LOG("\nERROR --> DU APP : SIB1 DL Configuration memory allocation failed"); - return RFAILED; + DU_LOG("\nERROR --> DU APP : SIB1 DL Configuration memory allocation failed"); + return RFAILED; } } @@ -1424,8 +1601,8 @@ uint8_t BuildFreqInfoDl(FrequencyInfoDL_SIB_t *frequencyInfoDL) elementCnt = ODU_VALUE_ONE; frequencyInfoDL->scs_SpecificCarrierList.list.count = elementCnt; frequencyInfoDL->scs_SpecificCarrierList.list.size = \ - elementCnt * sizeof(SCS_SpecificCarrier_t *); - ret= BuildScsSpecificCarrierListDl(&frequencyInfoDL->scs_SpecificCarrierList); + elementCnt * sizeof(SCS_SpecificCarrier_t *); + ret= BuildScsSpecificCarrierListDlSib(&frequencyInfoDL->scs_SpecificCarrierList); if(ret != ROK) { @@ -1455,7 +1632,7 @@ uint8_t BuildDlCfgCommSib(DownlinkConfigCommonSIB_t *dlCfg) { /* DL frequency info */ uint8_t ret; - ret = BuildFreqInfoDl(&dlCfg->frequencyInfoDL); + ret = BuildFreqInfoDlSib(&dlCfg->frequencyInfoDL); if(ret != ROK) { return RFAILED; @@ -1488,7 +1665,7 @@ uint8_t BuildDlCfgCommSib(DownlinkConfigCommonSIB_t *dlCfg) * * @details * - * Function : BuildScsSpecificCarrierListUl + * Function : BuildScsSpecificCarrierListUlSib * * Functionality: * Builds SCS specific carrier list for UL @@ -1499,10 +1676,7 @@ uint8_t BuildDlCfgCommSib(DownlinkConfigCommonSIB_t *dlCfg) * * ****************************************************************/ -uint8_t BuildScsSpecificCarrierListUl -( -struct FrequencyInfoUL_SIB__scs_SpecificCarrierList *scsCarrierList -) +uint8_t BuildScsSpecificCarrierListUlSib(struct FrequencyInfoUL_SIB__scs_SpecificCarrierList *scsCarrierList) { uint8_t idx; ScsSpecCarrier duScsSpecCarrier; @@ -1521,8 +1695,8 @@ struct FrequencyInfoUL_SIB__scs_SpecificCarrierList *scsCarrierList DU_ALLOC(scsCarrierList->list.array[idx], sizeof(SCS_SpecificCarrier_t)); if(!scsCarrierList->list.array[idx]) { - DU_LOG("\nERROR --> DU APP : SCS Specific Carrier list memory allocation failed"); - return RFAILED; + DU_LOG("\nERROR --> DU APP : SCS Specific Carrier list memory allocation failed"); + return RFAILED; } } idx = 0; @@ -1531,7 +1705,7 @@ struct FrequencyInfoUL_SIB__scs_SpecificCarrierList *scsCarrierList scsCarrierList->list.array[idx]->carrierBandwidth = duScsSpecCarrier.scsBw; return ROK; -} /* End of BuildScsSpecificCarrierListUl */ +} /* End of BuildScsSpecificCarrierListUlSib */ /******************************************************************* * @@ -1539,7 +1713,7 @@ struct FrequencyInfoUL_SIB__scs_SpecificCarrierList *scsCarrierList * * @details * - * Function : BuildFreqInfoUl + * Function : BuildFreqInfoUlSib * * Functionality: * Builds frequency infor for UL @@ -1550,7 +1724,7 @@ struct FrequencyInfoUL_SIB__scs_SpecificCarrierList *scsCarrierList * * ****************************************************************/ -uint8_t BuildFreqInfoUl(FrequencyInfoUL_SIB_t *frequencyInfoUL) +uint8_t BuildFreqInfoUlSib(FrequencyInfoUL_SIB_t *frequencyInfoUL) { uint8_t elementCnt; UlCfgCommon ulCfg; @@ -1561,8 +1735,8 @@ uint8_t BuildFreqInfoUl(FrequencyInfoUL_SIB_t *frequencyInfoUL) elementCnt = ODU_VALUE_ONE; frequencyInfoUL->scs_SpecificCarrierList.list.count = elementCnt; frequencyInfoUL->scs_SpecificCarrierList.list.size = \ - elementCnt * sizeof(SCS_SpecificCarrier_t *); - ret=BuildScsSpecificCarrierListUl(&frequencyInfoUL->scs_SpecificCarrierList); + elementCnt * sizeof(SCS_SpecificCarrier_t *); + ret=BuildScsSpecificCarrierListUlSib(&frequencyInfoUL->scs_SpecificCarrierList); if(ret != ROK) { return RFAILED; @@ -1577,7 +1751,7 @@ uint8_t BuildFreqInfoUl(FrequencyInfoUL_SIB_t *frequencyInfoUL) *frequencyInfoUL->p_Max = ulCfg.pMax; FreqInfoUlret=ROK; return ROK; -}/* BuildFreqInfoUl */ +}/* BuildFreqInfoUlSib */ /******************************************************************* * @@ -1598,175 +1772,172 @@ uint8_t BuildFreqInfoUl(FrequencyInfoUL_SIB_t *frequencyInfoUL) uint8_t BuildRachCfgCommon(struct BWP_UplinkCommon__rach_ConfigCommon *rachCfg) { - RachCfgCommon duRachCfg; - RACH_ConfigCommon_t *setup; - - duRachCfg = duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg.rachCfg; + RachCfgCommon duRachCfg = duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg.rachCfg; + RACH_ConfigCommon_t *setup = NULLP; rachCfg->present = duRachCfg.present; switch(rachCfg->present) { case BWP_UplinkCommon__rach_ConfigCommon_PR_NOTHING: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_UplinkCommon__rach_ConfigCommon_PR_release: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_UplinkCommon__rach_ConfigCommon_PR_setup: - { - DU_ALLOC(rachCfg->choice.setup, sizeof(RACH_ConfigCommon_t)); - if(!rachCfg->choice.setup) - { - DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); - return RFAILED; - } - setup = rachCfg->choice.setup; - - /* Generic RACH Configuration */ - setup->rach_ConfigGeneric.prach_ConfigurationIndex = duRachCfg.prachCfgIdx; - setup->rach_ConfigGeneric.msg1_FDM = duRachCfg.msg1Fdm; - setup->rach_ConfigGeneric.msg1_FrequencyStart = duRachCfg.msg1FreqStart; - setup->rach_ConfigGeneric.zeroCorrelationZoneConfig = duRachCfg.zeroCorrZoneCfg; - setup->rach_ConfigGeneric.preambleReceivedTargetPower = duRachCfg.preambleRcvdTgtPwr; - setup->rach_ConfigGeneric.preambleTransMax = duRachCfg.preambleTransMax; - setup->rach_ConfigGeneric.powerRampingStep = duRachCfg.pwrRampingStep; - setup->rach_ConfigGeneric.ra_ResponseWindow = duRachCfg.raRspWindow; - - /* Total number of RA preambles */ - DU_ALLOC(setup->totalNumberOfRA_Preambles, sizeof(long)); - if(!setup->totalNumberOfRA_Preambles) - { - DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); - return RFAILED; - } - *setup->totalNumberOfRA_Preambles = duRachCfg.numRaPreamble; - - /* SSB per RACH occassion and CB Preambles per SSB */ - DU_ALLOC(setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB,\ - sizeof(struct RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB)); - if(!setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB) - { - DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); - return RFAILED; - } - setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->present = \ - duRachCfg.ssbPerRachOccPresent; - switch(setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->present) - { - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_NOTHING: - { - //TODO - break; - } - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_oneEighth: - { - //TODO - break; - } - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_oneFourth: - { - //TODO - break; - } - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_oneHalf: - { - //TODO - break; - } - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_one: - { - setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->choice.one =\ - duRachCfg.numSsbPerRachOcc; - } - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_two: - { - //TODO - break; - } - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_four: - { - //TODO - break; - } - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_eight: - { - //TODO - break; - } - case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_sixteen: - { - //TODO - break; - } - default: - { - DU_LOG("\nERROR --> DU APP: Invalid value for \ - ssb_PerRach_OccassionAndCB_PreamblesPerSSB"); - return RFAILED; - } - } - - /* RA Contention Resolution Timer */ - setup->ra_ContentionResolutionTimer = duRachCfg.contResTimer; - - /* RSRP Threshold SSB */ - DU_ALLOC(setup->rsrp_ThresholdSSB, sizeof(RSRP_Range_t)); - if(!setup->rsrp_ThresholdSSB) - { - DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); - return RFAILED; - } - *setup->rsrp_ThresholdSSB = duRachCfg.rsrpThreshSsb; - - /* Root Sequence index */ - setup->prach_RootSequenceIndex.present = duRachCfg.rootSeqIdxPresent; - switch(setup->prach_RootSequenceIndex.present) - { - case RACH_ConfigCommon__prach_RootSequenceIndex_PR_NOTHING: - { - //TODO - break; - } - case RACH_ConfigCommon__prach_RootSequenceIndex_PR_l839: - { - //TODO - break; - } - case RACH_ConfigCommon__prach_RootSequenceIndex_PR_l139: - { - setup->prach_RootSequenceIndex.choice.l139 = duRachCfg.rootSeqIdx; - break; - } - default: - { - DU_LOG("\nERROR --> DU APP: Inavlid PRACH root sequence index type"); - return RFAILED; - } - } - - /* Msg 1 Subcarrier spacing */ - DU_ALLOC(setup->msg1_SubcarrierSpacing, sizeof(SubcarrierSpacing_t)); - if(!setup->msg1_SubcarrierSpacing) - { - DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); - return RFAILED; - } - *setup->msg1_SubcarrierSpacing = duRachCfg.msg1Scs; - - /* Restricted Set Config */ - setup->restrictedSetConfig = duRachCfg.restrictedSetCfg; - - break; - } + { + DU_ALLOC(rachCfg->choice.setup, sizeof(RACH_ConfigCommon_t)); + if(!rachCfg->choice.setup) + { + DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); + return RFAILED; + } + setup = rachCfg->choice.setup; + + /* Generic RACH Configuration */ + setup->rach_ConfigGeneric.prach_ConfigurationIndex = duRachCfg.prachCfgIdx; + setup->rach_ConfigGeneric.msg1_FDM = duRachCfg.msg1Fdm; + setup->rach_ConfigGeneric.msg1_FrequencyStart = duRachCfg.msg1FreqStart; + setup->rach_ConfigGeneric.zeroCorrelationZoneConfig = duRachCfg.zeroCorrZoneCfg; + setup->rach_ConfigGeneric.preambleReceivedTargetPower = duRachCfg.preambleRcvdTgtPwr; + setup->rach_ConfigGeneric.preambleTransMax = duRachCfg.preambleTransMax; + setup->rach_ConfigGeneric.powerRampingStep = duRachCfg.pwrRampingStep; + setup->rach_ConfigGeneric.ra_ResponseWindow = duRachCfg.raRspWindow; + + /* Total number of RA preambles */ + DU_ALLOC(setup->totalNumberOfRA_Preambles, sizeof(long)); + if(!setup->totalNumberOfRA_Preambles) + { + DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); + return RFAILED; + } + *setup->totalNumberOfRA_Preambles = duRachCfg.numRaPreamble; + + /* SSB per RACH occassion and CB Preambles per SSB */ + DU_ALLOC(setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB,\ + sizeof(struct RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB)); + if(!setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB) + { + DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); + return RFAILED; + } + setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->present = duRachCfg.numSsbPerRachOcc; + + switch(setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->present) + { + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_NOTHING: + { + //TODO + break; + } + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_oneEighth: + { + //TODO + break; + } + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_oneFourth: + { + //TODO + break; + } + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_oneHalf: + { + //TODO + break; + } + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_one: + { + setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB->choice.one = \ + convertCbPreamblePerSsbValueToEnum(duRachCfg.numCbPreamblePerSsb); + } + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_two: + { + //TODO + break; + } + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_four: + { + //TODO + break; + } + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_eight: + { + //TODO + break; + } + case RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_sixteen: + { + //TODO + break; + } + default: + { + DU_LOG("\nERROR --> DU APP: Invalid value for ssb_PerRach_OccassionAndCB_PreamblesPerSSB"); + return RFAILED; + } + } + + /* RA Contention Resolution Timer */ + setup->ra_ContentionResolutionTimer = duRachCfg.contResTimer; + + /* RSRP Threshold SSB */ + DU_ALLOC(setup->rsrp_ThresholdSSB, sizeof(RSRP_Range_t)); + if(!setup->rsrp_ThresholdSSB) + { + DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); + return RFAILED; + } + *setup->rsrp_ThresholdSSB = duRachCfg.rsrpThreshSsb; + + /* Root Sequence index */ + setup->prach_RootSequenceIndex.present = duRachCfg.rootSeqIdxPresent; + switch(setup->prach_RootSequenceIndex.present) + { + case RACH_ConfigCommon__prach_RootSequenceIndex_PR_NOTHING: + { + //TODO + break; + } + case RACH_ConfigCommon__prach_RootSequenceIndex_PR_l839: + { + //TODO + break; + } + case RACH_ConfigCommon__prach_RootSequenceIndex_PR_l139: + { + setup->prach_RootSequenceIndex.choice.l139 = duRachCfg.rootSeqIdx; + break; + } + default: + { + DU_LOG("\nERROR --> DU APP: Inavlid PRACH root sequence index type"); + return RFAILED; + } + } + + /* Msg 1 Subcarrier spacing */ + DU_ALLOC(setup->msg1_SubcarrierSpacing, sizeof(SubcarrierSpacing_t)); + if(!setup->msg1_SubcarrierSpacing) + { + DU_LOG("\nERROR --> DU APP : Rach Config memory alloc failed"); + return RFAILED; + } + *setup->msg1_SubcarrierSpacing = duRachCfg.msg1Scs; + + /* Restricted Set Config */ + setup->restrictedSetConfig = duRachCfg.restrictedSetCfg; + + break; + } default: - { - DU_LOG("\nERROR --> DU APP : Invalid RACH Config type "); - return RFAILED; - } + { + DU_LOG("\nERROR --> DU APP : Invalid RACH Config type "); + return RFAILED; + } } return ROK; }/* BuildRachCfgCommon */ @@ -1790,109 +1961,106 @@ uint8_t BuildRachCfgCommon(struct BWP_UplinkCommon__rach_ConfigCommon *rachCfg) uint8_t BuildPuschCfgCommon(struct BWP_UplinkCommon__pusch_ConfigCommon *puschCfg) { - uint8_t idx; - uint8_t elementCnt; - PuschCfgCommon duPuschCfg; - PUSCH_ConfigCommon_t *setup; - PUSCH_TimeDomainResourceAllocation_t *timeDomRsrcAllocInfo; + uint8_t idx = 0; + uint8_t elementCnt = 0; + PuschCfgCommon duPuschCfg = duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg.puschCfg; + PUSCH_ConfigCommon_t *setup = NULLP; + PUSCH_TimeDomainResourceAllocation_t *timeDomRsrcAllocInfo = NULLP; - duPuschCfg = duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg.puschCfg; puschCfg->present = duPuschCfg.puschCfgPresent; switch(puschCfg->present) { case BWP_UplinkCommon__pusch_ConfigCommon_PR_NOTHING: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_UplinkCommon__pusch_ConfigCommon_PR_release: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_UplinkCommon__pusch_ConfigCommon_PR_setup: - { - DU_ALLOC(puschCfg->choice.setup, sizeof(PUSCH_ConfigCommon_t)); - if(!puschCfg->choice.setup) - { - DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); - return RFAILED; - } - setup = puschCfg->choice.setup; - - /* Time Domain Resource Allocation List */ - DU_ALLOC(setup->pusch_TimeDomainAllocationList,\ - sizeof(PUSCH_TimeDomainResourceAllocationList_t)); - if(!setup->pusch_TimeDomainAllocationList) - { - DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); - return RFAILED; - } - elementCnt = duPuschCfg.numTimeDomRsrcAlloc; - setup->pusch_TimeDomainAllocationList->list.count = elementCnt; - setup->pusch_TimeDomainAllocationList->list.size = \ - elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *); - - DU_ALLOC(setup->pusch_TimeDomainAllocationList->list.array, \ - setup->pusch_TimeDomainAllocationList->list.size); - if(!setup->pusch_TimeDomainAllocationList->list.array) - { - DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); - return RFAILED; - } - - for(idx=0; idxpusch_TimeDomainAllocationList->list.array[idx],\ - sizeof(PUSCH_TimeDomainResourceAllocation_t)); - if(!setup->pusch_TimeDomainAllocationList->list.array[idx]) - { - DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); - return RFAILED; - } - } - - for(idx = 0; idx < elementCnt; idx++) - { - timeDomRsrcAllocInfo = setup->pusch_TimeDomainAllocationList->list.array[idx]; - - /* K2 */ - DU_ALLOC(timeDomRsrcAllocInfo->k2, sizeof(long)); - if(!timeDomRsrcAllocInfo->k2) - { - DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); - return RFAILED; - } - *timeDomRsrcAllocInfo->k2 = duPuschCfg.timeDomAllocList[idx].k2; - timeDomRsrcAllocInfo->mappingType = duPuschCfg.timeDomAllocList[idx].mapType; - timeDomRsrcAllocInfo->startSymbolAndLength = duPuschCfg.timeDomAllocList[idx].sliv; - } - /* Msg3 Delta Preamble */ - DU_ALLOC(setup->msg3_DeltaPreamble, sizeof(long)); - if(!setup->msg3_DeltaPreamble) - { - DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); - return RFAILED; - } - *setup->msg3_DeltaPreamble = duPuschCfg.msg3DeltaPreamble; - - /* P0 Nominal with grnat */ - DU_ALLOC(setup->p0_NominalWithGrant, sizeof(long)); - if(!setup->p0_NominalWithGrant) - { - DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); - return RFAILED; - } - *setup->p0_NominalWithGrant = duPuschCfg.p0NominalWithGrant; - - break; - } + { + DU_ALLOC(puschCfg->choice.setup, sizeof(PUSCH_ConfigCommon_t)); + if(!puschCfg->choice.setup) + { + DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); + return RFAILED; + } + setup = puschCfg->choice.setup; + + /* Time Domain Resource Allocation List */ + DU_ALLOC(setup->pusch_TimeDomainAllocationList, sizeof(PUSCH_TimeDomainResourceAllocationList_t)); + if(!setup->pusch_TimeDomainAllocationList) + { + DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); + return RFAILED; + } + elementCnt = duPuschCfg.numTimeDomRsrcAlloc; + setup->pusch_TimeDomainAllocationList->list.count = elementCnt; + setup->pusch_TimeDomainAllocationList->list.size = elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *); + + DU_ALLOC(setup->pusch_TimeDomainAllocationList->list.array, setup->pusch_TimeDomainAllocationList->list.size); + if(!setup->pusch_TimeDomainAllocationList->list.array) + { + DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); + return RFAILED; + } + + for(idx=0; idxpusch_TimeDomainAllocationList->list.array[idx],\ + sizeof(PUSCH_TimeDomainResourceAllocation_t)); + if(!setup->pusch_TimeDomainAllocationList->list.array[idx]) + { + DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); + return RFAILED; + } + } + + for(idx = 0; idx < elementCnt; idx++) + { + timeDomRsrcAllocInfo = setup->pusch_TimeDomainAllocationList->list.array[idx]; + + /* K2 */ + DU_ALLOC(timeDomRsrcAllocInfo->k2, sizeof(long)); + if(!timeDomRsrcAllocInfo->k2) + { + DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); + return RFAILED; + } + *timeDomRsrcAllocInfo->k2 = duPuschCfg.timeDomAllocList[idx].k2; + timeDomRsrcAllocInfo->mappingType = duPuschCfg.timeDomAllocList[idx].mapType; + timeDomRsrcAllocInfo->startSymbolAndLength = duPuschCfg.timeDomAllocList[idx].sliv; + } + + /* Msg3 Delta Preamble */ + DU_ALLOC(setup->msg3_DeltaPreamble, sizeof(long)); + if(!setup->msg3_DeltaPreamble) + { + DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); + return RFAILED; + } + *setup->msg3_DeltaPreamble = duPuschCfg.msg3DeltaPreamble; + + /* P0 Nominal with grant */ + DU_ALLOC(setup->p0_NominalWithGrant, sizeof(long)); + if(!setup->p0_NominalWithGrant) + { + DU_LOG("\nERROR --> DU APP : PUSCH Config memory alloc failed"); + return RFAILED; + } + *setup->p0_NominalWithGrant = duPuschCfg.p0NominalWithGrant; + + break; + } default: - { - DU_LOG("\nERROR --> DU APP : Invalid PUSCH configuration type "); - return RFAILED; - } + { + DU_LOG("\nERROR --> DU APP : Invalid PUSCH configuration type "); + return RFAILED; + } } return ROK; @@ -1926,53 +2094,53 @@ uint8_t BuildPucchCfgCommon( struct BWP_UplinkCommon__pucch_ConfigCommon *pucchC switch(pucchCfg->present) { case BWP_UplinkCommon__pucch_ConfigCommon_PR_NOTHING: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_UplinkCommon__pucch_ConfigCommon_PR_release: - { - //TODO - break; - } + { + //TODO + break; + } case BWP_UplinkCommon__pucch_ConfigCommon_PR_setup: - { - DU_ALLOC(pucchCfg->choice.setup, sizeof(PUCCH_ConfigCommon_t)); - if(!pucchCfg->choice.setup) - { - DU_LOG("\nERROR --> DU APP : PUCCH Config memory alloc failed"); - return RFAILED; - } - setup = pucchCfg->choice.setup; - - /* Resource Common */ - DU_ALLOC(setup->pucch_ResourceCommon, sizeof(long)); - if(!setup->pucch_ResourceCommon) - { - DU_LOG("\nERROR --> DU APP : PUCCH Config memory alloc failed"); - return RFAILED; - } - *setup->pucch_ResourceCommon = duPucchCfg.rsrcComm; - - /* Group hopping */ - setup->pucch_GroupHopping = duPucchCfg.grpHop; - - /* P0 nominal */ - DU_ALLOC(setup->p0_nominal, sizeof(long)); - if(!setup->p0_nominal) - { - DU_LOG("\nERROR --> DU APP : PUCCH Config memory alloc failed"); - return RFAILED; - } - *setup->p0_nominal = duPucchCfg.p0Nominal; - - break; - } + { + DU_ALLOC(pucchCfg->choice.setup, sizeof(PUCCH_ConfigCommon_t)); + if(!pucchCfg->choice.setup) + { + DU_LOG("\nERROR --> DU APP : PUCCH Config memory alloc failed"); + return RFAILED; + } + setup = pucchCfg->choice.setup; + + /* Resource Common */ + DU_ALLOC(setup->pucch_ResourceCommon, sizeof(long)); + if(!setup->pucch_ResourceCommon) + { + DU_LOG("\nERROR --> DU APP : PUCCH Config memory alloc failed"); + return RFAILED; + } + *setup->pucch_ResourceCommon = duPucchCfg.rsrcComm; + + /* Group hopping */ + setup->pucch_GroupHopping = duPucchCfg.grpHop; + + /* P0 nominal */ + DU_ALLOC(setup->p0_nominal, sizeof(long)); + if(!setup->p0_nominal) + { + DU_LOG("\nERROR --> DU APP : PUCCH Config memory alloc failed"); + return RFAILED; + } + *setup->p0_nominal = duPucchCfg.p0Nominal; + + break; + } default: - { - DU_LOG("\nERROR --> DU APP : Invalid PUCCH Config type"); - return RFAILED; - } + { + DU_LOG("\nERROR --> DU APP : Invalid PUCCH Config type"); + return RFAILED; + } } return ROK; }/* BuildPucchCfgCommon */ @@ -1996,57 +2164,56 @@ uint8_t BuildPucchCfgCommon( struct BWP_UplinkCommon__pucch_ConfigCommon *pucchC uint8_t BuildBwpUlCommon(BWP_UplinkCommon_t *bwp) { - uint8_t ret; - UlCfgCommon duUlCfg; - - duUlCfg = duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg; + UlCfgCommon duUlCfg = duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg; + /* Generic Parameters */ bwp->genericParameters.locationAndBandwidth = duUlCfg.locAndBw; bwp->genericParameters.subcarrierSpacing = duUlCfg.ulScsCarrier.scs; /* RACH Config Common */ - DU_ALLOC(bwp->rach_ConfigCommon,\ - sizeof(struct BWP_UplinkCommon__rach_ConfigCommon)); + DU_ALLOC(bwp->rach_ConfigCommon, sizeof(struct BWP_UplinkCommon__rach_ConfigCommon)); if(!bwp->rach_ConfigCommon) { DU_LOG("\nERROR --> DU APP : UL BWP memory allocation failed"); return RFAILED; } - ret = BuildRachCfgCommon(bwp->rach_ConfigCommon); - if(ret != ROK) + + if((BuildRachCfgCommon(bwp->rach_ConfigCommon)) != ROK) { + DU_LOG("\nERROR --> DU APP : Failed to fill RACH config common in BuildBwpUlCommon()"); return RFAILED; } RachCfgCommonret=ROK; /* PUSCH Config Common */ - DU_ALLOC(bwp->pusch_ConfigCommon,\ - sizeof(struct BWP_UplinkCommon__pusch_ConfigCommon)); + DU_ALLOC(bwp->pusch_ConfigCommon, sizeof(struct BWP_UplinkCommon__pusch_ConfigCommon)); if(!bwp->pusch_ConfigCommon) { DU_LOG("\nERROR --> DU APP : UL BWP memory allocation failed"); return RFAILED; - } - ret = BuildPuschCfgCommon(bwp->pusch_ConfigCommon); - if(ret != ROK) + } + + if((BuildPuschCfgCommon(bwp->pusch_ConfigCommon)) != ROK) { + DU_LOG("\nERROR --> DU APP : Failed to fill PUSCH config common in BuildBwpUlCommon()"); return RFAILED; } PuschCfgCommonret = ROK; /* PUCCH Config Common */ - DU_ALLOC(bwp->pucch_ConfigCommon,\ - sizeof(struct BWP_UplinkCommon__pucch_ConfigCommon)); + DU_ALLOC(bwp->pucch_ConfigCommon, sizeof(struct BWP_UplinkCommon__pucch_ConfigCommon)); if(!bwp->pucch_ConfigCommon) { DU_LOG("\nERROR --> DU APP : UL BWP memory allocation failed"); return RFAILED; - } - ret = BuildPucchCfgCommon(bwp->pucch_ConfigCommon); - if(ret != ROK) + } + + if((BuildPucchCfgCommon(bwp->pucch_ConfigCommon)) != ROK) { + DU_LOG("\nERROR --> DU APP : Failed to fill PUCCH config common in BuildBwpUlCommon()"); return RFAILED; } + return ROK; }/* BuildBwpUlCommon */ @@ -2071,7 +2238,7 @@ uint8_t BuildUlCfgCommSib(UplinkConfigCommonSIB_t *ulCfg) { uint8_t ret; /* UL frequency info */ - ret = BuildFreqInfoUl(&ulCfg->frequencyInfoUL); + ret = BuildFreqInfoUlSib(&ulCfg->frequencyInfoUL); if(ret != ROK) { return RFAILED; @@ -2084,7 +2251,7 @@ uint8_t BuildUlCfgCommSib(UplinkConfigCommonSIB_t *ulCfg) } /* Time Alignment timer */ ulCfg->timeAlignmentTimerCommon = \ - duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg.timeAlignTimerComm; + duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg.timeAlignTimerComm; return ROK; }/* BuildUlCfgCommSib */ @@ -2108,9 +2275,7 @@ uint8_t BuildUlCfgCommSib(UplinkConfigCommonSIB_t *ulCfg) uint8_t BuildTddUlDlCfgComm(TDD_UL_DL_ConfigCommon_t *tddCfg) { - TddUlDlCfgCommon duTddCfg; - - duTddCfg = duCfgParam.sib1Params.srvCellCfgCommSib.tddCfg; + TddUlDlCfgCommon duTddCfg = duCfgParam.sib1Params.srvCellCfgCommSib.tddCfg; /* Reference Subcarrier spacing */ tddCfg->referenceSubcarrierSpacing = duTddCfg.refScs; @@ -2161,34 +2326,7 @@ uint8_t BuildServCellCfgCommonSib(ServingCellConfigCommonSIB_t *srvCellCfg) ssbPosInBurst->buf[0] = duSrvCellCfg.ssbPosInBurst; ssbPosInBurst->bits_unused = 0; - switch(duSrvCellCfg.ssbPrdServingCell) - { - case SSB_PERIODICITY_5MS: - srvCellCfg->ssb_PeriodicityServingCell = \ - ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms5; - break; - case SSB_PERIODICITY_10MS: - srvCellCfg->ssb_PeriodicityServingCell = \ - ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms10; - break; - case SSB_PERIODICITY_20MS: - srvCellCfg->ssb_PeriodicityServingCell = \ - ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms20; - break; - case SSB_PERIODICITY_40MS: - srvCellCfg->ssb_PeriodicityServingCell = \ - ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms40; - break; - case SSB_PERIODICITY_80MS: - srvCellCfg->ssb_PeriodicityServingCell = \ - ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms80; - break; - case SSB_PERIODICITY_160MS: - srvCellCfg->ssb_PeriodicityServingCell = \ - ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms160; - break; - } - + srvCellCfg->ssb_PeriodicityServingCell = convertSsbPeriodicityValueToEnumForSib(duSrvCellCfg.ssbPrdServingCell); srvCellCfg->ss_PBCH_BlockPower = duSrvCellCfg.ssPbchBlockPwr; /* Downlink config common */ @@ -2256,8 +2394,8 @@ uint8_t BuildSib1Msg() DU_ALLOC(sib1Msg, sizeof(SIB1_t)); if(!sib1Msg) { - DU_LOG("\nERROR --> DU APP: SIB1 msg memory allocation failure"); - break; + DU_LOG("\nERROR --> DU APP: SIB1 msg memory allocation failure"); + break; } elementCnt = ODU_VALUE_ONE; @@ -2270,35 +2408,35 @@ uint8_t BuildSib1Msg() ret1 = BuildPlmnList(cellAccessInfo); if(ret1 != ROK) { - break; + break; } /* Connection Establish Failure Control */ DU_ALLOC(sib1Msg->connEstFailureControl, sizeof(ConnEstFailureControl_t)); if(!sib1Msg->connEstFailureControl) { - DU_LOG("\nERROR --> DU APP: sib1Msg->connEstFailureControl memory allocation failure"); - break; + DU_LOG("\nERROR --> DU APP: sib1Msg->connEstFailureControl memory allocation failure"); + break; } sib1Msg->connEstFailureControl->connEstFailCount =\ - duCfgParam.sib1Params.connEstFailCnt; + duCfgParam.sib1Params.connEstFailCnt; sib1Msg->connEstFailureControl->connEstFailOffsetValidity =\ - duCfgParam.sib1Params.connEstFailOffValidity; + duCfgParam.sib1Params.connEstFailOffValidity; /* SI Scheduling Info */ DU_ALLOC(sib1Msg->si_SchedulingInfo, sizeof(SI_SchedulingInfo_t)); if(!sib1Msg->si_SchedulingInfo) { - DU_LOG("\nERROR --> DU APP: sib1Msg->si_SchedulingInfo memory allocation failure"); - break; + DU_LOG("\nERROR --> DU APP: sib1Msg->si_SchedulingInfo memory allocation failure"); + break; } elementCnt = ODU_VALUE_ONE; sib1Msg->si_SchedulingInfo->schedulingInfoList.list.count = elementCnt; sib1Msg->si_SchedulingInfo->schedulingInfoList.list.size = elementCnt * - sizeof(struct SchedulingInfo *); + sizeof(struct SchedulingInfo *); ret1 = BuildSiSchedInfoList(&sib1Msg->si_SchedulingInfo->schedulingInfoList); if(ret1 != ROK) { - break; + break; } sib1Msg->si_SchedulingInfo->si_WindowLength = duCfgParam.sib1Params.siSchedInfo.winLen; @@ -2306,13 +2444,13 @@ uint8_t BuildSib1Msg() DU_ALLOC(sib1Msg->servingCellConfigCommon, sizeof(ServingCellConfigCommonSIB_t)); if(!sib1Msg->servingCellConfigCommon) { - DU_LOG("\nERROR --> DU APP: sib1Msg->servingCellConfigCommon memory allocation failure"); - break; + DU_LOG("\nERROR --> DU APP: sib1Msg->servingCellConfigCommon memory allocation failure"); + break; } ret1 = BuildServCellCfgCommonSib(sib1Msg->servingCellConfigCommon); if(ret1 != ROK) { - break; + break; } xer_fprint(stdout, &asn_DEF_SIB1, sib1Msg); @@ -2320,22 +2458,24 @@ uint8_t BuildSib1Msg() /* Encode the F1SetupRequest type as APER */ memset(encBuf, 0, ENC_BUF_MAX_LEN); encBufSize = 0; - encRetVal = aper_encode(&asn_DEF_SIB1, 0, sib1Msg, PrepFinalEncBuf,\ - encBuf); + encRetVal = uper_encode(&asn_DEF_SIB1, 0, sib1Msg, PrepFinalEncBuf,\ + encBuf); printf("\nencbufSize: %d\n", encBufSize); if(encRetVal.encoded == -1) { - DU_LOG("\nERROR --> DU APP : Could not encode SIB1 structure (at %s)\n",\ - encRetVal.failed_type ? - encRetVal.failed_type->name : - "unknown"); - break; + DU_LOG("\nERROR --> DU APP : Could not encode SIB1 structure (at %s)\n",\ + encRetVal.failed_type ? + encRetVal.failed_type->name : + "unknown"); + break; } +#ifdef DEBUG_ASN_PRINT for(int i=0; i< encBufSize; i++) { - printf("%x\t",encBuf[i]); + printf("%x\t",encBuf[i]); } printf("\n"); +#endif ret = ROK; break; @@ -2353,55 +2493,55 @@ uint8_t BuildSib1Msg() * * @details * - * Function : FreeFreqInfoDl + * Function : FreeFreqInfoDlSib * - * Functionality: Freeing memory of BuildFreqInfoDl + * Functionality: Freeing memory of BuildFreqInfoDlSib * * @params[in] : FrequencyInfoDL_SIB_t *frequencyInfoDL * @return : void * *******************************************************************/ -void FreeFreqInfoDl(FrequencyInfoDL_SIB_t *frequencyInfoDL) +void FreeFreqInfoDlSib(FrequencyInfoDL_SIB_t *frequencyInfoDL) { uint8_t idx=0; uint8_t idx1=0; /* Free DL frequency info */ - if(!frequencyInfoDL->frequencyBandList.list.array) + if(frequencyInfoDL->frequencyBandList.list.array) { /*Free Frequency band indicator */ - if(!frequencyInfoDL->frequencyBandList.list.array[idx]) - { - if(!frequencyInfoDL->frequencyBandList.list.array[idx]->\ - freqBandIndicatorNR) - { - if(!frequencyInfoDL->scs_SpecificCarrierList.list.array) - { - for(idx1 = 0;idx1scs_SpecificCarrierList.list.count;idx1++) - { - if(!frequencyInfoDL->scs_SpecificCarrierList.list.array[idx1]) - { - DU_FREE(frequencyInfoDL->scs_SpecificCarrierList.list.\ - array[idx1], sizeof(SCS_SpecificCarrier_t)); - } - } - DU_FREE(frequencyInfoDL->scs_SpecificCarrierList.list.array, - frequencyInfoDL->scs_SpecificCarrierList.list.size); - } - DU_FREE(frequencyInfoDL->frequencyBandList.list.\ - array[idx]->freqBandIndicatorNR, sizeof(FreqBandIndicatorNR_t)); - } + if(frequencyInfoDL->frequencyBandList.list.array[idx]) + { + if(frequencyInfoDL->frequencyBandList.list.array[idx]->\ + freqBandIndicatorNR) + { + if(frequencyInfoDL->scs_SpecificCarrierList.list.array) + { + for(idx1 = 0;idx1scs_SpecificCarrierList.list.count;idx1++) + { + if(frequencyInfoDL->scs_SpecificCarrierList.list.array[idx1]) + { + DU_FREE(frequencyInfoDL->scs_SpecificCarrierList.list.\ + array[idx1], sizeof(SCS_SpecificCarrier_t)); + } + } + DU_FREE(frequencyInfoDL->scs_SpecificCarrierList.list.array, + frequencyInfoDL->scs_SpecificCarrierList.list.size); + } + DU_FREE(frequencyInfoDL->frequencyBandList.list.\ + array[idx]->freqBandIndicatorNR, sizeof(FreqBandIndicatorNR_t)); + } } for(idx = 0; idx frequencyBandList.list.count; idx++) { - if(!frequencyInfoDL->frequencyBandList.list.array[idx]) - { - DU_FREE(frequencyInfoDL->frequencyBandList.list.array[idx],\ - sizeof(NR_MultiBandInfo_t)); - } + if(frequencyInfoDL->frequencyBandList.list.array[idx]) + { + DU_FREE(frequencyInfoDL->frequencyBandList.list.array[idx],\ + sizeof(NR_MultiBandInfo_t)); + } } DU_FREE(frequencyInfoDL->frequencyBandList.list.array,\ - frequencyInfoDL->frequencyBandList.list.size); + frequencyInfoDL->frequencyBandList.list.size); } } /******************************************************************* @@ -2424,72 +2564,72 @@ void FreeCommonSerachSpaceList( struct PDCCH_ConfigCommon__commonSearchSpaceList uint8_t idx=0; SearchSpace_t *searchSpace= NULLP; - if(!searchSpclist->list.array) + if(searchSpclist->list.array) { if( searchSpclist->list.array[idx] != NULLP) { - searchSpace= searchSpclist->list.array[idx]; - if(!searchSpace->controlResourceSetId) - { - if(!searchSpace->monitoringSlotPeriodicityAndOffset) - { - if(!searchSpace->monitoringSymbolsWithinSlot) - { - if(!searchSpace->monitoringSymbolsWithinSlot->buf) - { - if(!searchSpace->nrofCandidates) - { - if(!searchSpace->searchSpaceType) - { - switch(searchSpace->searchSpaceType->present) - { - case SearchSpace__searchSpaceType_PR_NOTHING: - break; - case SearchSpace__searchSpaceType_PR_common: - { - if(!searchSpace->searchSpaceType->choice.common) - { - if(!searchSpace->searchSpaceType->choice.\ - common->dci_Format0_0_AndFormat1_0) - { - DU_FREE(searchSpace->searchSpaceType->choice.\ - common->dci_Format0_0_AndFormat1_0,sizeof(struct\ - SearchSpace__searchSpaceType__common__dci_Format0_0_AndFormat1_0)); - } - DU_FREE(searchSpace->searchSpaceType->choice.common,\ - sizeof(struct SearchSpace__searchSpaceType__common)); - } - break; - } - case SearchSpace__searchSpaceType_PR_ue_Specific: - break; - default: - break; - } - DU_FREE(searchSpace->searchSpaceType,\ - sizeof( struct SearchSpace__searchSpaceType)); - } - DU_FREE(searchSpace->nrofCandidates,\ - sizeof(struct SearchSpace__nrofCandidates)); - } - DU_FREE(searchSpace->monitoringSymbolsWithinSlot->buf,\ - searchSpace->monitoringSymbolsWithinSlot->size); - } - DU_FREE(searchSpace->monitoringSymbolsWithinSlot,\ - sizeof(BIT_STRING_t)); - } - DU_FREE(searchSpace->monitoringSlotPeriodicityAndOffset,\ - sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset)); - } - DU_FREE(searchSpace->controlResourceSetId,sizeof(ControlResourceSetId_t)); - } + searchSpace= searchSpclist->list.array[idx]; + if(searchSpace->controlResourceSetId) + { + if(searchSpace->monitoringSlotPeriodicityAndOffset) + { + if(searchSpace->monitoringSymbolsWithinSlot) + { + if(searchSpace->monitoringSymbolsWithinSlot->buf) + { + if(searchSpace->nrofCandidates) + { + if(searchSpace->searchSpaceType) + { + switch(searchSpace->searchSpaceType->present) + { + case SearchSpace__searchSpaceType_PR_NOTHING: + break; + case SearchSpace__searchSpaceType_PR_common: + { + if(searchSpace->searchSpaceType->choice.common) + { + if(searchSpace->searchSpaceType->choice.\ + common->dci_Format0_0_AndFormat1_0) + { + DU_FREE(searchSpace->searchSpaceType->choice.\ + common->dci_Format0_0_AndFormat1_0,sizeof(struct\ + SearchSpace__searchSpaceType__common__dci_Format0_0_AndFormat1_0)); + } + DU_FREE(searchSpace->searchSpaceType->choice.common,\ + sizeof(struct SearchSpace__searchSpaceType__common)); + } + break; + } + case SearchSpace__searchSpaceType_PR_ue_Specific: + break; + default: + break; + } + DU_FREE(searchSpace->searchSpaceType,\ + sizeof( struct SearchSpace__searchSpaceType)); + } + DU_FREE(searchSpace->nrofCandidates,\ + sizeof(struct SearchSpace__nrofCandidates)); + } + DU_FREE(searchSpace->monitoringSymbolsWithinSlot->buf,\ + searchSpace->monitoringSymbolsWithinSlot->size); + } + DU_FREE(searchSpace->monitoringSymbolsWithinSlot,\ + sizeof(BIT_STRING_t)); + } + DU_FREE(searchSpace->monitoringSlotPeriodicityAndOffset,\ + sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset)); + } + DU_FREE(searchSpace->controlResourceSetId,sizeof(ControlResourceSetId_t)); + } } for(idx = 0; idx < searchSpclist->list.count; idx++) { - if(!searchSpclist->list.array[idx]) - { - DU_FREE(searchSpclist->list.array[idx], sizeof(SearchSpace_t)); - } + if(searchSpclist->list.array[idx]) + { + DU_FREE(searchSpclist->list.array[idx], sizeof(SearchSpace_t)); + } } DU_FREE(searchSpclist->list.array, searchSpclist->list.size) } @@ -2517,327 +2657,341 @@ void FreeBwpDlCommon(BWP_DownlinkCommon_t *bwp) pdcchCfg->present=duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pdcchCfg.present; pdschCfg->present=duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pdschCfg.present; - if(!bwp->pdcch_ConfigCommon) - { - if(!bwp->pdsch_ConfigCommon) - { - switch( pdschCfg->present) - { - case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_NOTHING: - { - //TODO - break; - } - case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_release: - { - //TODO - break; - } - case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_setup: - { - if(!pdschCfg->choice.setup) - { - if(!pdschCfg->choice.setup->pdsch_TimeDomainAllocationList) - { - if(!pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array) - { - if(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx]!= NULLP) - { - if(!pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx]->k0) - { - DU_FREE(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx]->k0,\ - sizeof(long)); - } - } - for(idx=0; idxchoice.setup->pdsch_TimeDomainAllocationList->list.count ; idx++) - { - if(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx]!= - NULLP) - { - DU_FREE(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx],\ - sizeof(PDSCH_TimeDomainResourceAllocation_t)); - } - } - DU_FREE(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array,\ - pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.size); - } - DU_FREE(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList,\ - sizeof(PDSCH_TimeDomainResourceAllocationList_t)); - } - DU_FREE(pdschCfg->choice.setup, - sizeof(PDSCH_ConfigCommon_t)); - } - } - default: - break; - } - DU_FREE(bwp->pdsch_ConfigCommon,\ - sizeof(struct BWP_DownlinkCommon__pdsch_ConfigCommon)); + if(bwp->pdcch_ConfigCommon) + { + if(bwp->pdsch_ConfigCommon) + { + switch( pdschCfg->present) + { + case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_NOTHING: + { + //TODO + break; + } + case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_release: + { + //TODO + break; + } + case BWP_DownlinkCommon__pdsch_ConfigCommon_PR_setup: + { + if(pdschCfg->choice.setup) + { + if(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList) + { + if(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array) + { + + for(idx=0; idxchoice.setup->pdsch_TimeDomainAllocationList->list.count ; idx++) + { + if(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx]!= NULLP) + { + if(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx]->k0) + { + DU_FREE(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx]->k0,\ + sizeof(long)); + } + } + } + for(idx=0; idxchoice.setup->pdsch_TimeDomainAllocationList->list.count ; idx++) + { + if(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx]!= + NULLP) + { + DU_FREE(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array[idx],\ + sizeof(PDSCH_TimeDomainResourceAllocation_t)); + } + } + DU_FREE(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.array,\ + pdschCfg->choice.setup->pdsch_TimeDomainAllocationList->list.size); + } + DU_FREE(pdschCfg->choice.setup->pdsch_TimeDomainAllocationList,\ + sizeof(PDSCH_TimeDomainResourceAllocationList_t)); + } + DU_FREE(pdschCfg->choice.setup, + sizeof(PDSCH_ConfigCommon_t)); + } + } + default: + break; + } + DU_FREE(bwp->pdsch_ConfigCommon,\ + sizeof(struct BWP_DownlinkCommon__pdsch_ConfigCommon)); } switch(pdcchCfg->present) { - case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_NOTHING: - { - //TODO - break; - } - case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_release: - { - //TODO - break; - } - case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_setup: - { - if(!pdcchCfg->choice.setup) - { - /* Control Resource Set Zero */ - if(! pdcchCfg->choice.setup->controlResourceSetZero) - { - /* Search space zero */ - if(! pdcchCfg->choice.setup->searchSpaceZero) - { - /* Common Search Space List */ - if(! pdcchCfg->choice.setup->commonSearchSpaceList) - { - if(CommonSerachSpaceListret==ROK) - { - if(!pdcchCfg->choice.setup->searchSpaceSIB1) - { - if(!pdcchCfg->choice.setup->pagingSearchSpace) - { - if(!pdcchCfg->choice.setup->ra_SearchSpace) - { - DU_FREE(pdcchCfg->choice.setup->ra_SearchSpace, - sizeof(SearchSpaceId_t)); - } - DU_FREE( pdcchCfg->choice.setup->pagingSearchSpace, - sizeof(SearchSpaceId_t)); - } - DU_FREE( pdcchCfg->choice.setup->searchSpaceSIB1, - sizeof(SearchSpaceId_t)); - } - } - - FreeCommonSerachSpaceList(pdcchCfg->choice.setup->commonSearchSpaceList); - - DU_FREE( pdcchCfg->choice.setup->commonSearchSpaceList,\ - sizeof(struct - PDCCH_ConfigCommon__commonSearchSpaceList)); - } - DU_FREE( pdcchCfg->choice.setup->searchSpaceZero, - sizeof(SearchSpaceZero_t)); - } - DU_FREE( pdcchCfg->choice.setup->controlResourceSetZero, - sizeof(ControlResourceSetZero_t)); - } - DU_FREE(pdcchCfg->choice.setup, - sizeof(PDCCH_ConfigCommon_t)); - } - break; - } - default: - break; + case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_NOTHING: + { + //TODO + break; + } + case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_release: + { + //TODO + break; + } + case BWP_DownlinkCommon__pdcch_ConfigCommon_PR_setup: + { + if(pdcchCfg->choice.setup) + { + /* Control Resource Set Zero */ + if( pdcchCfg->choice.setup->controlResourceSetZero) + { + /* Search space zero */ + if( pdcchCfg->choice.setup->searchSpaceZero) + { + /* Common Search Space List */ + if( pdcchCfg->choice.setup->commonSearchSpaceList) + { + if(CommonSerachSpaceListret==ROK) + { + if(pdcchCfg->choice.setup->searchSpaceSIB1) + { + if(pdcchCfg->choice.setup->pagingSearchSpace) + { + if(pdcchCfg->choice.setup->ra_SearchSpace) + { + DU_FREE(pdcchCfg->choice.setup->ra_SearchSpace, + sizeof(SearchSpaceId_t)); + } + DU_FREE( pdcchCfg->choice.setup->pagingSearchSpace, + sizeof(SearchSpaceId_t)); + } + DU_FREE( pdcchCfg->choice.setup->searchSpaceSIB1, + sizeof(SearchSpaceId_t)); + } + } + + FreeCommonSerachSpaceList(pdcchCfg->choice.setup->commonSearchSpaceList); + + DU_FREE( pdcchCfg->choice.setup->commonSearchSpaceList,\ + sizeof(struct + PDCCH_ConfigCommon__commonSearchSpaceList)); + } + DU_FREE( pdcchCfg->choice.setup->searchSpaceZero, + sizeof(SearchSpaceZero_t)); + } + DU_FREE( pdcchCfg->choice.setup->controlResourceSetZero, + sizeof(ControlResourceSetZero_t)); + } + DU_FREE(pdcchCfg->choice.setup, + sizeof(PDCCH_ConfigCommon_t)); + } + break; + } + default: + break; } DU_FREE(bwp->pdcch_ConfigCommon,sizeof(struct BWP_DownlinkCommon__pdcch_ConfigCommon)); } } + /******************************************************************* * - * @brief deallocating the memory of BuildSib1Msg + * @brief Free PUCCH configuration common * * @details * - * Function: FreeUlCfgCommSib + * Function : FreePucchCfgCommon * - * Functionality deallocating the memory of BuildUlCfgCommSib + * Functionality: + * Free PUCCH configuration common * - * @params[in] : UplinkConfigCommonSIB_t *ulCfg + * @params[in] Pointer to struct BWP_UplinkCommon__pucch_ConfigCommon + * @return void * - * @return : void + * ****************************************************************/ +void FreePucchCfgCommon( struct BWP_UplinkCommon__pucch_ConfigCommon *pucchCfg) +{ + PUCCH_ConfigCommon_t *setup; + + if(pucchCfg->choice.setup) + { + setup = pucchCfg->choice.setup; + + /* Resource Common */ + DU_FREE(setup->pucch_ResourceCommon, sizeof(long)); + + /* P0 nominal */ + DU_FREE(setup->p0_nominal, sizeof(long)); + + DU_FREE(pucchCfg->choice.setup, sizeof(PUCCH_ConfigCommon_t)); + } +}/* FreePucchCfgCommon */ + +/******************************************************************* * - *******************************************************************/ -void FreeUlCfgCommSib(UplinkConfigCommonSIB_t *ulCfg) + * @brief Free PUSCH configuration for common + * + * @details + * + * Function : FreePuschCfgCommon + * + * Functionality: + * Free PUSCH configuration for common + * + * @params[in] Pointer to struct BWP_UplinkCommon__pusch_ConfigCommon *puschCfg + * @return void + * + * ****************************************************************/ +void FreePuschCfgCommon(struct BWP_UplinkCommon__pusch_ConfigCommon *puschCfg) { - uint8_t idx=0; - RACH_ConfigCommon_t *setup; - BWP_UplinkCommon_t *bwp=&ulCfg->initialUplinkBWP; - struct FrequencyInfoUL_SIB__scs_SpecificCarrierList *scsCarrierList; - struct BWP_UplinkCommon__rach_ConfigCommon *rachCfg; - struct BWP_UplinkCommon__pucch_ConfigCommon *pucchCfg; - struct BWP_UplinkCommon__pusch_ConfigCommon *puschCfg; - puschCfg=ulCfg->initialUplinkBWP.pusch_ConfigCommon; - rachCfg =bwp->rach_ConfigCommon; - scsCarrierList = &ulCfg->frequencyInfoUL.scs_SpecificCarrierList; + uint8_t idx = 0; + PUSCH_ConfigCommon_t *setup = NULLP; + PUSCH_TimeDomainResourceAllocation_t *timeDomRsrcAllocInfo = NULLP; - if(!scsCarrierList->list.array) + if(puschCfg->choice.setup) { - if(!ulCfg->frequencyInfoUL.p_Max) + setup = puschCfg->choice.setup; + + /* Time Domain Resource Allocation List */ + if(setup->pusch_TimeDomainAllocationList) { - if(FreqInfoUlret == ROK) - { - if(!bwp->rach_ConfigCommon) - { - if(RachCfgCommonret== ROK) - { - if(!bwp->pusch_ConfigCommon) - { - - if(PuschCfgCommonret==ROK) - { - if(!bwp->pucch_ConfigCommon) - { - pucchCfg=bwp->pucch_ConfigCommon; - switch(pucchCfg->present) - { - case BWP_UplinkCommon__pucch_ConfigCommon_PR_NOTHING: - break; - case BWP_UplinkCommon__pucch_ConfigCommon_PR_release: - break; - case BWP_UplinkCommon__pucch_ConfigCommon_PR_setup: - { - if(!pucchCfg->choice.setup) - { - - if(!pucchCfg->choice.setup->pucch_ResourceCommon) - { - if(!pucchCfg->choice.setup->p0_nominal) - { - DU_FREE(pucchCfg->choice.setup->p0_nominal, - sizeof(long)); - } - DU_FREE(pucchCfg->choice.setup->pucch_ResourceCommon, - sizeof(long)); - } - DU_FREE(pucchCfg->choice.setup, - sizeof(PUCCH_ConfigCommon_t)); - } - } - default: - break; - } - DU_FREE(bwp->pucch_ConfigCommon,\ - sizeof(struct BWP_UplinkCommon__pucch_ConfigCommon)); - } - } - switch(puschCfg->present) - { - case BWP_UplinkCommon__pusch_ConfigCommon_PR_NOTHING: - break; - case BWP_UplinkCommon__pusch_ConfigCommon_PR_release: - break; - case BWP_UplinkCommon__pusch_ConfigCommon_PR_setup: - { - if(!puschCfg->choice.setup) - { - - if(! puschCfg->choice.setup->pusch_TimeDomainAllocationList) - { - if(! puschCfg->choice.setup->pusch_TimeDomainAllocationList->list.array) - { - if(!puschCfg->choice.setup->pusch_TimeDomainAllocationList->list.array[idx]) - { - if(!puschCfg->choice.setup->pusch_TimeDomainAllocationList->list.array[idx]->k2) - { - if(! puschCfg->choice.setup->msg3_DeltaPreamble) - { - if(!puschCfg->choice.setup->p0_NominalWithGrant) - { - DU_FREE(puschCfg->choice.setup->p0_NominalWithGrant, - sizeof(long)); - } - DU_FREE(puschCfg->choice.setup->msg3_DeltaPreamble, - sizeof(long)); - } - DU_FREE(puschCfg->choice.setup->pusch_TimeDomainAllocationList->list.\ - array[idx]->k2, sizeof(long)); - } - } - for(idx=0; - idxchoice.setup->pusch_TimeDomainAllocationList->list.count; - idx++) - { - if(!puschCfg->choice.setup->pusch_TimeDomainAllocationList->list.array[idx]) - { - DU_FREE(puschCfg->choice.setup->pusch_TimeDomainAllocationList->list.array[idx],\ - sizeof(PUSCH_TimeDomainResourceAllocation_t)); - } - } - DU_FREE(puschCfg->choice.setup->pusch_TimeDomainAllocationList->list.array,\ - puschCfg->choice.setup->pusch_TimeDomainAllocationList->list.size); - } - DU_FREE(puschCfg->choice.setup->pusch_TimeDomainAllocationList,\ - sizeof(PUSCH_TimeDomainResourceAllocationList_t)); - } - DU_FREE(puschCfg->choice.setup, - sizeof(PUSCH_ConfigCommon_t)); - } - } - default : - break; - } - - DU_FREE(bwp->pusch_ConfigCommon,\ - sizeof(struct BWP_UplinkCommon__pusch_ConfigCommon)); - } - } - switch(rachCfg->present) - { - case BWP_UplinkCommon__rach_ConfigCommon_PR_NOTHING: - break; - case BWP_UplinkCommon__rach_ConfigCommon_PR_release: - break; - case BWP_UplinkCommon__rach_ConfigCommon_PR_setup: - { - if(!rachCfg->choice.setup) - { - setup = rachCfg->choice.setup; - if(!setup->totalNumberOfRA_Preambles) - { - if(!setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB) - { - if(!setup->rsrp_ThresholdSSB) - { - if(!setup->msg1_SubcarrierSpacing) - { - DU_FREE(setup->msg1_SubcarrierSpacing, - sizeof(SubcarrierSpacing_t)); - } - DU_FREE(setup->rsrp_ThresholdSSB, - sizeof(RSRP_Range_t)); - } - DU_FREE(setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB,\ - sizeof(struct - RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB)); - } - DU_FREE(setup->totalNumberOfRA_Preambles, - sizeof(long)); - } - - DU_FREE(rachCfg->choice.setup, - sizeof(RACH_ConfigCommon_t)); - } - } - default: - break; - } - DU_FREE(bwp->rach_ConfigCommon,\ - sizeof(struct BWP_UplinkCommon__rach_ConfigCommon)); - } - } - DU_FREE(ulCfg->frequencyInfoUL.p_Max, sizeof(P_Max_t)); - } + if(setup->pusch_TimeDomainAllocationList->list.array) + { + for(idx=0; idx < setup->pusch_TimeDomainAllocationList->list.count; idx++) + { + if(setup->pusch_TimeDomainAllocationList->list.array[idx]) + { + timeDomRsrcAllocInfo = setup->pusch_TimeDomainAllocationList->list.array[idx]; + + /* K2 */ + DU_FREE(timeDomRsrcAllocInfo->k2, sizeof(long)); + DU_FREE(setup->pusch_TimeDomainAllocationList->list.array[idx],\ + sizeof(PUSCH_TimeDomainResourceAllocation_t)); + } + } + DU_FREE(setup->pusch_TimeDomainAllocationList->list.array, setup->pusch_TimeDomainAllocationList->list.size); + } + DU_FREE(setup->pusch_TimeDomainAllocationList, sizeof(PUSCH_TimeDomainResourceAllocationList_t)); + } + + /* Msg3 Delta Preamble */ + DU_FREE(setup->msg3_DeltaPreamble, sizeof(long)); + + /* P0 Nominal with grant */ + DU_FREE(setup->p0_NominalWithGrant, sizeof(long)); + + DU_FREE(puschCfg->choice.setup, sizeof(PUSCH_ConfigCommon_t)); + } +}/* BuildPuschCfgCommon */ + +/******************************************************************* + * + * @brief Free RACH configuration common + * + * @details + * + * Function : FreeRachCfgCommon + * + * Functionality: + * Free RACH configuration common + * + * @params[in] BWP_UplinkCommon__rach_ConfigCommon pointer + * @return void + * + * ****************************************************************/ + +void FreeRachCfgCommon(struct BWP_UplinkCommon__rach_ConfigCommon *rachCfg) +{ + RACH_ConfigCommon_t *setup = NULLP; + + if(rachCfg->choice.setup) + { + setup = rachCfg->choice.setup; + + /* Total number of RA preambles */ + DU_FREE(setup->totalNumberOfRA_Preambles, sizeof(long)); + + /* SSB per RACH occassion and CB Preambles per SSB */ + DU_FREE(setup->ssb_perRACH_OccasionAndCB_PreamblesPerSSB,\ + sizeof(struct RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB)); + + /* RSRP Threshold SSB */ + DU_FREE(setup->rsrp_ThresholdSSB, sizeof(RSRP_Range_t)); + + /* Msg 1 Subcarrier spacing */ + DU_FREE(setup->msg1_SubcarrierSpacing, sizeof(SubcarrierSpacing_t)); + + DU_FREE(rachCfg->choice.setup, sizeof(RACH_ConfigCommon_t)); + } +}/* FreeRachCfgCommon */ + +/******************************************************************* + * + * @brief Free UL BWP Common + * + * @details + * + * Function : FreeBwpUlCommon + * + * Functionality: + * Free UL BWP Common + * + * @params[in] BWP_UplinkCommon_t pointer + * @return void + * + * ****************************************************************/ +void FreeBwpUlCommon(BWP_UplinkCommon_t *bwp) +{ + /* RACH Config Common */ + if(bwp->rach_ConfigCommon) + { + FreeRachCfgCommon(bwp->rach_ConfigCommon); + DU_FREE(bwp->rach_ConfigCommon, sizeof(struct BWP_UplinkCommon__rach_ConfigCommon)); + } + + /* PUSCH Config Common */ + if(bwp->pusch_ConfigCommon) + { + FreePuschCfgCommon(bwp->pusch_ConfigCommon); + DU_FREE(bwp->pusch_ConfigCommon, sizeof(struct BWP_UplinkCommon__pusch_ConfigCommon)); + } + + /* PUCCH Config Common */ + if(bwp->pucch_ConfigCommon) + { + FreePucchCfgCommon(bwp->pucch_ConfigCommon); + DU_FREE(bwp->pucch_ConfigCommon, sizeof(struct BWP_UplinkCommon__pucch_ConfigCommon)); + } +}/* FreeBwpUlCommon */ + +/******************************************************************* + * + * @brief Free frequency infor for UL + * + * @details + * + * Function : FreeFreqInfoUlSib + * + * Functionality: + * Free frequency infor for UL + * + * @params[in] FrequencyInfoUL_SIB_t pointer + * @return void + * + * ****************************************************************/ + +void FreeFreqInfoUlSib(FrequencyInfoUL_SIB_t *frequencyInfoUL) +{ + uint8_t idx = 0; + struct FrequencyInfoUL_SIB__scs_SpecificCarrierList *scsCarrierList = &frequencyInfoUL->scs_SpecificCarrierList; + + /* Subcarrier Spacing specifc carrier */ + if(scsCarrierList->list.array) + { for(idx = 0; idx < scsCarrierList->list.count; idx++) { - if(!scsCarrierList->list.array[idx]) - { - DU_FREE(scsCarrierList->list.array[idx], - sizeof(SCS_SpecificCarrier_t)); - } + DU_FREE(scsCarrierList->list.array[idx], sizeof(SCS_SpecificCarrier_t)); } DU_FREE(scsCarrierList->list.array, scsCarrierList->list.size); } -} + + /* P-MAX */ + DU_FREE(frequencyInfoUL->p_Max, sizeof(P_Max_t)); +}/* FreeFreqInfoUlSib */ + /******************************************************************* * * @brief : Deallocating memory of SIB1 message @@ -2854,40 +3008,32 @@ void FreeUlCfgCommSib(UplinkConfigCommonSIB_t *ulCfg) *******************************************************************/ void FreeServCellCfgCommonSib(ServingCellConfigCommonSIB_t *srvCellCfg) { - BIT_STRING_t *ssbPosInBurst; + BIT_STRING_t *ssbPosInBurst = NULLP; + DownlinkConfigCommonSIB_t *dlCfg = NULLP; + UplinkConfigCommonSIB_t *ulCfg = NULLP; + + /* SSB Position in Burst buffer */ ssbPosInBurst = &srvCellCfg->ssb_PositionsInBurst.inOneGroup; - DownlinkConfigCommonSIB_t *dlCfg=&srvCellCfg->downlinkConfigCommon; + DU_FREE(ssbPosInBurst->buf, ssbPosInBurst->size * sizeof(uint8_t)); - if(!ssbPosInBurst->buf) + /* Free Donwlink config common SIB */ + dlCfg = &srvCellCfg->downlinkConfigCommon; + FreeFreqInfoDlSib(&dlCfg->frequencyInfoDL); + FreeBwpDlCommon(&dlCfg->initialDownlinkBWP); + + /* Uplink Config Comm */ + if(srvCellCfg->uplinkConfigCommon) { - /* Free DL frequency info */ - if(FreqInfoDlret == ROK) - { - if(DlCfgCommSibret == ROK) - { - /* Uplink Config Comm */ - if(!srvCellCfg->uplinkConfigCommon) - { - if(UlCfgCommSibret==ROK) - { - /* TDD UL DL Config Comm */ - if(!srvCellCfg->tdd_UL_DL_ConfigurationCommon) - { - DU_FREE(srvCellCfg->tdd_UL_DL_ConfigurationCommon, - sizeof(TDD_UL_DL_ConfigCommon_t)); - } - } - FreeUlCfgCommSib(srvCellCfg->uplinkConfigCommon); - DU_FREE(srvCellCfg->uplinkConfigCommon, - sizeof(UplinkConfigCommonSIB_t)); - } - } - FreeBwpDlCommon(&dlCfg->initialDownlinkBWP); - } - FreeFreqInfoDl(&dlCfg->frequencyInfoDL); - DU_FREE(ssbPosInBurst->buf, ssbPosInBurst->size * sizeof(uint8_t)); + ulCfg = srvCellCfg->uplinkConfigCommon; + FreeFreqInfoUlSib(&ulCfg->frequencyInfoUL); + FreeBwpUlCommon(&ulCfg->initialUplinkBWP); + DU_FREE(srvCellCfg->uplinkConfigCommon, sizeof(UplinkConfigCommonSIB_t)); } + + /* TDD UL DL Config Comm */ + DU_FREE(srvCellCfg->tdd_UL_DL_ConfigurationCommon, sizeof(TDD_UL_DL_ConfigCommon_t)); } + /******************************************************************* * * @brief : Deallcating memory of the function BuildSib1Msg @@ -2906,8 +3052,9 @@ void FreeSib1Msg(SIB1_t *sib1Msg) { uint8_t idx=0; uint8_t idx1=0; - uint8_t idx2=0; + uint8_t idx2=0, arrIdx =0, sibMapInfoIdx=0; CellIdentity_t *cellIdentity = NULLP; + SchedulingInfo_t *schedInfo; CellAccessRelatedInfo_t *cellAccessInfo ; struct PLMN_IdentityInfo__plmn_IdentityList *plmnIdInfo; @@ -2917,121 +3064,141 @@ void FreeSib1Msg(SIB1_t *sib1Msg) cellAccessInfo = &sib1Msg->cellAccessRelatedInfo; if(cellAccessInfo->plmn_IdentityList.list.array !=NULLP) { - if(cellAccessInfo->plmn_IdentityList.list.array[idx]!=NULLP) - { - plmnIdInfo = - &cellAccessInfo->plmn_IdentityList.list.array[idx]->plmn_IdentityList; - - if(plmnIdInfo->list.array !=NULLP) - { - if(!plmnIdInfo->list.array[idx]) - { - if(!plmnIdInfo->list.array[idx]->mcc) - { - if(!(plmnIdInfo->list.array[idx]->mcc->list.array)) - { - if(!plmnIdInfo->list.array[idx]->mnc.list.array) - { - /*Free Tracking Area Code */ - if(!cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode) - { - /*Free RANAC */ - if(!cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode->buf) - { - /* Free CellIdentity */ - if(!cellAccessInfo->plmn_IdentityList.list.array[idx]->ranac) - { - cellIdentity - =&cellAccessInfo->plmn_IdentityList.\ - list.array[idx]->cellIdentity; - if(!cellIdentity->buf) - { - /*Free Connection Establish Failure Control */ - if(!sib1Msg->connEstFailureControl) - { - /*Free Serving Cell Config Common */ - if(!sib1Msg->si_SchedulingInfo) - { - /* Free Serving Cell Config Common* */ - if(!sib1Msg->servingCellConfigCommon) - { - /*Free BuildServCellCfgCommonSib*/ - FreeServCellCfgCommonSib(\ - sib1Msg->servingCellConfigCommon); - - DU_FREE(sib1Msg->servingCellConfigCommon, - sizeof(ServingCellConfigCommonSIB_t)); - } - - DU_FREE(sib1Msg->si_SchedulingInfo, - sizeof(SI_SchedulingInfo_t)); - } - - DU_FREE(sib1Msg->connEstFailureControl, - sizeof(ConnEstFailureControl_t)); - } - DU_FREE(cellIdentity->buf,cellIdentity->size); - - } - DU_FREE(cellAccessInfo->plmn_IdentityList.list.array[idx]->ranac, sizeof(RAN_AreaCode_t)); - - } - DU_FREE(cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode->buf,\ - cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode->size); - - } - DU_FREE(cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode\ - , sizeof(TrackingAreaCode_t)); - } - - for(idx2=0; idx2list.array[idx1]->mnc.list.count; idx2++) - { - if(!plmnIdInfo->list.array[idx2]->mnc.list.array[idx2]) - { - DU_FREE(plmnIdInfo->list.array[idx2]->mnc.list.array[idx2], - sizeof(MCC_MNC_Digit_t)); - } - } - DU_FREE(plmnIdInfo->list.array[idx]->mnc.list.array, - plmnIdInfo->list.array[idx1]->mnc.list.size); - } - - for(idx1=0; idx1list.array[idx]->mcc->list.count; idx1++) - { - if(plmnIdInfo->list.array[idx]->mcc->list.array[idx1]!=NULLP) - { - DU_FREE(plmnIdInfo->list.array[idx]->mcc->list.array[idx1],\ - sizeof(MCC_MNC_Digit_t)); - } - - } - DU_FREE(plmnIdInfo->list.array[idx]->mcc->list.array,\ - plmnIdInfo->list.array[idx]->mcc->list.size) - } - DU_FREE(plmnIdInfo->list.array[idx]->mcc,sizeof(MCC_t)); - } - } - for(idx1=0; idx1list.count; idx1++) - { - if(!(plmnIdInfo->list.array[idx1])) - { - DU_FREE(plmnIdInfo->list.array[idx1], - sizeof(PLMN_IdentitY_t)); - } - } - DU_FREE(plmnIdInfo->list.array, plmnIdInfo->list.size); - } - } - for(idx=0; idxplmn_IdentityList.list.count; idx++) - { - if(cellAccessInfo->plmn_IdentityList.list.array[idx]!=NULLP) - { - DU_FREE(cellAccessInfo->plmn_IdentityList.list.array[idx], - sizeof(PLMN_IdentityInfo_t)); - } - } - DU_FREE(cellAccessInfo->plmn_IdentityList.list.array, - cellAccessInfo->plmn_IdentityList.list.size); + if(cellAccessInfo->plmn_IdentityList.list.array[idx]!=NULLP) + { + plmnIdInfo = + &cellAccessInfo->plmn_IdentityList.list.array[idx]->plmn_IdentityList; + + if(plmnIdInfo->list.array !=NULLP) + { + if(plmnIdInfo->list.array[idx]) + { + if(plmnIdInfo->list.array[idx]->mcc) + { + if((plmnIdInfo->list.array[idx]->mcc->list.array)) + { + if(plmnIdInfo->list.array[idx]->mnc.list.array) + { + /*Free Tracking Area Code */ + if(cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode) + { + /*Free RANAC */ + if(cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode->buf) + { + /* Free CellIdentity */ + if(cellAccessInfo->plmn_IdentityList.list.array[idx]->ranac) + { + cellIdentity + =&cellAccessInfo->plmn_IdentityList.\ + list.array[idx]->cellIdentity; + if(cellIdentity->buf) + { + /*Free Connection Establish Failure Control */ + if(sib1Msg->connEstFailureControl) + { + /*Free Serving Cell Config Common */ + if(sib1Msg->si_SchedulingInfo) + { + /* Free Serving Cell Config Common* */ + if(sib1Msg->servingCellConfigCommon) + { + /*Free BuildServCellCfgCommonSib*/ + FreeServCellCfgCommonSib(\ + sib1Msg->servingCellConfigCommon); + + DU_FREE(sib1Msg->servingCellConfigCommon, + sizeof(ServingCellConfigCommonSIB_t)); + } + //TODO PBORLA + if(sib1Msg->si_SchedulingInfo->schedulingInfoList.list.array) + { + for(arrIdx = 0; arrIdx < sib1Msg->si_SchedulingInfo->schedulingInfoList.list.count; arrIdx++) + { + schedInfo = sib1Msg->si_SchedulingInfo->schedulingInfoList.list.array[arrIdx]; + if(schedInfo->sib_MappingInfo.list.array) + { + for(sibMapInfoIdx = 0; sibMapInfoIdx< schedInfo->sib_MappingInfo.list.count; sibMapInfoIdx++) + { + DU_FREE(schedInfo->sib_MappingInfo.list.array[sibMapInfoIdx]->valueTag, sizeof(long)); + DU_FREE(schedInfo->sib_MappingInfo.list.array[sibMapInfoIdx], sizeof(SIB_TypeInfo_t)); + } + DU_FREE(schedInfo->sib_MappingInfo.list.array, schedInfo->sib_MappingInfo.list.size) + } + DU_FREE(sib1Msg->si_SchedulingInfo->schedulingInfoList.list.array[arrIdx], sizeof(struct SchedulingInfo)); + } + DU_FREE(sib1Msg->si_SchedulingInfo->schedulingInfoList.list.array,\ + sib1Msg->si_SchedulingInfo->schedulingInfoList.list.size); + } + + DU_FREE(sib1Msg->si_SchedulingInfo, + sizeof(SI_SchedulingInfo_t)); + } + + DU_FREE(sib1Msg->connEstFailureControl, + sizeof(ConnEstFailureControl_t)); + } + DU_FREE(cellIdentity->buf,cellIdentity->size); + + } + DU_FREE(cellAccessInfo->plmn_IdentityList.list.array[idx]->ranac, sizeof(RAN_AreaCode_t)); + + } + DU_FREE(cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode->buf,\ + cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode->size); + + } + DU_FREE(cellAccessInfo->plmn_IdentityList.list.array[idx]->trackingAreaCode\ + , sizeof(TrackingAreaCode_t)); + } + + for(idx2=0; idx2list.array[idx1]->mnc.list.count; idx2++) + { + if(plmnIdInfo->list.array[idx1]->mnc.list.array[idx2]) + { + DU_FREE(plmnIdInfo->list.array[idx1]->mnc.list.array[idx2], + sizeof(MCC_MNC_Digit_t)); + } + } + DU_FREE(plmnIdInfo->list.array[idx]->mnc.list.array, + plmnIdInfo->list.array[idx1]->mnc.list.size); + } + + for(idx1=0; idx1list.array[idx]->mcc->list.count; idx1++) + { + if(plmnIdInfo->list.array[idx]->mcc->list.array[idx1]!=NULLP) + { + DU_FREE(plmnIdInfo->list.array[idx]->mcc->list.array[idx1],\ + sizeof(MCC_MNC_Digit_t)); + } + + } + DU_FREE(plmnIdInfo->list.array[idx]->mcc->list.array,\ + plmnIdInfo->list.array[idx]->mcc->list.size) + } + DU_FREE(plmnIdInfo->list.array[idx]->mcc,sizeof(MCC_t)); + } + } + for(idx1=0; idx1list.count; idx1++) + { + if((plmnIdInfo->list.array[idx1])) + { + DU_FREE(plmnIdInfo->list.array[idx1], + sizeof(PLMN_IdentitY_t)); + } + } + DU_FREE(plmnIdInfo->list.array, plmnIdInfo->list.size); + } + } + for(idx=0; idxplmn_IdentityList.list.count; idx++) + { + if(cellAccessInfo->plmn_IdentityList.list.array[idx]!=NULLP) + { + DU_FREE(cellAccessInfo->plmn_IdentityList.list.array[idx], + sizeof(PLMN_IdentityInfo_t)); + } + } + DU_FREE(cellAccessInfo->plmn_IdentityList.list.array, + cellAccessInfo->plmn_IdentityList.list.size); } DU_FREE(sib1Msg, sizeof(SIB1_t)); }