X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_lim.c;h=67b22880c68dcd76987656d0a685855a5b674f72;hb=2b5e7ba18453db526316b51476673c1ea69c1a94;hp=10b467f4fe060236073a8eba15841fa0a30be5e7;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_lim.c b/src/5gnrrlc/kw_lim.c index 10b467f4f..67b22880c 100755 --- a/src/5gnrrlc/kw_lim.c +++ b/src/5gnrrlc/kw_lim.c @@ -26,10 +26,10 @@ This file contains following functions --RlcLiRguBndCfm - --RlcLiRguCDatInd - --RlcLiRguDDatInd - --RlcLiRguCStaInd - --RlcLiRguDStaInd + --rlcProcCommLcUlData + --rlcProcDedLcUlData + --rlcProcCommLcSchedRpt + --rlcProcDedLcSchedRpt --RlcLiRguHqStaInd File: kw_lim.c @@ -72,9 +72,10 @@ static int RLOG_FILE_ID=196; #include "kw_dl.x" #include "kw_ul.x" #include "rlc_utils.h" +#include "rlc_mac_inf.h" #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /* __cplusplus */ @@ -98,27 +99,13 @@ EXTERN "C" { * -# RFAILED * */ -#ifdef ANSI -S16 RlcLiRguBndCfm -( -Pst *pst, -SuId suId, -U8 status -) -#else -S16 RlcLiRguBndCfm (pst, suId, status) -Pst *pst; -SuId suId; -U8 status; -#endif +S16 RlcLiRguBndCfm(Pst *pst,SuId suId,uint8_t status) { - U16 event; /* Event */ - U16 cause; /* Cause */ + uint16_t event; /* Event */ + uint16_t cause; /* Cause */ RlcRguSapCb *rguSap; /* RGU SAP Control Block */ RlcCb *tRlcCb; - TRC3(RlcLiRguBndCfm) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { @@ -158,7 +145,7 @@ U8 status; { case RLC_SAP_BINDING: { - rlcStopTmr (tRlcCb,(PTR)rguSap, RLC_EVT_WAIT_BNDCFM); + rlcStopTmr (tRlcCb,(PTR)rguSap, EVENT_RLC_WAIT_BNDCFM); rguSap->retryCnt = 0; @@ -189,108 +176,6 @@ U8 status; return (ROK); } /* RlcLiRguBndCfm */ -/** - * @brief Handler to process PDU received from MAC - * - * @details - * This function receives the PDU from MAC. - * seggregates common and dedicated logical channel - * PDU and call respective handler. - * - * @param[in] pst Post structure - * @param[in] suId Service User ID - * @param[in] datInd Data Indication Information - * - * @return S16 - * -# ROK - * -# RFAILED - * -*/ - -uint8_t RlcProcUlData(Pst *pst, RlcMacData *ulData) -{ - U8 idx; - U8 lcId; /* Logical Channel */ - U8 numDLch = 0; /* Number of dedicated logical channel */ - Bool dLchPduPres; /* PDU received on dedicated logical channel */ - RguLchDatInd dLchData[RGU_MAX_LC]; /* PDU info on dedicated logical channel */ - RguDDatIndInfo *dLchUlDat; /* UL data on dedicated logical channel */ - RguCDatIndInfo *cLchUlDat; /* UL data on common logical channel */ - uint16_t copyLen; - - /* Initializing dedicated logical channel Database */ - for(idx = 0; idx < RGU_MAX_LC; idx++) - { - dLchData[idx].lcId = idx; - dLchData[idx].pdu.numPdu = 0; - } - - dLchPduPres = FALSE; - - /* Seggregate PDUs received on common and dedicated channels - * and call common channel's handler */ - for(idx = 0; idx< ulData->numPdu; idx++) - { - if(ulData->pduInfo[idx].commCh) - { - RLC_SHRABL_STATIC_BUF_ALLOC(pst->region, pst->pool, cLchUlDat, sizeof(RguCDatIndInfo)); - cmMemset((U8*)cLchUlDat, (U8)0, sizeof(RguCDatIndInfo)); - - cLchUlDat->cellId = ulData->cellId; - GET_UE_IDX(ulData->rnti, cLchUlDat->rnti); - cLchUlDat->lcId = ulData->pduInfo[idx].lcId; - - /* Copy fixed buffer to message */ - if(SGetMsg(RLC_MEM_REGION_UL, RLC_POOL, &cLchUlDat->pdu) != ROK) - { - DU_LOG("\nRLC : Memory allocation failed at RlcProcUlData"); - return RFAILED; - } - reverseFixBuf(ulData->pduInfo[idx].pduBuf, ulData->pduInfo[idx].pduLen); - SCpyFixMsg(ulData->pduInfo[idx].pduBuf, cLchUlDat->pdu, 0, \ - ulData->pduInfo[idx].pduLen, (MsgLen *)©Len); - - RlcLiRguCDatInd(pst, 0, cLchUlDat); - } - else - { - if(!dLchPduPres) - { - RLC_SHRABL_STATIC_BUF_ALLOC(pst->region, pst->pool, dLchUlDat, sizeof(RguDDatIndInfo)); - dLchPduPres = TRUE; - } - - lcId = ulData->pduInfo[idx].lcId; - dLchData[lcId].pdu.mBuf[dLchData[lcId].pdu.numPdu] = ulData->pduInfo[idx].pduBuf; - dLchData[lcId].pdu.numPdu++; - } - } - - /* If any PDU received on dedicated logical channel, copy into RguDDatIndInfo - * and call its handler */ - if(dLchPduPres) - { - dLchUlDat->cellId = ulData->cellId; - dLchUlDat->rnti = ulData->rnti; - - for(idx = 0; idx < RGU_MAX_LC; idx++) - { - if(dLchData[idx].pdu.numPdu) - { - cmMemcpy((U8 *)&dLchUlDat->lchData[numDLch], (U8 *)&dLchData[idx], sizeof(RguLchDatInd)); - numDLch++; - } - } - dLchUlDat->numLch = numDLch; - RlcLiRguDDatInd(pst, 0, dLchUlDat); - } - - - RLC_FREE_SHRABL_BUF(pst->region, pst->pool, ulData, sizeof(RlcMacData)); - return ROK; - -}/* End of RlcProcUlData */ - int rlcDDatIndRcvd; int rlcCDatIndRcvd; /** @@ -309,41 +194,27 @@ int rlcCDatIndRcvd; * -# RFAILED * */ -#ifdef ANSI -S16 RlcLiRguCDatInd -( -Pst *pst, -SuId suId, -RguCDatIndInfo *datInd -) -#else -S16 RlcLiRguCDatInd(pst,suId,datInd) -Pst *pst; -SuId suId; -RguCDatIndInfo *datInd; -#endif +uint8_t rlcProcCommLcUlData(Pst *pst, SuId suId, RguCDatIndInfo *datInd) { RlcUlRbCb *rbCb; RlcCb *tRlcCb; rlcCDatIndRcvd++; - TRC3(RlcLiRguCDatInd) #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); - return (RFAILED); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo)); + return RFAILED; } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); - #if (ERRCLASS & ERRCLS_DEBUG) if (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo)); return RFAILED; } #endif @@ -352,9 +223,9 @@ RguCDatIndInfo *datInd; #if (ERRCLASS & ERRCLS_DEBUG) if(RLC_MAX_LCH_PER_CELL <= datInd->lcId) { - RLOG_ARG1(L_ERROR,DBG_LCID,datInd->lcId, "Invalid LcId, Max is [%d]", - RLC_MAX_LCH_PER_CELL); - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); + DU_LOG("\nRLC : rlcProcCommLcUlData : Invalid LcId [%d], Max is [%d]",\ + datInd->lcId, RLC_MAX_LCH_PER_CELL); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo)); return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -363,23 +234,23 @@ RguCDatIndInfo *datInd; rlcDbmFetchUlRbCbFromLchId(tRlcCb, datInd->rnti, datInd->cellId, datInd->lcId, &rbCb); if (!rbCb) { - RLOG_ARG1(L_ERROR, DBG_CELLID,datInd->cellId, "LcId [%d] not found", + DU_LOG("\nRLC : rlcProcCommLcUlData : LcId [%d] not found", datInd->lcId); - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo)); return RFAILED; } /* Dispatch to TM Module */ #ifdef CCPU_OPT - rlcTmmRcvFrmLi(tRlcCb, rbCb, datInd->rnti, datInd->pdu); + rlcTmmRcvFrmMac(tRlcCb, rbCb, datInd->rnti, datInd->pdu); #else /* CCPU_OPT */ - rlcTmmRcvFrmLi(tRlcCb, rbCb, datInd->pdu); + rlcTmmRcvFrmMac(tRlcCb, rbCb, datInd->pdu); #endif /* CCPU_OPT */ - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguCDatIndInfo)); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguCDatIndInfo)); return (ROK); -} /* RlcLiRguCDatInd */ +} /* rlcProcCommLcUlData */ /** * @brief Handler to process PDU received from MAC for @@ -399,131 +270,36 @@ RguCDatIndInfo *datInd; * */ -#ifdef ANSI -S16 RlcLiRguDDatInd -( -Pst *pst, -SuId suId, -RguDDatIndInfo *datInd -) -#else -S16 RlcLiRguDDatInd(pst, suId, datInd) -Pst *pst; -SuId suId; -RguDDatIndInfo *datInd; -#endif +uint8_t rlcProcDedLcUlData(Pst *pst, SuId suId, RguDDatIndInfo *datInd) { - TRC3(RlcLiRguDDatInd) - rlcDDatIndRcvd++; #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguDDatIndInfo)); - return (RFAILED); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguDDatIndInfo)); + return RFAILED; } #endif #if (ERRCLASS & ERRCLS_DEBUG) if (((RlcCb*)RLC_GET_RLCCB(pst->dstInst))->genCfg.rlcMode == LKW_RLC_MODE_DL) { - RLOG1(L_DEBUG,"RlcLiRguDDatInd(pst, suId(%d))recieved in DL Inst",suId); - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguDDatIndInfo)); + DU_LOG("\nRLC : rlcProcDedLcUlData : suId(%d))recieved in DL Inst", suId); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguDDatIndInfo)); return RFAILED; } #endif - rlcUtlRcvFrmLi(RLC_GET_RLCCB(pst->dstInst),datInd); + rlcUtlRcvFrmMac(RLC_GET_RLCCB(pst->dstInst),datInd); #ifndef SS_RBUF #ifdef SS_LOCKLESS_MEMORY - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datInd, sizeof(RguDDatIndInfo)); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguDDatIndInfo)); #else - RLC_PST_FREE(pst->region, pst->pool, datInd, sizeof(RguDDatIndInfo)); + RLC_PST_FREE(RLC_MEM_REGION_UL, RLC_POOL, datInd, sizeof(RguDDatIndInfo)); #endif #endif - return (ROK); -} /* RlcLiRguDDatInd */ - - -/******************************************************************* - * - * @brief Handler for extracting common and dedicated channel - * Scheduling result report. - * - * @details - * - * Function : RlcMacProcSchedRep - * - * Functionality: - * Handler for extracting common and dedicated channel - * Scheduling result report - * - * @params[in] - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ -uint16_t RlcMacProcSchedRep(Pst *pst, SuId suId, RlcMacSchedRepInfo *schRep) -{ - U8 idx; /* Iterator */ - U8 nmbDLch = 0; /* Number of dedicated logical channles */ - RguCStaIndInfo *cLchSchInfo; /* Common logical channel scheduling result */ - RguDStaIndInfo *dLchSchInfo; /* Dedicated logical channel scheduling result */ - - DU_LOG("\nRLC : Received scheduling report from MAC"); - - for(idx=0; idx < schRep->nmbLch; idx++) - { - /* If it is common channel, fill status indication information - * and trigger the handler for each common lch separately */ - if(schRep->lchSta[idx].commCh) - { - RLC_SHRABL_STATIC_BUF_ALLOC(pst->region, pst->pool, cLchSchInfo, sizeof(RguCStaIndInfo)); - cmMemset((U8*)cLchSchInfo, (U8)0, sizeof(RguCStaIndInfo)); - - cLchSchInfo->cellId = schRep->cellId; - cLchSchInfo->lcId = schRep->lchSta[idx].lchStaInd.lcId; - //cLchSchInfo->transId = schRep->timeToTx; /* TODO : fill transId suing timeToTx */ - cLchSchInfo->rnti = schRep->rnti; - - RlcLiRguCStaInd(pst, suId, cLchSchInfo); - - } - else - { - /* Fill status info structure if at least one dedicated channel - * scheduling report is received */ - if(nmbDLch == 0) - { - RLC_SHRABL_STATIC_BUF_ALLOC(pst->region, pst->pool, dLchSchInfo, sizeof(RguDStaIndInfo)); - - dLchSchInfo->cellId = schRep->cellId; - dLchSchInfo->nmbOfUeGrantPerTti = 1; - dLchSchInfo->staInd[0].rnti = schRep->rnti; - //dLchSchInfo->staInd[0].transId = schRep->timeToTx; /* TODO : fill transId suing timeToTx */ - dLchSchInfo->staInd[0].nmbOfTbs = 1; - //dLchSchInfo->staInd[0].fillCrlPdu = /* TODO : Check the value needed to be filled */ - } - - /* Fill logical channel scheduling info */ - cmMemcpy((U8 *)&dLchSchInfo->staInd[0].staIndTb[0].lchStaInd[nmbDLch], (U8 *)&schRep->lchSta[idx].lchStaInd, sizeof(RguLchStaInd)); - nmbDLch++; - - } - - } - - /* Calling handler for all dedicated channels scheduling*/ - if(nmbDLch) - { - dLchSchInfo->staInd[0].staIndTb[0].nmbLch = nmbDLch; - RlcLiRguDStaInd(pst, suId, dLchSchInfo); - } - - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, schRep, sizeof(RlcMacSchedRepInfo)); - return ROK; -} +} /* rlcProcDedLcUlData */ /** * @brief Handler for trigerring the data transfer from RLC to MAC @@ -543,52 +319,32 @@ uint16_t RlcMacProcSchedRep(Pst *pst, SuId suId, RlcMacSchedRepInfo *schRep) * -# RFAILED * */ -#ifdef ANSI -S16 RlcLiRguCStaInd -( -Pst *pst, -SuId suId, -RguCStaIndInfo *staInd -) -#else -S16 RlcLiRguCStaInd(pst,suId,staInd) -Pst *pst; -SuId suId; -RguCStaIndInfo *staInd; -#endif +uint8_t rlcProcCommLcSchedRpt(Pst *pst, SuId suId, RguCStaIndInfo *staInd) { RlcDlRbCb *rbCb; RlcCb *tRlcCb; - TRC3(RlcLiRguCStaInd) - #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo)); return (RFAILED); } #endif tRlcCb = RLC_GET_RLCCB(pst->dstInst); - #if (ERRCLASS & ERRCLS_INT_PAR) if ((suId >= tRlcCb->genCfg.maxRguSaps) || (suId < 0)) { - RLCLOGERROR(tRlcCb, - ERRCLS_INT_PAR, - EKW040, - (ErrVal) suId, - "RlcLiRguCStaInd: Invalid RGU suId\n"); - return (RFAILED); + DU_LOG("\nRLC: rlcProcCommLcSchedRpt: Invalid RGU suId %d\n", suId); + return RFAILED; } if (tRlcCb->genCfg.rlcMode == LKW_RLC_MODE_UL) { - RLOG_ARG1(L_ERROR,DBG_LCID,staInd->lcId, - "Received in RLC UL CELLID:%d", + DU_LOG("\nRLC: rlcProcCommLcSchedRpt: Received in RLC UL CELLID:%d", staInd->cellId); - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo)); return RFAILED; } #endif @@ -599,11 +355,9 @@ RguCStaIndInfo *staInd; #if (ERRCLASS & ERRCLS_DEBUG) if(RLC_MAX_LCH_PER_CELL < staInd->lcId) { - RLOG_ARG2(L_ERROR,DBG_LCID,staInd->lcId, - "Invalid LcId, Max is [%d] CELLID:%d", - RLC_MAX_LCH_PER_CELL, - staInd->cellId); - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); + DU_LOG("\nRLC: rlcProcCommLcSchedRpt: Invalid LcId, Max is [%d] CELLID:%d", + RLC_MAX_LCH_PER_CELL, staInd->cellId); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo)); return RFAILED; } #endif /* (ERRCLASS & ERRCLS_DEBUG) */ @@ -611,34 +365,26 @@ RguCStaIndInfo *staInd; rlcDbmFetchDlRbCbFromLchId(tRlcCb,0, staInd->cellId, staInd->lcId, &rbCb); if(!rbCb) { - RLOG_ARG1(L_ERROR, DBG_CELLID,staInd->cellId, - "LcId [%d] not found CELLID:%d", - staInd->lcId); - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); + DU_LOG("\nRLC: rlcProcCommLcSchedRpt: LcId [%d] not found CELLID:%d", + staInd->lcId, staInd->cellId); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo)); return RFAILED; } /* Dispatch to TM Module */ rbCb->transId = staInd->transId; - /* ccpu00136940 */ - /* If trace flag is enabled send the trace indication */ - if(tRlcCb->init.trc == TRUE) - { - /* Populate the trace params */ - rlcLmmSendTrc(tRlcCb,EVTRGUCSTAIND, NULLP); - } - rlcTmmSndToLi(tRlcCb, suId, rbCb, staInd); + rlcTmmSendToMac(tRlcCb, suId, rbCb, staInd); #ifndef SS_RBUF #ifdef SS_LOCKLESS_MEMORY - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo)); #else - RLC_PST_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); + RLC_PST_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo)); #endif #else - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguCStaIndInfo)); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguCStaIndInfo)); #endif - return (ROK); -} /* RlcLiRguCStaInd */ + return ROK; +} /* rlcProcCommLcSchedRpt */ /** * @brief Handler for trigerring the data transfer from RLC to MAC @@ -659,28 +405,15 @@ RguCStaIndInfo *staInd; * -# RFAILED * */ -#ifdef ANSI -S16 RlcLiRguDStaInd -( -Pst *pst, -SuId suId, -RguDStaIndInfo *staInd -) -#else -S16 RlcLiRguDStaInd(pst, suId, staInd) -Pst *pst; -SuId suId; -RguDStaIndInfo *staInd; -#endif +uint8_t rlcProcDedLcSchedRpt(Pst *pst, SuId suId, RguDStaIndInfo *staInd) { RlcCb *gCb; - TRC3(RlcLiRguDStaInd) #if (ERRCLASS & ERRCLS_INT_PAR) if (pst->dstInst >= MAX_RLC_INSTANCES) { - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguDStaIndInfo)); - return (RFAILED); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguDStaIndInfo)); + return RFAILED; } #endif @@ -689,26 +422,22 @@ RguDStaIndInfo *staInd; #if (ERRCLASS & ERRCLS_INT_PAR) if (((RlcCb*)RLC_GET_RLCCB(pst->dstInst))->genCfg.rlcMode == LKW_RLC_MODE_UL) { - RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"Received in RLC UL "); - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguDStaIndInfo)); + DU_LOG("\nRLC: rlcProcDedLcSchedRpt: Received in RLC UL "); + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguDStaIndInfo)); return RFAILED; } if ((suId >= gCb->genCfg.maxRguSaps) || (suId < 0)) { - RLCLOGERROR(gCb, - ERRCLS_INT_PAR, - EKW040, - (ErrVal) suId, - "RlcLiRguDStaInd: Invalid RGU suId\n"); + DU_LOG("\nRLC: rlcProcDedLcSchedRpt: Invalid RGU suId %d\n", suId); return (RFAILED); } #endif - rlcUtlSndToLi(gCb, suId, staInd); + rlcUtlSendToMac(gCb, suId, staInd); /* kw002.201 :Freeing from proper region */ - RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, staInd, sizeof(RguDStaIndInfo)); - return (ROK); -} /* RlcLiRguDStaInd */ + RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, staInd, sizeof(RguDStaIndInfo)); + return ROK; +} /* rlcProcDedLcSchedRpt */ /** * @brief Handler for handling the flow cntrl Ind from MAC @@ -728,24 +457,12 @@ RguDStaIndInfo *staInd; * -# RFAILED * */ -#ifdef ANSI -S16 RlcLiRguFlowCntrlInd -( -Pst *pst, -SuId suId, -RguFlowCntrlInd *flowCntrlInd -) -#else -S16 RlcLiRguFlowCntrlInd(pst, suId, flowCntrlInd) -Pst *pst; -SuId suId; -RguFlowCntrlInd *flowCntrlInd; -#endif +S16 RlcLiRguFlowCntrlInd(Pst *pst,SuId suId,RguFlowCntrlInd *flowCntrlInd) { RlcCb *tRlcCb; RlcDlRbCb *rbCb = NULLP; - U32 idx; - U32 lcIdx; + uint32_t idx; + uint32_t lcIdx; tRlcCb = RLC_GET_RLCCB(pst->dstInst); for (idx = 0; idx < flowCntrlInd->numUes; idx++) @@ -762,7 +479,7 @@ RguFlowCntrlInd *flowCntrlInd; rlcUtlTrigPdbFlowCntrl(tRlcCb, rbCb, lcInfo->pktAdmitCnt); continue; } - if (rbCb->mode == CM_LTE_MODE_AM) + if (rbCb->mode == RLC_MODE_AM) { if ((rbCb->m.amDl.retxLst.count != 0) || ((rbCb->m.amDl.bo == 0) || @@ -810,28 +527,14 @@ RguFlowCntrlInd *flowCntrlInd; * -# RFAILED * */ -#ifdef ANSI -S16 RlcLiRguHqStaInd -( -Pst *pst, -SuId suId, -RguHarqStatusInd *staInd -) -#else -S16 RlcLiRguHqStaInd(pst,suId,staInd) -Pst *pst; -SuId suId; -RguHarqStatusInd *staInd; -#endif +S16 RlcLiRguHqStaInd(Pst *pst, SuId suId,RguHarqStatusInd *staInd) { RlcUeKey ueKey; - S16 ret; - RlcDlUeCb *ueCb; - U8 tbIdx; - RlcCb *tRlcCb; - - TRC3(RlcLiRguHqStaInd) + S16 ret; + RlcDlUeCb *ueCb; + uint8_t tbIdx; + RlcCb *tRlcCb; tRlcCb = RLC_GET_RLCCB(pst->dstInst); ueKey.cellId = staInd->cellId;