X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_ram.c;h=ed7e0025c56d481fb9c26816a6ba6f943e483300;hb=d677deafcfd8b9984be18a25398502a84684d44c;hp=a5b5f7da520eae09fcbdc86943600536fe868b81;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_ram.c b/src/5gnrsch/rg_sch_ram.c index a5b5f7da5..ed7e0025c 100755 --- a/src/5gnrsch/rg_sch_ram.c +++ b/src/5gnrsch/rg_sch_ram.c @@ -32,9 +32,6 @@ @brief This file has APIs to handle the random access procedure functionality for the scheduler. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=171; /* header include files (.h) */ #include "common_def.h" @@ -49,8 +46,6 @@ static int RLOG_FILE_ID=171; #include "rg_sch_err.h" /* Scheduler error defines */ #include "rg_sch.h" /* Scheduler defines */ #include "rg_sch_cmn.h" -#include "rl_interface.h" -#include "rl_common.h" /* header/extern include files (.x) */ @@ -131,17 +126,7 @@ Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb *cell)); * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHRamVldtUeCfg -( -RgSchCellCb *cell, -RgrUeCfg *ueCfg -) -#else -S16 rgSCHRamVldtUeCfg(cell, ueCfg) -RgSchCellCb *cell; -RgrUeCfg *ueCfg; -#endif +S16 rgSCHRamVldtUeCfg(RgSchCellCb *cell,RgrUeCfg *ueCfg) { if (ueCfg->dedPreambleId.pres == PRSNT_NODEF) { @@ -183,10 +168,9 @@ RgrUeCfg *ueCfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHRamProcRaReq ( -uint8_t raReqCnt, +uint8_t raReqCnt, RgSchCellCb *cell, CmLteRnti raRnti, TfuRachInfo *raReqInd, @@ -194,22 +178,12 @@ CmLteTimingInfo timingInfo, RgSchUeCb *ue, RgSchErrInfo *err ) -#else -S16 rgSCHRamProcRaReq(raReqCnt, cell, raRnti, raReqInd, timingInfo, ue, err) -uint8_t raReqCnt; -RgSchCellCb *cell; -CmLteRnti raRnti; -TfuRachInfo *raReqInd; -CmLteTimingInfo timingInfo; -RgSchUeCb *ue; -RgSchErrInfo *err; -#endif { RgSchRaReqInfo *raReqInfo; - uint16_t raIndex; + uint16_t raIndex; #ifdef LTE_TDD - uint8_t fid; - uint8_t tid; + uint8_t fid; + uint8_t tid; #endif @@ -239,9 +213,7 @@ RgSchErrInfo *err; /* allocate new raReqInfos and enqueue them */ if (raReqInd->raReqInfoArr[raReqCnt].rapId >= RGSCH_MAX_NUM_RA_PREAMBLE) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "RARNTI:%d rgSCHTomRaReqInd(): RAM processing failed errType(%d) ", - raReqInd->raRnti); + DU_LOG("\nERROR --> SCH : RARNTI:%d rgSCHTomRaReqInd(): RAM processing failed", raReqInd->raRnti); return RFAILED; } @@ -270,7 +242,7 @@ RgSchErrInfo *err; if((rgSCHUtlAllocSBuf(cell->instIdx, (Data **)(&raReqInfo), sizeof(RgSchRaReqInfo))) == RFAILED) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamProcRaReq(): Allocation" + DU_LOG("\nERROR --> SCH : rgSCHRamProcRaReq(): Allocation" " of RaReq failed RARNTI:%d",raRnti); err->errCause = RGSCHERR_RAM_MEM_EXHAUST; return RFAILED; @@ -319,19 +291,12 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHRamCreateRaCb ( RgSchCellCb *cell, RgSchRaCb **raCb, RgSchErrInfo *err ) -#else -S16 rgSCHRamCreateRaCb(cell, raCb, err) -RgSchCellCb *cell; -RgSchRaCb **raCb; -RgSchErrInfo *err; -#endif { RgSchRntiLnk *rntiLnk; Inst inst = cell->instIdx; @@ -340,7 +305,7 @@ RgSchErrInfo *err; if((rgSCHUtlAllocSBuf(inst, (Data **)(raCb), sizeof(RgSchRaCb))) == RFAILED) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamCreateRaCb(): Allocation of " + DU_LOG("\nERROR --> SCH : rgSCHRamCreateRaCb(): Allocation of " "RaCb failed"); err->errCause = RGSCHERR_RAM_MEM_EXHAUST; return RFAILED; @@ -359,7 +324,7 @@ RgSchErrInfo *err; rgNumRarFailDuetoRntiExhaustion++; /* No rnti available! */ - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamCreateRaCb(): Allocation of " + DU_LOG("\nERROR --> SCH : rgSCHRamCreateRaCb(): Allocation of " "temporary RNTI failed at MAC(CRNTI exhausted)"); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -373,7 +338,7 @@ RgSchErrInfo *err; if ((*raCb)->dlHqE == NULLP) { /* No memory available! */ - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamCreateRaCb(): Creation of" + DU_LOG("\nERROR --> SCH : rgSCHRamCreateRaCb(): Creation of" " DL HARQ failed"); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -421,7 +386,6 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHRamRgrUeCfg ( RgSchCellCb *cell, @@ -429,13 +393,6 @@ RgSchUeCb *ue, RgSchRaCb *raCb, RgSchErrInfo *err ) -#else -S16 rgSCHRamRgrUeCfg(cell, ue, raCb, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchRaCb *raCb; -RgSchErrInfo *err; -#endif { /* Releasing HARQ processes of old UE when ue * reconfig with new crnti */ @@ -495,7 +452,6 @@ RgSchErrInfo *err; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 rgSCHRamContResCrnti ( RgSchCellCb *cell, @@ -503,13 +459,6 @@ RgSchUeCb *ue, RgSchRaCb *raCb, RgSchErrInfo *err ) -#else -static S16 rgSCHRamContResCrnti(cell, ue, raCb, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchRaCb *raCb; -RgSchErrInfo *err; -#endif { TfuUlCqiRpt ulCqiRpt; RgSchCmnCell *cellSch= (RgSchCmnCell *)(cell->sc.sch); @@ -561,17 +510,11 @@ RgSchErrInfo *err; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 rgSCHRamContResCcchsdu ( RgSchCellCb *cell, RgSchRaCb *raCb ) -#else -static S16 rgSCHRamContResCcchsdu(cell, raCb) -RgSchCellCb *cell; -RgSchRaCb *raCb; -#endif { #ifdef RGR_V1 CmLteTimingInfo expTime = {0}; @@ -579,8 +522,7 @@ RgSchRaCb *raCb; #endif if(raCb->raState != RGSCH_RA_MSG3_PENDING) { - RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, - "RNTI:%d RaCb in wrong State %d Drop Msg 3", + DU_LOG("\nERROR --> SCH : RNTI:%d RaCb in wrong State %d Drop Msg 3", raCb->rntiLnk->rnti, raCb->raState); return ROK; @@ -626,7 +568,6 @@ RgSchRaCb *raCb; * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHRamProcMsg3 ( RgSchCellCb *cell, @@ -635,14 +576,6 @@ RgSchRaCb *raCb, RgInfUeDatInd *pdu, RgSchErrInfo *err ) -#else -S16 rgSCHRamProcMsg3(cell, ue, raCb, pdu, err) -RgSchCellCb *cell; -RgSchUeCb *ue; -RgSchRaCb *raCb; -RgInfUeDatInd *pdu; -RgSchErrInfo *err; -#endif { @@ -691,19 +624,12 @@ RgSchErrInfo *err; * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHRamUpdtBo ( RgSchCellCb *cell, RgSchRaCb *raCb, RgInfCmnBoRpt *staRsp ) -#else -S16 rgSCHRamUpdtBo(cell, raCb, staRsp) -RgSchCellCb *cell; -RgSchRaCb *raCb; -RgInfCmnBoRpt *staRsp; -#endif { /* Update Bo in RaCb */ @@ -734,15 +660,7 @@ RgInfCmnBoRpt *staRsp; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgSCHRamMsg3DatInd -( -RgSchRaCb *raCb -) -#else -S16 rgSCHRamMsg3DatInd(raCb) -RgSchRaCb *raCb; -#endif +S16 rgSCHRamMsg3DatInd(RgSchRaCb *raCb) { /* SR_RACH_STATS : MSG3 ACK*/ @@ -768,15 +686,7 @@ RgSchRaCb *raCb; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgSCHRamMsg3FailureInd -( -RgSchRaCb *raCb -) -#else -S16 rgSCHRamMsg3FailureInd(raCb) -RgSchRaCb *raCb; -#endif +S16 rgSCHRamMsg3FailureInd(RgSchRaCb *raCb) { /*ccpu00128820 - MOD - Msg3 alloc double delete issue*/ @@ -800,15 +710,7 @@ RgSchRaCb *raCb; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgSCHRamMsg4FdbkInd -( -RgSchRaCb *raCb -) -#else -S16 rgSCHRamMsg4FdbkInd(raCb) -RgSchRaCb *raCb; -#endif +S16 rgSCHRamMsg4FdbkInd(RgSchRaCb *raCb) { return ROK; @@ -832,21 +734,10 @@ RgSchRaCb *raCb; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgSCHRamMsg4Done -( -RgSchCellCb *cell, -RgSchRaCb *raCb -) -#else -S16 rgSCHRamMsg4Done(cell, raCb) -RgSchCellCb *cell; -RgSchRaCb *raCb; -#endif +S16 rgSCHRamMsg4Done(RgSchCellCb *cell,RgSchRaCb *raCb) { - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHRamMsg4Done(): tmpCRNTI = %u", + DU_LOG("\nDEBUG --> SCH : rgSCHRamMsg4Done(): tmpCRNTI = %u", raCb->tmpCrnti); if(raCb->ue != NULLP) @@ -885,7 +776,7 @@ RgSchRaCb *raCb; else if(raCb->toDel == TRUE) { #ifdef XEON_SPECIFIC_CHANGES - CM_LOG_DEBUG(CM_LOG_ID_SCH, "Deleting RacB:%d\n", raCb->tmpCrnti); + DU_LOG("\nDEBUG --> SCH : Deleting RacB:%d\n", raCb->tmpCrnti); #endif /* Delete RACB and release RNTI */ rgSCHRamDelRaCb(cell, raCb, TRUE); @@ -893,14 +784,12 @@ RgSchRaCb *raCb; else { #ifdef XEON_SPECIFIC_CHANGES - CM_LOG_DEBUG(CM_LOG_ID_SCH, "Releasing Harq of RacB:%d\n", raCb->tmpCrnti); + DU_LOG("\nDEBUG --> SCH : Releasing Harq of RacB:%d\n", raCb->tmpCrnti); #endif raCb->raState = RGSCH_RA_MSG4_DONE; /* Release harq process as final feedback is received for Msg4. In other * cases, delRaCb will take care of releasing the harq process */ - printf("=======Harq process released \n"); - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, - "Harq process released "); + DU_LOG("\nDEBUG --> SCH : Harq process released "); rgSCHDhmRlsHqpTb(raCb->dlHqE->msg4Proc, 0, TRUE); } @@ -925,22 +814,10 @@ RgSchRaCb *raCb; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHRamDelRaCb -( -RgSchCellCb *cell, -RgSchRaCb *raCb, -Bool rlsRnti -) -#else -S16 rgSCHRamDelRaCb(cell, raCb, rlsRnti) -RgSchCellCb *cell; -RgSchRaCb *raCb; -Bool rlsRnti; -#endif +S16 rgSCHRamDelRaCb(RgSchCellCb *cell,RgSchRaCb *raCb,Bool rlsRnti) { - Inst inst = cell->instIdx; - Bool isEmtc = FALSE; + Inst inst = cell->instIdx; + Bool isEmtc = FALSE; /* Delete from all the lists it is enqueued */ cmLListDelFrm(&(cell->raInfo.raCbLst),&(raCb->raCbLnk)); @@ -982,7 +859,7 @@ Bool rlsRnti; if ((raCb->dlHqE->msg4Proc->subFrm != NULLP) && (raCb->dlHqE->msg4Proc->hqPSfLnk.node != NULLP)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"TMP CRNTI:%d RACH FAILURE!! " + DU_LOG("\nERROR --> SCH : TMP CRNTI:%d RACH FAILURE!! " "msg4proc removed from SF", raCb->tmpCrnti); rgSCHUtlDlHqPTbRmvFrmTx(raCb->dlHqE->msg4Proc->subFrm, raCb->dlHqE->msg4Proc, 0, FALSE); @@ -1052,30 +929,21 @@ Bool rlsRnti; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgSCHRamTtiHndlr -( -RgSchCellCb *cell -) -#else -S16 rgSCHRamTtiHndlr(cell) -RgSchCellCb *cell; -#endif +S16 rgSCHRamTtiHndlr(RgSchCellCb *cell) { RgSchRaCb *raCb; - uint16_t raSfn; - uint16_t crntSfn; - uint16_t dist; /* Number of frames between raCb's creation and crnt - frame */ - uint8_t idx; - uint32_t maxCnt; + uint16_t raSfn; + uint16_t crntSfn; + uint16_t dist; /* Number of frames between raCb's creation and crnt frame */ + uint8_t idx; + uint32_t maxCnt; #ifndef LTE_TDD - uint8_t winGap; - uint8_t raIdx; + uint8_t winGap; + uint8_t raIdx; RgSchRaReqInfo *raReqInfo; #else CmLteTimingInfo frm; - uint8_t raIdx; + uint8_t raIdx; #endif @@ -1181,25 +1049,17 @@ RgSchCellCb *cell; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgSCHRamFreeCell -( -RgSchCellCb *cell -) -#else -S16 rgSCHRamFreeCell(cell) -RgSchCellCb *cell; -#endif +S16 rgSCHRamFreeCell(RgSchCellCb *cell) { RgSchRaReqInfo *raReqInfo; RgSchRaCb *raCb; - uint8_t idx; - uint8_t raCbCnt; + uint8_t idx; + uint8_t raCbCnt; Inst inst = cell->instIdx; - uint8_t lstSz; + uint8_t lstSz; #ifdef LTE_TDD - uint8_t maxUlSubframes; - uint8_t maxDlSubframes; + uint8_t maxUlSubframes; + uint8_t maxDlSubframes; #endif @@ -1270,17 +1130,7 @@ RgSchCellCb *cell; return ROK; } /* rgSCHRamFreeCell */ #ifdef RGR_V1 -#ifdef ANSI -static Void rgSCHRamProcContResExp -( -RgSchCellCb *cell, -RgSchRaCb *raCb -) -#else -static Void rgSCHRamProcContResExp (cell, raCb) -RgSchCellCb *cell; -RgSchRaCb *raCb; -#endif +static Void rgSCHRamProcContResExp(RgSchCellCb *cell,RgSchRaCb *raCb) { raCb->expiryTime.sfn = RGSCH_CONTRES_EXP; /*MSG4 Fix*/ @@ -1299,17 +1149,7 @@ RgSchRaCb *raCb; return; } -#ifdef ANSI -static Void rgSCHRamProcContResGrdExp -( -RgSchCellCb *cell, -RgSchRaCb *raCb -) -#else -static Void rgSCHRamProcContResGrdExp (cell, raCb) -RgSchCellCb *cell; -RgSchRaCb *raCb; -#endif +static Void rgSCHRamProcContResGrdExp(RgSchCellCb *cell,RgSchRaCb *raCb) { @@ -1326,8 +1166,7 @@ RgSchRaCb *raCb; raCb->contResTmrLnk.node = NULLP; /* MSG4 Fix Start */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "Con Res Grd Tmr exp RNTI:%d", + DU_LOG("\nDEBUG --> SCH : Con Res Grd Tmr exp RNTI:%d", raCb->rntiLnk->rnti); rgSCHRamAddToRaInfoSchdLst(cell, raCb); /* MSG4 Fix End */ @@ -1348,18 +1187,10 @@ RgSchRaCb *raCb; * -# ROK * -# RFAILED **/ -#ifdef ANSI -static Void rgSCHChkContResTmrExp -( -RgSchCellCb *cell -) -#else -static Void rgSCHChkContResTmrExp(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHChkContResTmrExp(RgSchCellCb *cell) { - CmLList *chkLnk = NULLP; - RgSchRaCb *raCb = NULLP; + CmLList *chkLnk = NULLP; + RgSchRaCb *raCb = NULLP; chkLnk = cmLListFirst(&(cell->contResTmrLst)); @@ -1394,18 +1225,10 @@ RgSchCellCb *cell; * -# ROK * -# RFAILED **/ -#ifdef ANSI -static Void rgSCHChkContResGrdTmrExp -( -RgSchCellCb *cell -) -#else -static Void rgSCHChkContResGrdTmrExp(cell) -RgSchCellCb *cell; -#endif +static Void rgSCHChkContResGrdTmrExp(RgSchCellCb *cell) { - CmLList *chkLnk = NULLP; - RgSchRaCb *raCb = NULLP; + CmLList *chkLnk = NULLP; + RgSchRaCb *raCb = NULLP; chkLnk = cmLListFirst(&(cell->contResGrdTmrLst)); @@ -1445,29 +1268,22 @@ RgSchCellCb *cell; * @return S16 * -# ROK **/ -#ifdef ANSI S16 rgSCHRamDelRaReq ( -RgSchCellCb *cell, -CmLteTimingInfo timingInfo, -uint8_t raIdx +RgSchCellCb *cell, +CmLteTimingInfo timingInfo, +uint8_t raIdx ) -#else -S16 rgSCHRamDelRaReq(cell, timingInfo, raIdx) -RgSchCellCb *cell; -CmLteTimingInfo timingInfo; -uint8_t raIdx; -#endif { - uint8_t subfrmIdx; + uint8_t subfrmIdx; RgSchTddRachRspLst *rachRsp; - uint16_t sfnIdx; + uint16_t sfnIdx; S16 calcSfn; - uint8_t subfrm; + uint8_t subfrm; RgSchRaReqInfo *raReqInfo; - uint8_t idx; - uint8_t i; - uint8_t raRntiIdx; + uint8_t idx; + uint8_t i; + uint8_t raRntiIdx; CmLteRnti raRnti; @@ -1519,17 +1335,7 @@ uint8_t raIdx; #endif /*MSG4 Fix Start */ -#ifdef ANSI -S16 rgSCHRamAddToRaInfoSchdLst -( -RgSchCellCb *cell, -RgSchRaCb *raCb -) -#else -S16 rgSCHRamAddToRaInfoSchdLst(cell, raCb) -RgSchCellCb *cell; -RgSchRaCb *raCb; -#endif +S16 rgSCHRamAddToRaInfoSchdLst(RgSchCellCb *cell,RgSchRaCb *raCb) { CmLteTimingInfo expTime ={0}; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -1548,17 +1354,7 @@ RgSchRaCb *raCb; -#ifdef ANSI -S16 rgSCHRamRmvFrmRaInfoSchdLst -( -RgSchCellCb *cell, -RgSchRaCb *raCb -) -#else -S16 rgSCHRamRmvFrmRaInfoSchdLst(cell, raCb) -RgSchCellCb *cell; -RgSchRaCb *raCb; -#endif +S16 rgSCHRamRmvFrmRaInfoSchdLst(RgSchCellCb *cell,RgSchRaCb *raCb) { cmLListDelFrm(&(cell->raInfo.toBeSchdLst), &(raCb->schdLnk)); @@ -1584,22 +1380,13 @@ RgSchRaCb *raCb; * File : * **********************************************************/ -#ifdef ANSI static Void rgSCHRamUlFreeAllocation ( RgSchUlSf *sf, RgSchUlAlloc *alloc, RgSchCellCb *cell, Bool isEmtc - ) -#else -static Void rgSCHRamUlFreeAllocation(sf, alloc, cell,isEmtc) -RgSchUlSf *sf; -RgSchUlAlloc *alloc; -RgSchCellCb *cell; -Bool isEmtc; -#endif { rgSCHUhmFreeProc(alloc->hqProc, cell);