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=176d311e85ec7f75565425d6b40298cd800cd26f;hpb=c4723faa976bb203b594b1ab97523a35441838ec;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index 176d311e8..7e015afee 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -38,61 +38,6 @@ MacCb macCb; -/* 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 -}; - -/* Function pointer for sending DL HARQ Ind from MAC to SCH */ -MacSchDlHarqIndFunc macSchDlHarqIndOpts[]= -{ - packMacSchDlHarqInd, - MacSchDlHarqInd, - packMacSchDlHarqInd -}; - -/* Function pointer for sending Slice cfg ind from MAC to SCH */ -MacSchSliceCfgReqFunc macSchSliceCfgReqOpts[]= -{ - packMacSchSliceCfgReq, - MacSchSliceCfgReq, - packMacSchSliceCfgReq -}; - -/* Function pointer for sending Slice cfg ind from MAC to SCH */ -MacSchSliceRecfgReqFunc macSchSliceRecfgReqOpts[]= -{ - packMacSchSliceRecfgReq, - MacSchSliceRecfgReq, - packMacSchSliceRecfgReq -}; /******************************************************************* * * @brief Sends DL BO Info to SCH @@ -114,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)); } /******************************************************************* @@ -138,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)); } /******************************************************************* @@ -239,7 +184,7 @@ 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 ueId = 0; @@ -323,7 +268,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) } 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; } @@ -352,27 +297,22 @@ 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(SlotTimingInfo)); ulData->slotInfo.cellId = cellId; /* Filling pdu info */ - if(lcId != SRB0_LCID) - ulData->pduInfo[ulData->numPdu].commCh = false; - else - ulData->pduInfo[ulData->numPdu].commCh = true; - ulData->pduInfo[ulData->numPdu].lcId = lcId; ulData->pduInfo[ulData->numPdu].pduBuf = pdu; ulData->pduInfo[ulData->numPdu].pduLen = pduLen; @@ -464,7 +404,6 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo, uint8_t u { schedRpt->lcSch[lcIdx].lcId = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].lcSchInfo[lcIdx].lcId; schedRpt->lcSch[lcIdx].bufSize = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].lcSchInfo[lcIdx].schBytes; - schedRpt->lcSch[lcIdx].commCh = false; } } @@ -694,7 +633,7 @@ 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)); } /******************************************************************* @@ -736,7 +675,7 @@ uint8_t macProcLongBsr(uint16_t cellId, uint16_t crnti,uint8_t numLcg,\ memcpy(&(bsrInd.dataVolInfo[lcgIdx]), &(dataVolInfo[lcgIdx]), sizeof(DataVolInfo)); FILL_PST_MAC_TO_SCH(pst, EVENT_LONG_BSR); - return(*macSchBsrOpts[pst.selector])(&pst, &bsrInd); + return(SchMessageRouter(&pst, (void *)&bsrInd)); } /******************************************************************* @@ -780,7 +719,7 @@ uint8_t buildAndSendHarqInd(HarqInfoF0F1 *harqInfo, uint8_t crnti, uint16_t cell /* Fill Pst */ FILL_PST_MAC_TO_SCH(pst, EVENT_DL_HARQ_IND_TO_SCH); - return(*macSchDlHarqIndOpts[pst.selector])(&pst, &dlHarqInd); + return SchMessageRouter(&pst, (void *)&dlHarqInd); } @@ -820,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)); } /******************************************************************* @@ -906,46 +845,50 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) * RFAILED - failure * **********************************************************************/ - uint8_t fillSliceCfgInfo(SchSliceCfgReq *schSliceCfgReq, MacSliceCfgReq *macSliceCfgReq) - { - uint8_t cfgIdx = 0; - - if(macSliceCfgReq->listOfSliceCfg) - { - schSliceCfgReq->numOfConfiguredSlice = macSliceCfgReq->numOfConfiguredSlice; - MAC_ALLOC(schSliceCfgReq->listOfConfirguration, schSliceCfgReq->numOfConfiguredSlice *sizeof(SchRrmPolicyOfSlice*)); - if(schSliceCfgReq->listOfConfirguration == NULLP) - { - DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); - return RFAILED; - } - for(cfgIdx = 0; cfgIdxnumOfConfiguredSlice; cfgIdx++) - { - MAC_ALLOC(schSliceCfgReq->listOfConfirguration[cfgIdx], sizeof(SchRrmPolicyOfSlice)); - if(schSliceCfgReq->listOfConfirguration[cfgIdx] == NULLP) - { - DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); - return RFAILED; - } - - memcpy(&schSliceCfgReq->listOfConfirguration[cfgIdx]->snssai, &macSliceCfgReq->listOfSliceCfg[cfgIdx]->snssai, sizeof(Snssai)); - - if(macSliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio) - { - MAC_ALLOC(schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo, sizeof(SchRrmPolicyRatio)); - if(schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo == NULLP) - { - DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); - return RFAILED; - } - schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo->policyMaxRatio = macSliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyMaxRatio; - schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo->policyMinRatio = macSliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyMinRatio; - schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo->policyDedicatedRatio = macSliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyDedicatedRatio; - } - } - } - return ROK; - } +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 @@ -983,7 +926,7 @@ uint8_t MacProcSliceCfgReq(Pst *pst, MacSliceCfgReq *macSliceCfgReq) if(fillSliceCfgInfo(schSliceCfgReq, macSliceCfgReq) == ROK) { FILL_PST_MAC_TO_SCH(schPst, EVENT_SLICE_CFG_REQ_TO_SCH); - ret = (*macSchSliceCfgReqOpts[schPst.selector])(&schPst, schSliceCfgReq); + ret = SchMessageRouter(&schPst, (void *)schSliceCfgReq); } } freeMacSliceCfgReq(macSliceCfgReq, pst); @@ -1032,9 +975,8 @@ uint8_t MacProcSliceRecfgReq(Pst *pst, MacSliceRecfgReq *macSliceRecfgReq) if(fillSliceCfgInfo(schSliceRecfgReq, macSliceRecfgReq) == ROK) { FILL_PST_MAC_TO_SCH(schPst, EVENT_SLICE_RECFG_REQ_TO_SCH); - ret = (*macSchSliceRecfgReqOpts[schPst.selector])(&schPst, schSliceRecfgReq); + ret = SchMessageRouter(&schPst, (void *)schSliceRecfgReq); } - } freeMacSliceCfgReq(macSliceRecfgReq, pst); }