X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_msg_hdl.c;h=7e015afee1effc76afe8983e7e7ee470ed8088a6;hb=531da47c7bfb6ce138a454f66eb184729860beef;hp=7966445a40ac5fe2a0a6cf17f33ccfcd935ea574;hpb=14136d98405a2fb8d8c078b755efb63b95cdc7a3;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index 7966445a4..7e015afee 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -32,48 +32,12 @@ #include "lwr_mac_upr_inf.h" #include "mac.h" #include "mac_utils.h" +#include "mac_harq_dl.h" /* This file contains message handling functionality for MAC */ MacCb macCb; -uint16_t buildMacPdu(RlcData *dlData); -#ifdef EGTP_TEST -void macStubBuildUlData(Buffer *mBuf); -#endif - -/* Function pointer for sending crc ind from MAC to SCH */ -MacSchCrcIndFunc macSchCrcIndOpts[]= -{ - packMacSchCrcInd, - MacSchCrcInd, - packMacSchCrcInd -}; - -/* Function pointer for sending DL RLC BO Info from MAC to SCH */ -MacSchDlRlcBoInfoFunc macSchDlRlcBoInfoOpts[]= -{ - packMacSchDlRlcBoInfo, - MacSchDlRlcBoInfo, - packMacSchDlRlcBoInfo -}; - -/* Function pointer for sending short BSR from MAC to SCH */ -MacSchBsrFunc macSchBsrOpts[]= -{ - packMacSchBsr, - MacSchBsr, - packMacSchBsr -}; - -/* Function pointer for sending SR Uci ind from MAC to SCH */ -MacSchSrUciIndFunc macSchSrUciIndOpts[]= -{ - packMacSchSrUciInd, - MacSchSrUciInd, - packMacSchSrUciInd -}; - /******************************************************************* * * @brief Sends DL BO Info to SCH @@ -95,7 +59,7 @@ uint8_t sendDlRlcBoInfoToSch(DlRlcBoInfo *dlBoInfo) Pst pst; FILL_PST_MAC_TO_SCH(pst, EVENT_DL_RLC_BO_INFO_TO_SCH); - return(*macSchDlRlcBoInfoOpts[pst.selector])(&pst, dlBoInfo); + return(SchMessageRouter(&pst, (void *)dlBoInfo)); } /******************************************************************* @@ -119,7 +83,7 @@ uint8_t sendCrcIndMacToSch(CrcIndInfo *crcInd) Pst pst; FILL_PST_MAC_TO_SCH(pst, EVENT_CRC_IND_TO_SCH); - return(*macSchCrcIndOpts[pst.selector])(&pst, crcInd); + return(SchMessageRouter(&pst, (void *)crcInd)); } /******************************************************************* @@ -176,14 +140,26 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) * ****************************************************************/ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) { - uint16_t pduIdx; + uint8_t ueId = 0; + uint16_t pduIdx, cellIdx = 0; DU_LOG("\nDEBUG --> MAC : Received Rx Data indication"); /* TODO : compare the handle received in RxDataInd with handle send in PUSCH * PDU, which is stored in raCb */ for(pduIdx = 0; pduIdx < rxDataInd->numPdus; pduIdx++) { - unpackRxData(rxDataInd->cellId, rxDataInd->timingInfo, &rxDataInd->pdus[pduIdx]); + + GET_CELL_IDX(rxDataInd->cellId, cellIdx); + GET_UE_ID(rxDataInd->pdus[pduIdx].rnti, ueId); + + if(macCb.macCell[cellIdx] && macCb.macCell[cellIdx]->ueCb[ueId -1].transmissionAction == STOP_TRANSMISSION) + { + DU_LOG("\nINFO --> MAC : UL data transmission not allowed for UE %d", macCb.macCell[cellIdx]->ueCb[ueId -1].ueId); + } + else + { + unpackRxData(rxDataInd->cellId, rxDataInd->timingInfo, &rxDataInd->pdus[pduIdx]); + } MAC_FREE_SHRABL_BUF(pst->region, pst->pool, rxDataInd->pdus[pduIdx].pduData,\ rxDataInd->pdus[pduIdx].pduLength); } @@ -208,20 +184,26 @@ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) * RFAILED - failure * * ****************************************************************/ -uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) +uint8_t MacProcRlcDlData(Pst* pstInfo, RlcDlData *dlData) { - uint8_t pduIdx =0; - uint8_t lcIdx = 0; - uint8_t *txPdu =NULLP; - uint16_t tbSize =0; - MacDlData macDlData; - MacDlSlot *currDlSlot = NULLP; - DlRlcBoInfo dlBoInfo; - + uint8_t pduIdx = 0; + uint8_t ueId = 0; + uint8_t lcIdx = 0; + uint8_t *txPdu = NULLP; + uint8_t schInfoIdx = 0 ; + uint16_t cellIdx = 0, txPduLen = 0; + MacDlData macDlData; + MacDlSlot *currDlSlot = NULLP; + DlRlcBoInfo dlBoInfo; + memset(&macDlData , 0, sizeof(MacDlData)); DU_LOG("\nDEBUG --> MAC: Received DL data for sfn=%d slot=%d numPdu= %d", \ dlData->slotInfo.sfn, dlData->slotInfo.slot, dlData->numPdu); + + GET_UE_ID(dlData->rnti, ueId); + /* Copy the pdus to be muxed into mac Dl data */ + macDlData.ueId = ueId; macDlData.numPdu = dlData->numPdu; for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) { @@ -230,24 +212,39 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) macDlData.pduInfo[pduIdx].dlPdu = dlData->pduInfo[pduIdx].pduBuf; } + GET_CELL_IDX(dlData->cellId, cellIdx); /* Store DL data in the scheduled slot */ - currDlSlot = &macCb.macCell[dlData->cellId -1]->dlSlot[dlData->slotInfo.slot]; - if(currDlSlot) + if(macCb.macCell[cellIdx] ==NULLP) + { + DU_LOG("\nERROR --> MAC : MacProcRlcDlData(): macCell does not exists"); + return RFAILED; + } + currDlSlot = &macCb.macCell[cellIdx]->dlSlot[dlData->slotInfo.slot]; + if(currDlSlot->dlInfo.dlMsgAlloc[ueId-1]) { - if(currDlSlot->dlInfo.dlMsgAlloc) + for(schInfoIdx=0; schInfoIdxdlInfo.dlMsgAlloc[ueId-1]->numSchedInfo; schInfoIdx++) { - tbSize = currDlSlot->dlInfo.dlMsgAlloc->dlMsgPdschCfg.codeword[0].tbSize; - MAC_ALLOC(txPdu, tbSize); - if(!txPdu) - { - DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcRlcDlData"); - return RFAILED; - } - macMuxPdu(&macDlData, NULLP, txPdu, tbSize); + if((currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].pduPres == PDSCH_PDU) || + (currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].pduPres == BOTH)) + break; + } - currDlSlot->dlInfo.dlMsgAlloc->dlMsgInfo.dlMsgPduLen = tbSize; - currDlSlot->dlInfo.dlMsgAlloc->dlMsgInfo.dlMsgPdu = txPdu; + txPduLen = currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgPdschCfg.codeword[0].tbSize\ + - TX_PAYLOAD_HDR_LEN; + MAC_ALLOC(txPdu, txPduLen); + if(!txPdu) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcRlcDlData"); + return RFAILED; } + macMuxPdu(&macDlData, NULLP, txPdu, txPduLen); + + currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.dlMsgPduLen = txPduLen; + currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.dlMsgPdu = txPdu; + /* Add muxed TB to DL HARQ Proc CB. This will be used if retranmission of + * TB is requested in future. */ + updateNewTbInDlHqProcCb(dlData->slotInfo, &macCb.macCell[cellIdx]->ueCb[ueId -1], \ + currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgPdschCfg.codeword[0].tbSize, txPdu); } for(lcIdx = 0; lcIdx < dlData->numLc; lcIdx++) @@ -256,7 +253,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) { memset(&dlBoInfo, 0, sizeof(DlRlcBoInfo)); dlBoInfo.cellId = dlData->boStatus[lcIdx].cellId; - GET_CRNTI(dlBoInfo.crnti, dlData->boStatus[lcIdx].ueIdx); + GET_CRNTI(dlBoInfo.crnti, dlData->boStatus[lcIdx].ueId); dlBoInfo.lcId = dlData->boStatus[lcIdx].lcId; dlBoInfo.dataVolume = dlData->boStatus[lcIdx].bo; sendDlRlcBoInfoToSch(&dlBoInfo); @@ -267,13 +264,12 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) { MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData->pduInfo[pduIdx].pduBuf,\ - dlData->pduInfo[pduIdx].pduLen); + dlData->pduInfo[pduIdx].pduLen); } if(pstInfo->selector == ODU_SELECTOR_LWLC) { - MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData, sizeof(RlcData)); + MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData, sizeof(RlcDlData)); } - return ROK; } @@ -297,30 +293,26 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) * RFAILED - failure * * ****************************************************************/ -uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotIndInfo slotInfo, \ +uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotTimingInfo slotInfo, \ uint8_t lcId, uint16_t pduLen, uint8_t *pdu) { Pst pst; - RlcData *ulData; + RlcUlData *ulData; /* Filling RLC Ul Data*/ - MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcData)); + MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcUlData)); if(!ulData) { DU_LOG("\nERROR --> MAC : Memory allocation failed while sending UL data to RLC"); return RFAILED; } - memset(ulData, 0, sizeof(RlcData)); + memset(ulData, 0, sizeof(RlcUlData)); ulData->cellId = cellId; ulData->rnti = rnti; - memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotIndInfo)); + memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotTimingInfo)); ulData->slotInfo.cellId = cellId; /* Filling pdu info */ - if(lcId == SRB1_LCID || lcId == SRB2_LCID) - { - ulData->pduInfo[ulData->numPdu].commCh = true; - } ulData->pduInfo[ulData->numPdu].lcId = lcId; ulData->pduInfo[ulData->numPdu].pduBuf = pdu; ulData->pduInfo[ulData->numPdu].pduLen = pduLen; @@ -357,10 +349,10 @@ uint8_t MacProcRlcBoStatus(Pst* pst, RlcBoStatus* boStatus) DlRlcBoInfo dlBoInfo; dlBoInfo.cellId = boStatus->cellId; - GET_CRNTI(dlBoInfo.crnti, boStatus->ueIdx); + GET_CRNTI(dlBoInfo.crnti, boStatus->ueId); dlBoInfo.lcId = boStatus->lcId; dlBoInfo.dataVolume = boStatus->bo; - + sendDlRlcBoInfoToSch(&dlBoInfo); if(pst->selector == ODU_SELECTOR_LWLC) @@ -386,7 +378,7 @@ uint8_t MacProcRlcBoStatus(Pst* pst, RlcBoStatus* boStatus) * RFAILED - failure * * ****************************************************************/ -uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) +uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo, uint8_t ueIdx, uint8_t schInfoIdx) { Pst pst; uint8_t lcIdx; @@ -401,16 +393,18 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) DU_LOG("\nDEBUG --> MAC: Send scheduled result report for sfn %d slot %d", slotInfo.sfn, slotInfo.slot); schedRpt->cellId = dlInfo.cellId; - schedRpt->rnti = dlInfo.dlMsgAlloc->crnti; - schedRpt->numLc = dlInfo.dlMsgAlloc->numLc; schedRpt->slotInfo.sfn = slotInfo.sfn; schedRpt->slotInfo.slot = slotInfo.slot; - for(lcIdx = 0; lcIdx < schedRpt->numLc; lcIdx++) + if(dlInfo.dlMsgAlloc[ueIdx]) { - schedRpt->lcSch[lcIdx].lcId = dlInfo.dlMsgAlloc->lcSchInfo[lcIdx].lcId; - schedRpt->lcSch[lcIdx].bufSize = dlInfo.dlMsgAlloc->lcSchInfo[lcIdx].schBytes; - schedRpt->lcSch[lcIdx].commCh = false; + schedRpt->rnti = dlInfo.dlMsgAlloc[ueIdx]->crnti; + schedRpt->numLc = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].numLc; + for(lcIdx = 0; lcIdx < schedRpt->numLc; lcIdx++) + { + schedRpt->lcSch[lcIdx].lcId = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].lcSchInfo[lcIdx].lcId; + schedRpt->lcSch[lcIdx].bufSize = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].lcSchInfo[lcIdx].schBytes; + } } /* Fill Pst */ @@ -442,14 +436,14 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) * RFAILED - failure * * ****************************************************************/ -uint8_t MacProcCellStart(Pst *pst, OduCellId *cellId) +uint8_t MacProcCellStart(Pst *pst, CellStartInfo *cellStart) { DU_LOG("\nINFO --> MAC : Handling cell start request"); gSlotCount = 0; - sendToLowerMac(START_REQUEST, 0, cellId); + sendToLowerMac(START_REQUEST, 0, cellStart); - MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, \ - sizeof(OduCellId)); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStart, \ + sizeof(CellStartInfo)); return ROK; } @@ -471,22 +465,21 @@ uint8_t MacProcCellStart(Pst *pst, OduCellId *cellId) * RFAILED - failure * * ****************************************************************/ -uint8_t MacProcCellStop(Pst *pst, OduCellId *cellId) +uint8_t MacProcCellStop(Pst *pst, CellStopInfo *cellStop) { #ifdef INTEL_FAPI uint16_t cellIdx; - SlotIndInfo slotInfo; DU_LOG("\nINFO --> MAC : Sending cell stop request to Lower Mac"); - GET_CELL_IDX(cellId->cellId, cellIdx); - slotInfo.cellId = cellId->cellId; - slotInfo.sfn = macCb.macCell[cellIdx]->currTime.sfn; - slotInfo.slot = macCb.macCell[cellIdx]->currTime.slot; - sendToLowerMac(FAPI_STOP_REQUEST, 0, &slotInfo); + GET_CELL_IDX(cellStop->cellId, cellIdx); + if(macCb.macCell[cellIdx]) + { + macCb.macCell[cellIdx]->state = CELL_TO_BE_STOPPED; + } #endif - MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, \ - sizeof(OduCellId)); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStop, \ + sizeof(CellStopInfo)); return ROK; } @@ -510,7 +503,7 @@ uint8_t MacProcCellStop(Pst *pst, OduCellId *cellId) * ****************************************************************/ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) { - uint8_t ueIdx = 0; + uint8_t ueId = 0, ueIdx = 0; uint16_t cellIdx; uint16_t idx; DlRlcBoInfo dlBoInfo; @@ -526,11 +519,12 @@ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) if(dlCcchIndInfo->msgType == RRC_SETUP) { dlBoInfo.lcId = SRB0_LCID; // SRB ID 0 for msg4 - dlBoInfo.dataVolume = dlCcchIndInfo->dlCcchMsgLen; + /* (MSG4 pdu + 3 bytes sub-header) + (Contention resolution id MAC CE + 1 byte sub-header) */ + dlBoInfo.dataVolume = (dlCcchIndInfo->dlCcchMsgLen + 3) + (MAX_CRI_SIZE + 1); /* storing Msg4 Pdu in raCb */ - GET_UE_IDX(dlBoInfo.crnti, ueIdx); - ueIdx = ueIdx -1; + GET_UE_ID(dlBoInfo.crnti, ueId); + ueIdx = ueId -1; if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == dlCcchIndInfo->crnti) { macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen; @@ -619,6 +613,8 @@ uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize, * lcg ID * buffer size * + * @return ROK - success + * RFAILED - failure * * ****************************************************************/ uint8_t macProcShortBsr(uint16_t cellId, uint16_t crnti, uint8_t lcgId, uint32_t bufferSize) @@ -637,9 +633,96 @@ uint8_t macProcShortBsr(uint16_t cellId, uint16_t crnti, uint8_t lcgId, uint32_t bsrInd.dataVolInfo[0].dataVol = bufferSize; FILL_PST_MAC_TO_SCH(pst, EVENT_SHORT_BSR); - return(*macSchBsrOpts[pst.selector])(&pst, &bsrInd); + return(SchMessageRouter(&pst, (void *)&bsrInd)); +} + +/******************************************************************* + * + * @brief Processes received short BSR + * + * @details + * + * Function : macProcShortBsr + * + * Functionality: + * MAC sends Short BSR to SCH + * + * @params[in] cell ID + * crnti + * lcg ID + * buffer size + * + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t macProcLongBsr(uint16_t cellId, uint16_t crnti,uint8_t numLcg,\ + DataVolInfo dataVolInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS]) +{ + Pst pst; + UlBufferStatusRptInd bsrInd; + uint8_t lcgIdx = 0; + + memset(&pst, 0, sizeof(Pst)); + memset(&bsrInd, 0, sizeof(UlBufferStatusRptInd)); + + bsrInd.cellId = cellId; + bsrInd.crnti = crnti; + bsrInd.bsrType = LONG_BSR; + bsrInd.numLcg = numLcg; + + for(lcgIdx = 0; lcgIdx < numLcg; lcgIdx++) + memcpy(&(bsrInd.dataVolInfo[lcgIdx]), &(dataVolInfo[lcgIdx]), sizeof(DataVolInfo)); + + FILL_PST_MAC_TO_SCH(pst, EVENT_LONG_BSR); + return(SchMessageRouter(&pst, (void *)&bsrInd)); } +/******************************************************************* + * + * @brief Builds and send DL HARQ Indication to SCH + * + * @details + * + * Function : buildAndSendHarqInd + * + * Functionality: + * Builds and send HARQ UCI Indication to SCH + * + * @params[in] harqInfo Pointer + * crnti value + * cell Index value + * slot Ind Pointer + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t buildAndSendHarqInd(HarqInfoF0F1 *harqInfo, uint8_t crnti, uint16_t cellIdx, SlotTimingInfo *slotInd) +{ + uint16_t harqCounter=0; + Pst pst; + DlHarqInd dlHarqInd; + memset(&pst, 0, sizeof(Pst)); + memset(&dlHarqInd, 0, sizeof(DlHarqInd)); + + dlHarqInd.cellId = macCb.macCell[cellIdx]->cellId; + dlHarqInd.crnti = crnti; + dlHarqInd.slotInd.sfn = slotInd->sfn; + dlHarqInd.slotInd.slot = slotInd->slot; + dlHarqInd.numHarq = harqInfo->numHarq; + memset(dlHarqInd.harqPayload, 0, MAX_SR_BITS_IN_BYTES); + for(harqCounter = 0; harqCounter < harqInfo->numHarq; harqCounter++) + { + dlHarqInd.harqPayload[harqCounter] = harqInfo->harqValue[harqCounter]; + } + + /* Fill Pst */ + FILL_PST_MAC_TO_SCH(pst, EVENT_DL_HARQ_IND_TO_SCH); + + return SchMessageRouter(&pst, (void *)&dlHarqInd); +} + + /******************************************************************* * * @brief Builds and send SR UCI Indication to SCH @@ -676,7 +759,7 @@ uint8_t buildAndSendSrInd(UciInd *macUciInd, uint8_t crnti) /* Fill Pst */ FILL_PST_MAC_TO_SCH(pst, EVENT_UCI_IND_TO_SCH); - return(*macSchSrUciIndOpts[pst.selector])(&pst, &srUciInd); + return(SchMessageRouter(&pst, (void *)&srUciInd)); } /******************************************************************* @@ -698,10 +781,8 @@ uint8_t buildAndSendSrInd(UciInd *macUciInd, uint8_t crnti) * ****************************************************************/ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) { - uint8_t pduIdx = 0; - uint8_t ret = ROK; - uint16_t nPdus; - uint16_t crnti; + uint8_t pduIdx = 0, ret = ROK; + uint16_t nPdus = 0, crnti = 0, cellIdx = 0; if(macUciInd) { @@ -713,12 +794,19 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) case UCI_IND_PUSCH: break; case UCI_IND_PUCCH_F0F1: + { + { + DU_LOG("\nDEBUG --> MAC : Received HARQ UCI Indication\n"); + GET_CELL_IDX(macUciInd->cellId, cellIdx); + buildAndSendHarqInd(&macUciInd->pdus[pduIdx].uci.uciPucchF0F1.harqInfo, macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti, cellIdx, &macUciInd->slotInd); + } if(macUciInd->pdus[pduIdx].uci.uciPucchF0F1.srInfo.srIndPres) { DU_LOG("\nDEBUG --> MAC : Received SR UCI indication"); - crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; - ret = buildAndSendSrInd(macUciInd, crnti); + crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; + ret = buildAndSendSrInd(macUciInd, crnti); } + } break; case UCI_IND_PUCCH_F2F3F4: break; @@ -740,6 +828,164 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) return ret; } +/******************************************************************* + * + * @brief fill Slice Cfg Request info in shared structre + * + * @details + * + * Function : fillSliceCfgInfo + * + * Functionality: + * fill Slice Cfg Request info in shared structre + * + * @params[in] SchSliceCfgReq *schSliceCfgReq + * MacSliceCfgReq *macSliceCfgReq; + * @return ROK - success + * RFAILED - failure + * + **********************************************************************/ +uint8_t fillSliceCfgInfo(SchSliceCfgReq *schSliceCfgReq, MacSliceCfgReq *macSliceCfgReq) +{ + uint8_t cfgIdx = 0, memberListIdx = 0, totalSliceCfgRecvd = 0; + + if(macSliceCfgReq->listOfRrmPolicy) + { + for(cfgIdx = 0; cfgIdxnumOfRrmPolicy; cfgIdx++) + { + totalSliceCfgRecvd += macSliceCfgReq->listOfRrmPolicy[cfgIdx]->numOfRrmPolicyMem; + } + + schSliceCfgReq->numOfConfiguredSlice = totalSliceCfgRecvd; + MAC_ALLOC(schSliceCfgReq->listOfSlices, schSliceCfgReq->numOfConfiguredSlice *sizeof(SchRrmPolicyOfSlice*)); + if(schSliceCfgReq->listOfSlices == NULLP) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); + return RFAILED; + } + for(cfgIdx = 0; cfgIdxnumOfConfiguredSlice; cfgIdx++) + { + for(memberListIdx = 0; memberListIdxlistOfRrmPolicy[cfgIdx]->numOfRrmPolicyMem; memberListIdx++) + { + if(macSliceCfgReq->listOfRrmPolicy[cfgIdx]->rRMPolicyMemberList[memberListIdx]) + { + + MAC_ALLOC(schSliceCfgReq->listOfSlices[cfgIdx], sizeof(SchRrmPolicyOfSlice)); + if(schSliceCfgReq->listOfSlices[cfgIdx] == NULLP) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); + return RFAILED; + } + + memcpy(&schSliceCfgReq->listOfSlices[cfgIdx]->snssai, &macSliceCfgReq->listOfRrmPolicy[cfgIdx]->rRMPolicyMemberList[memberListIdx]->snssai, sizeof(Snssai)); + + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.maxRatio = macSliceCfgReq->listOfRrmPolicy[cfgIdx]->policyRatio.maxRatio; + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.minRatio = macSliceCfgReq->listOfRrmPolicy[cfgIdx]->policyRatio.minRatio; + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.dedicatedRatio = macSliceCfgReq->listOfRrmPolicy[cfgIdx]->policyRatio.dedicatedRatio; + } + } + } + } + return ROK; +} + +/******************************************************************* + * + * @brief Processes Slice Cfg Request recived from DU + * + * @details + * + * Function : MacProcSliceCfgReq + * + * Functionality: + * Processes Processes Slice Cfg Request recived from DU + * + * @params[in] Post Structure Pointer + * MacSliceCfgReq *macSliceCfgReq; + * @return ROK - success + * RFAILED - failure + * + **********************************************************************/ +uint8_t MacProcSliceCfgReq(Pst *pst, MacSliceCfgReq *macSliceCfgReq) +{ + uint8_t ret = ROK; + Pst schPst; + SchSliceCfgReq *schSliceCfgReq; + + DU_LOG("\nINFO --> MAC : Received Slice Cfg request from DU APP"); + if(macSliceCfgReq) + { + MAC_ALLOC(schSliceCfgReq, sizeof(SchSliceCfgReq)); + if(schSliceCfgReq == NULLP) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcSliceCfgReq"); + ret = RFAILED; + } + else + { + if(fillSliceCfgInfo(schSliceCfgReq, macSliceCfgReq) == ROK) + { + FILL_PST_MAC_TO_SCH(schPst, EVENT_SLICE_CFG_REQ_TO_SCH); + ret = SchMessageRouter(&schPst, (void *)schSliceCfgReq); + } + } + freeMacSliceCfgReq(macSliceCfgReq, pst); + } + else + { + DU_LOG("\nINFO --> MAC : Received MacSliceCfgReq is NULL"); + } + return ret; +} + +/******************************************************************* + * + * @brief Processes Slice ReCfg Request recived from DU + * + * @details + * + * Function : MacProcSliceRecfgReq + * + * Functionality: + * Processes Processes Slice ReCfg Request recived from DU + * + * @params[in] Post Structure Pointer + * MacSliceCfgReq *macSliceRecfgReq; + * @return ROK - success + * RFAILED - failure + * + **********************************************************************/ +uint8_t MacProcSliceRecfgReq(Pst *pst, MacSliceRecfgReq *macSliceRecfgReq) +{ + uint8_t ret = ROK; + Pst schPst; + SchSliceRecfgReq *schSliceRecfgReq; + + DU_LOG("\nINFO --> MAC : Received Slice ReCfg request from DU APP"); + if(macSliceRecfgReq) + { + MAC_ALLOC(schSliceRecfgReq, sizeof(SchSliceRecfgReq)); + if(schSliceRecfgReq == NULLP) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcSliceRecfgReq"); + ret = RFAILED; + } + else + { + if(fillSliceCfgInfo(schSliceRecfgReq, macSliceRecfgReq) == ROK) + { + FILL_PST_MAC_TO_SCH(schPst, EVENT_SLICE_RECFG_REQ_TO_SCH); + ret = SchMessageRouter(&schPst, (void *)schSliceRecfgReq); + } + } + freeMacSliceCfgReq(macSliceRecfgReq, pst); + } + else + { + DU_LOG("\nINFO --> MAC : Received MacSliceRecfgReq is NULL"); + } + return ret; +} /********************************************************************** End of file