X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_msg_hdl.c;h=a443d084e6f4662a39d8a02d3b3e1c87eea1df6d;hb=45d134510deb6902b870b4a0fb574b6075fba601;hp=eed1dad947aba2f93cd5bb7ee28212e4dae2ec78;hpb=6f769128e3fa5a83ee92e668ef9ac152c96b3200;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index eed1dad94..a443d084e 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -14,52 +14,25 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -*******************************************************************************/ + *******************************************************************************/ /* header include files -- defines (.h) */ -#include -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system services */ -#include "cm5.h" /* common timers defines */ -#include "cm_hash.h" /* common hash list defines */ -#include "cm_llist.h" /* common linked list defines */ -#include "cm_mblk.h" /* memory management */ -#include "cm_tkns.h" /* common tokens */ -#include "cm_lte.h" /* common tokens */ -#include "rgu.h" -#include "tfu.h" -#include "rg_sch_inf.h" -#include "rg_env.h" +#include "common_def.h" #include "lrg.h" -#include "crg.h" -#include "rg.h" -#include "du_log.h" -#include "lwr_mac.h" - -/* header/extern include files (.x) */ -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* common timers */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lib.x" /* common library */ -#include "cm_llist.x" /* common linked list */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" /* common tokens */ -#include "rgu.x" -#include "tfu.x" -#include "rg_sch_inf.x" +#include "rgu.h" #include "lrg.x" -#include "crg.x" -#include "rg_prg.x" +#include "rgu.x" #include "du_app_mac_inf.h" +#include "mac_sch_interface.h" #include "mac_upr_inf_api.h" -#include "rg.x" +#include "lwr_mac.h" +#ifdef INTEL_FAPI +#include "fapi_interface.h" +#endif #include "lwr_mac_fsm.h" +#include "lwr_mac_upr_inf.h" #include "mac.h" +#include "mac_utils.h" /* This file contains message handling functionality for MAC */ @@ -100,13 +73,11 @@ MacSchDlRlcBoInfoFunc macSchDlRlcBoInfoOpts[]= * RFAILED - failure * ****************************************************************/ -int sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo) +uint8_t sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo) { Pst pst; - - fillMacToSchPst(&pst); - pst.event = EVENT_DL_RLC_BO_INFO_TO_SCH; - + + FILL_PST_MAC_TO_SCH(pst, EVENT_DL_RLC_BO_INFO_TO_SCH); return(*macSchDlRlcBoInfoOpts[pst.selector])(&pst, dlBoInfo); } @@ -125,17 +96,15 @@ int sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo) * @return ROK - success * RFAILED - failure * - ****************************************************************/ -int sendCrcIndMacToSch(CrcIndInfo *crcInd) + ****************************************************************/ +uint8_t sendCrcIndMacToSch(CrcIndInfo *crcInd) { Pst pst; - - fillMacToSchPst(&pst); - pst.event = EVENT_CRC_IND_TO_SCH; - + + FILL_PST_MAC_TO_SCH(pst, EVENT_CRC_IND_TO_SCH); return(*macSchCrcIndOpts[pst.selector])(&pst, crcInd); } - + /******************************************************************* * * @brief Processes CRC Indication from PHY @@ -153,23 +122,25 @@ int sendCrcIndMacToSch(CrcIndInfo *crcInd) * RFAILED - failure * * ****************************************************************/ -uint16_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) +uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) { + uint16_t cellIdx; CrcIndInfo crcIndInfo; - + DU_LOG("\nMAC : Received CRC indication"); + GET_CELL_IDX(crcInd->cellId, cellIdx); /* Considering one pdu and one preamble */ - crcIndInfo.cellId = macCb.macCell->cellId;; + crcIndInfo.cellId = macCb.macCell[cellIdx]->cellId;; crcIndInfo.crnti = crcInd->crcInfo[0].rnti; crcIndInfo.timingInfo.sfn = crcInd->timingInfo.sfn; crcIndInfo.timingInfo.slot = crcInd->timingInfo.slot; crcIndInfo.numCrcInd = crcInd->crcInfo[0].numCb; crcIndInfo.crcInd[0] = crcInd->crcInfo[0].cbCrcStatus[0]; - + return(sendCrcIndMacToSch(&crcIndInfo)); } - + /******************************************************************* * * @brief Process Rx Data Ind at MAC @@ -187,18 +158,18 @@ uint16_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) * RFAILED - failure * * ****************************************************************/ -uint16_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) +uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) { uint16_t pduIdx; - + DU_LOG("\nMAC : Received Rx Data indication"); - + /* TODO : compare the handle received in RxDataInd with handle send in PUSCH - * PDU, which is stored in raCb */ + * PDU, which is stored in raCb */ for(pduIdx = 0; pduIdx < rxDataInd->numPdus; pduIdx++) { - unpackRxData(&rxDataInd->pdus[pduIdx]); + unpackRxData(rxDataInd->cellId, &rxDataInd->pdus[pduIdx]); } return ROK; } @@ -254,7 +225,7 @@ uint16_t MacRlcProcBOStatus(Pst* pst, SpId spId, RlcMacBOStatus* boStatus) * * @details * - * Function : MacHdlCellStartReq + * Function : MacProcCellStartReq * * Functionality: * Handles cell start reuqest from DU APP @@ -265,13 +236,13 @@ uint16_t MacRlcProcBOStatus(Pst* pst, SpId spId, RlcMacBOStatus* boStatus) * RFAILED - failure * * ****************************************************************/ -uint16_t MacHdlCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) +uint8_t MacProcCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) { DU_LOG("\nMAC : Handling cell start request"); sendToLowerMac(START_REQUEST, 0, cellStartInfo); MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStartInfo, \ - sizeof(MacCellStartInfo)); + sizeof(MacCellStartInfo)); return ROK; } @@ -282,7 +253,7 @@ uint16_t MacHdlCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) * * @details * - * Function : MacHdlCellStartReq + * Function : MacProcCellStartReq * * Functionality: * Handles cell stop request from DU APP @@ -293,16 +264,16 @@ uint16_t MacHdlCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) * RFAILED - failure * * ****************************************************************/ -uint16_t MacHdlCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) +uint8_t MacProcCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) { - #ifdef FAPI +#ifdef INTEL_FAPI DU_LOG("\nMAC : Sending cell stop request to Lower Mac"); sendToLowerMac(FAPI_STOP_REQUEST, 0, cellStopInfo); - #endif +#endif MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStopInfo, \ - sizeof(MacCellStopInfo)); - + sizeof(MacCellStopInfo)); + return ROK; } @@ -312,7 +283,7 @@ uint16_t MacHdlCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) * * @details * - * Function : MacHdlDlCcchInd + * Function : MacProcDlCcchInd * * Functionality: * Handles DL CCCH Ind from DU APP @@ -323,42 +294,48 @@ uint16_t MacHdlCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) * RFAILED - failure * * ****************************************************************/ -uint16_t MacHdlDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) +uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) { + uint16_t cellIdx; + uint16_t idx; DlRlcBOInfo dlBoInfo; + memset(&dlBoInfo, 0, sizeof(DlRlcBOInfo)); DU_LOG("\nMAC : Handling DL CCCH IND"); - - /* TODO : Fill DL RLC Buffer status info */ + + GET_CELL_IDX(dlCcchIndInfo->cellId, cellIdx); + dlBoInfo.cellId = dlCcchIndInfo->cellId; dlBoInfo.crnti = dlCcchIndInfo->crnti; dlBoInfo.numLc = 0; - + if(dlCcchIndInfo->msgType == RRC_SETUP) { + dlBoInfo.boInfo[dlBoInfo.numLc].lcId = SRB_ID_0; // SRB ID 0 for msg4 + dlBoInfo.boInfo[SRB_ID_0].dataVolume = \ + dlCcchIndInfo->dlCcchMsgLen; dlBoInfo.numLc++; - dlBoInfo.boInfo[dlBoInfo.numLc].lcId = 0; // SRB 0 for msg4 - dlBoInfo.boInfo[dlBoInfo.numLc].dataVolume = \ - strlen((const char*)dlCcchIndInfo->dlCcchMsg); /* storing Msg4 Pdu in raCb */ - if(macCb.macCell->macRaCb[0].crnti == dlCcchIndInfo->crnti) + if(macCb.macCell[cellIdx]->macRaCb[0].crnti == dlCcchIndInfo->crnti) { - macCb.macCell->macRaCb[0].msg4PduLen = strlen((const char*)dlCcchIndInfo\ - ->dlCcchMsg); - MAC_ALLOC(macCb.macCell->macRaCb[0].msg4Pdu, macCb.macCell->macRaCb[0]\ - .msg4PduLen); - if(macCb.macCell->macRaCb[0].msg4Pdu) - { - memcpy(macCb.macCell->macRaCb[0].msg4Pdu, dlCcchIndInfo->dlCcchMsg,\ - macCb.macCell->macRaCb[0].msg4PduLen); - } + macCb.macCell[cellIdx]->macRaCb[0].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen; + MAC_ALLOC(macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu, \ + macCb.macCell[cellIdx]->macRaCb[0].msg4PduLen); + if(macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu) + { + for(idx = 0; idx < dlCcchIndInfo->dlCcchMsgLen; idx++) + { + macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu[idx] =\ + dlCcchIndInfo->dlCcchMsg[idx]; + } + } } } sendDlRlcBoInfoMacToSch(&dlBoInfo); - + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, dlCcchIndInfo->dlCcchMsg, \ - strlen((const char*)dlCcchIndInfo->dlCcchMsg)); + dlCcchIndInfo->dlCcchMsgLen); MAC_FREE_SHRABL_BUF(pst->region, pst->pool, dlCcchIndInfo, sizeof(DlCcchIndInfo)); return ROK; @@ -381,50 +358,38 @@ uint16_t MacHdlDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) * RFAILED - failure * * ****************************************************************/ -uint16_t macSendUlCcchInd(uint8_t *rrcContainer, uint16_t cellId, uint16_t crnti) +uint8_t macSendUlCcchInd(uint8_t *rrcContainer, uint16_t cellId, uint16_t crnti) { Pst pst; - uint8_t ret = ROK; + uint8_t ret = ROK; UlCcchIndInfo *ulCcchIndInfo = NULLP; MAC_ALLOC_SHRABL_BUF(ulCcchIndInfo, sizeof(UlCcchIndInfo)); if(!ulCcchIndInfo) { - DU_LOG("\nMAC: Memory failed in macSendUlCcchInd"); - return RFAILED; - } - - ulCcchIndInfo->cellId = cellId; - ulCcchIndInfo->crnti = crnti; - ulCcchIndInfo->ulCcchMsg = rrcContainer; - - /* Fill Pst */ - pst.selector = DU_MAC_LWLC; - pst.srcEnt = ENTRG; - pst.dstEnt = ENTDUAPP; - pst.dstInst = 0; - pst.srcInst = macCb.macInst; - pst.dstProcId = rgCb[pst.srcInst].rgInit.procId; - pst.srcProcId = rgCb[pst.srcInst].rgInit.procId; - pst.region = MAC_MEM_REGION; - pst.pool = MAC_POOL; - pst.event = EVENT_MAC_UL_CCCH_IND; - pst.route = 0; - pst.prior = 0; - pst.intfVer = 0; - - if(MacDuAppUlCcchInd(&pst, ulCcchIndInfo) != ROK) - { - DU_LOG("\nMAC: Failed to send UL CCCH Ind to DU APP"); - MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo->ulCcchMsg, - strlen((const char*)ulCcchIndInfo->ulCcchMsg)); - MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo, sizeof(UlCcchIndInfo)); - ret = RFAILED; - } - return ret; + DU_LOG("\nMAC: Memory failed in macSendUlCcchInd"); + return RFAILED; + } + + ulCcchIndInfo->cellId = cellId; + ulCcchIndInfo->crnti = crnti; + ulCcchIndInfo->ulCcchMsg = rrcContainer; + + /* Fill Pst */ + FILL_PST_MAC_TO_DUAPP(pst, EVENT_MAC_UL_CCCH_IND); + + if(MacDuAppUlCcchInd(&pst, ulCcchIndInfo) != ROK) + { + DU_LOG("\nMAC: Failed to send UL CCCH Ind to DU APP"); + MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo->ulCcchMsg, + strlen((const char*)ulCcchIndInfo->ulCcchMsg)); + MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo, sizeof(UlCcchIndInfo)); + ret = RFAILED; + } + return ret; } /********************************************************************** - End of file -**********************************************************************/ + End of file + **********************************************************************/