X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_tom.c;h=dc5ec8c2ad36cf6082fc740c92681df3f672d512;hb=refs%2Fchanges%2F90%2F5490%2F4;hp=0bd91d4d55ab0a293e679d7c81ed1fbddb47e740;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c index 0bd91d4d5..dc5ec8c2a 100755 --- a/src/5gnrmac/rg_tom.c +++ b/src/5gnrmac/rg_tom.c @@ -63,13 +63,13 @@ invoked by PHY towards MAC /* ADD Changes for Downlink UE Timing Optimization */ #ifndef LTEMAC_DLUE_TMGOPTMZ -PRIVATE S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb, +static S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb, RgErrInfo *err)); #else S16 rgTOMUtlProcDlSf ARGS((RgDlSf *dlSf, RgCellCb *cellCb, RgErrInfo *err)); #endif -PRIVATE S16 rgTOMProcCrntiCEInDatInd ARGS(( +static S16 rgTOMProcCrntiCEInDatInd ARGS(( RgMacPdu *pdu, RgUeCb *prevUeCb, RgCellCb *cellCb, @@ -78,7 +78,7 @@ RgInfCeInfo *ceInfo, uint16_t slot )); -PRIVATE S16 rgTOMProcCCCHSduInDatInd ARGS(( +static S16 rgTOMProcCCCHSduInDatInd ARGS(( RgMacPdu *pdu, RgUeCb *prevUeCb, RgCellCb *cellCb, @@ -93,27 +93,27 @@ RgCellCb *cell, RgInfSfAlloc *sfInfo ); -EXTERN S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd); +S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd); #ifdef EMTC_ENABLE -EXTERN S16 rgEmtcHndl(RgCellCb *cell,RgInfSfAlloc *sfInfo); -EXTERN S16 rgTOMEmtcUtlFillDatReqPdus(TfuDatReqInfo *datInfo, RgDlSf *dlSf, RgCellCb *cell, RgErrInfo *err); -EXTERN Void rgTOMEmtcRlsSf(RgDlSf *dlSf); +S16 rgEmtcHndl(RgCellCb *cell,RgInfSfAlloc *sfInfo); +S16 rgTOMEmtcUtlFillDatReqPdus(TfuDatReqInfo *datInfo, RgDlSf *dlSf, RgCellCb *cell, RgErrInfo *err); +Void rgTOMEmtcRlsSf(RgDlSf *dlSf); #endif #ifdef LTE_L2_MEAS -PRIVATE Void rgTOML2MCompileActiveLCs ARGS +static Void rgTOML2MCompileActiveLCs ARGS (( RgCellCb *cellCb, RgUeCb *ueCb, RgMacPdu *pdu, RgInfCeInfo *ceInfo )); -PRIVATE S16 rgTOMUtlL2MStoreBufSz ARGS +static S16 rgTOMUtlL2MStoreBufSz ARGS (( RgUeCb *ueCb, RgInfCeInfo *ceInfo )); -PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo ARGS +static S16 rgTomUtlPrepareL2MUlThrpInfo ARGS (( RgCellCb *cellCb, RgUeCb *ueCb, @@ -126,7 +126,7 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo ARGS TB, which is not guaranteed if higher Range values are used */ /* Note: taking value 10 for BSR index 1 */ #ifndef MAC_5GTF_UPDATE -PRIVATE uint32_t rgLwrBsrTbl[64] = { +static uint32_t rgLwrBsrTbl[64] = { 0, 10, 10, 12, 14, 17, 19, 22, 26, 31, 36, 42, 49, 57, 67, 78, 91, 107, 125, 146, 171, 200, 234, 274, 321, @@ -138,7 +138,7 @@ PRIVATE uint32_t rgLwrBsrTbl[64] = { }; #else -PRIVATE uint32_t rgLwrBsrTbl[64] = { +static uint32_t rgLwrBsrTbl[64] = { 0,10,13,16,19,23,29,35,43,53,65,80,98,120,147,181,223,274,337,414, 509,625,769,945,1162,1429,1757,2161,2657,3267,4017,4940,6074,7469, 9185,11294,13888,17077,20999,25822,31752,39045,48012,59039,72598, @@ -158,7 +158,7 @@ PRIVATE uint32_t rgLwrBsrTbl[64] = { /* global variables */ uint32_t rgUlrate_tfu; #ifdef EMTC_ENABLE -EXTERN uint32_t grgUlrate_tfu; +uint32_t grgUlrate_tfu; #endif /** @brief This function fills the PDSCH data of a downlink subframe @@ -181,21 +181,7 @@ EXTERN uint32_t grgUlrate_tfu; * -# ROK * -# RFAILED */ -#ifdef ANSI -PRIVATE S16 rgTOMUtlFillDatReqPdus -( - TfuDatReqInfo *datInfo, - RgDlSf *dlSf, - RgCellCb *cellCb, - RgErrInfo *err - ) -#else -PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) - TfuDatReqInfo *datInfo; - RgDlSf *dlSf; - RgCellCb *cellCb; - RgErrInfo *err; -#endif +static S16 rgTOMUtlFillDatReqPdus (TfuDatReqInfo *datInfo,RgDlSf *dlSf,RgCellCb *cellCb, RgErrInfo *err) { S16 ret; TfuDatReqPduInfo *datReq=NULLP; @@ -371,33 +357,9 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) */ /* ADD Changes for Downlink UE Timing Optimization */ #ifndef LTEMAC_DLUE_TMGOPTMZ -#ifdef ANSI -PRIVATE S16 rgTOMUtlProcDlSf -( - RgDlSf *dlSf, - RgCellCb *cellCb, - RgErrInfo *err - ) +static S16 rgTOMUtlProcDlSf(RgDlSf *dlSf,RgCellCb *cellCb,RgErrInfo *err) #else -PRIVATE S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) - RgDlSf *dlSf; - RgCellCb *cellCb; - RgErrInfo *err; -#endif -#else -#ifdef ANSI -S16 rgTOMUtlProcDlSf -( - RgDlSf *dlSf, - RgCellCb *cellCb, - RgErrInfo *err - ) -#else -S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) - RgDlSf *dlSf; - RgCellCb *cellCb; - RgErrInfo *err; -#endif +S16 rgTOMUtlProcDlSf(RgDlSf *dlSf,RgCellCb *cellCb,RgErrInfo *err) #endif { S16 ret; @@ -454,7 +416,7 @@ S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) if((datInfo->pdus.count) || (datInfo->bchDat.pres == TRUE)) { /* sending the data to Phy */ - if (rgLIMTfuDatReq(inst,datInfo) != ROK) + //if (rgLIMTfuDatReq(inst,datInfo) != ROK) { RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to send data info for cell"); } @@ -485,22 +447,12 @@ uint32_t rgMacGT; * -# ROK * -# RFAILED */ -#ifdef ANSI -PRIVATE S16 rgTOMUtlAllocPduEvnt -( -Inst inst, - RgMacPdu **pdu - ) -#else -PRIVATE S16 rgTOMUtlAllocPduEvnt (inst,pdu) -Inst inst; - RgMacPdu **pdu; -#endif +static S16 rgTOMUtlAllocPduEvnt (Inst inst,RgMacPdu **pdu) { Mem evntMem; RgUstaDgn dgn; /* Alarm diagnostics structure */ - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; evntMem.region = rgCb[inst].rgInit.region; @@ -543,17 +495,7 @@ Inst inst; * @param [in] Bool *error * @return */ -#ifdef ANSI -PRIVATE Void rgTOMUtlFreePduEvnt -( - RgMacPdu *pdu, - Bool error - ) -#else -PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error) - RgMacPdu *pdu; - Bool error; -#endif +static Void rgTOMUtlFreePduEvnt( RgMacPdu *pdu,Bool error) { RgMacSdu *sdu; @@ -592,22 +534,12 @@ PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error) * -# ROK * -# RFAILED */ -#ifdef ANSI -PRIVATE S16 rgTOMInfAllocPduEvnt -( -Inst inst, -RgInfSfDatInd **sfInfo - ) -#else -PRIVATE S16 rgTOMInfAllocPduEvnt (inst,sfInfo) -Inst inst; -RgInfSfDatInd **sfInfo; -#endif +static S16 rgTOMInfAllocPduEvnt (Inst inst,RgInfSfDatInd **sfInfo) { Mem evntMem; RgUstaDgn dgn; /* Alarm diagnostics structure */ - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; evntMem.region = rgCb[inst].rgInit.region; @@ -648,15 +580,7 @@ RgInfSfDatInd **sfInfo; * @param [in] Bool *error * @return */ -#ifdef ANSI -PRIVATE Void rgTOMInfFreePduEvnt -( -RgInfSfDatInd *sfInfo - ) -#else -PRIVATE Void rgTOMInfFreePduEvnt (sfInfo) -RgInfSfDatInd *sfInfo; -#endif +static Void rgTOMInfFreePduEvnt(RgInfSfDatInd *sfInfo) { RG_FREE_MEM(sfInfo); @@ -681,19 +605,7 @@ RgInfSfDatInd *sfInfo; * @param [out] RgRguDedDatInd *dDatInd * @return */ -#ifdef ANSI -PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo -( - RgCellCb *cellCb, - RgUeCb *ueCb, - RgRguDedDatInd *dDatInd - ) -#else -PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) - RgCellCb *cellCb; - RgUeCb *ueCb; - RgRguDedDatInd *dDatInd; -#endif +static S16 rgTomUtlPrepareL2MUlThrpInfo(RgCellCb *cellCb,RgUeCb *ueCb,RgRguDedDatInd *dDatInd) { uint8_t lcId; uint8_t lcgId; @@ -750,47 +662,26 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) RgUeCb *glblueCb5; #ifdef LTEMAC_SPS -#ifdef ANSI -PRIVATE S16 rgTOMUtlProcMsg +static S16 rgTOMUtlProcMsg ( - RgCellCb *cellCb, - RgUeCb *ueCb, - RgMacPdu *pdu, - Bool isSpsRnti, - Bool *spsToBeActvtd, - uint16_t *sduSize, - uint16_t slot, - uint32_t *lcgBytes - ) -#else -PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes) - RgCellCb *cellCb; - RgUeCb *ueCb; - RgMacPdu *pdu; - Bool isSpsRnti; - Bool *spsToBeActvtd; - uint16_t *sduSize; - uint16_t slot; - uint32_t *lcgBytes; -#endif +RgCellCb *cellCb, +RgUeCb *ueCb, +RgMacPdu *pdu, +Bool isSpsRnti, +Bool *spsToBeActvtd, +uint16_t *sduSize, +uint16_t slot, +uint32_t *lcgBytes +) #else /* LTEMAC_SPS */ -#ifdef ANSI -PRIVATE S16 rgTOMUtlProcMsg +static S16 rgTOMUtlProcMsg ( - RgCellCb *cellCb, - RgUeCb *ueCb, - RgMacPdu *pdu, - uint16_t slot, - uint32_t *lcgBytes - ) -#else -PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) - RgCellCb *cellCb; - RgUeCb *ueCb; - RgMacPdu *pdu; - uint16_t slot; - uint32_t *lcgByes; -#endif +RgCellCb *cellCb, +RgUeCb *ueCb, +RgMacPdu *pdu, +uint16_t slot, +uint32_t *lcgBytes +) #endif { Inst inst = cellCb->macInst - RG_INST_START; @@ -928,7 +819,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) } #ifdef RLC_STA_PROC_IN_MAC/* RLC Status PDU Processing */ { - extern S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, + S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu); if(ROK == rlcProcDlStatusPdu(&(cellCb->rguDlSap->sapCfg.sapPst), @@ -1126,8 +1017,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) * @return */ #ifdef LTEMAC_SPS -#ifdef ANSI -PRIVATE S16 rgTOMUtlInsSchInfo +static S16 rgTOMUtlInsSchInfo ( RgMacPdu *pdu, RgInfSfDatInd *sfInfo, @@ -1138,19 +1028,7 @@ uint16_t sduSize, uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes) -RgMacPdu *pdu; -RgInfSfDatInd *sfInfo; -RgInfCeInfo *ceInfo; -CmLteRnti rnti; -Bool spsToBeActvtd; -uint16_t sduSize; -uint32_t *lcgBytes; -#endif - -#else -#ifdef ANSI -PRIVATE S16 rgTOMUtlInsSchInfo +static S16 rgTOMUtlInsSchInfo ( RgMacPdu *pdu, RgInfSfDatInd *sfInfo, @@ -1158,14 +1036,6 @@ RgInfCeInfo *ceInfo, CmLteRnti rnti, uint32_t *lcgBytes ) -#else -PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes) -RgMacPdu *pdu; -RgInfSfDatInd *sfInfo; -RgInfCeInfo *ceInfo; -CmLteRnti rnti; -uint32_t *lcgBytes; -#endif #endif { S16 ret; @@ -1238,17 +1108,7 @@ uint32_t *lcgBytes; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgTOMDatInd -( -Inst inst, - TfuDatIndInfo *datInd - ) -#else -S16 rgTOMDatInd(inst,datInd) -Inst inst; - TfuDatIndInfo *datInd; -#endif +S16 rgTOMDatInd(Inst inst, TfuDatIndInfo *datInd) { S16 ret = ROK; RgErrInfo err; @@ -1323,7 +1183,7 @@ Inst inst; { datInfo = (TfuDatInfo*)node->node; { - //extern uint32_t ulrate_tfu; + //uint32_t ulrate_tfu; MsgLen len; SFndLenMsg(datInfo->mBuf, &len); #ifdef STUB_TTI_HANDLING_5GTF @@ -1532,21 +1392,13 @@ Inst inst; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgHndlCmnChnl +static S16 rgHndlCmnChnl ( RgCellCb *cell, CmLteTimingInfo timingInfo, RgInfCmnLcInfo *cmnLcInfo, RgErrInfo *err ) -#else -PRIVATE S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err) -RgCellCb *cell; -CmLteTimingInfo timingInfo; -RgInfCmnLcInfo *cmnLcInfo; -RgErrInfo *err; -#endif { #if (ERRCLASS & ERRCLS_DEBUG) RgPcchLcCb *pcch; @@ -1723,21 +1575,13 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgHndlSchdUe +static S16 rgHndlSchdUe ( RgCellCb *cell, CmLteTimingInfo timingInfo, RgInfUeInfo *ueInfo, RgErrInfo *err ) -#else -PRIVATE S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */ -RgCellCb *cell; -CmLteTimingInfo timingInfo; -RgInfUeInfo *ueInfo; -RgErrInfo *err; -#endif { @@ -1767,19 +1611,12 @@ RgErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgHndlUlUeInfo +static S16 rgHndlUlUeInfo ( RgCellCb *cell, CmLteTimingInfo timingInfo, RgInfUlUeInfo *ueInfo ) -#else -PRIVATE S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo) -RgCellCb *cell; -CmLteTimingInfo timingInfo; -RgInfUlUeInfo *ueInfo; -#endif { Inst inst = cell->macInst - RG_INST_START; uint8_t idx; @@ -1848,17 +1685,7 @@ RgInfUlUeInfo *ueInfo; * @return S16 * -# ROK **/ -#ifdef ANSI -Void rgTOMRlsSf -( -Inst inst, -RgDlSf *dlSf -) -#else -Void rgTOMRlsSf(dlSf) -Inst inst; -RgDlSf *dlSf; -#endif +Void rgTOMRlsSf(Inst inst,RgDlSf *dlSf) { uint8_t idx; @@ -1945,17 +1772,7 @@ RgDlSf *dlSf; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgHndlFlowCntrl -( -RgCellCb *cell, -RgInfSfAlloc *sfInfo -) -#else -S16 rgHndlFlowCntrl(cell, sfInfo) -RgCellCb *cell; -RgInfSfAlloc *sfInfo; -#endif +S16 rgHndlFlowCntrl(RgCellCb *cell,RgInfSfAlloc *sfInfo) { RguFlowCntrlInd *flowCntrlInd; Pst *pst; @@ -2013,22 +1830,12 @@ RgInfSfAlloc *sfInfo; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 RgSchMacSfAllocReq -( -Pst *pst, -RgInfSfAlloc *sfInfo -) -#else -S16 RgSchMacSfAllocReq(pst, sfInfo) -Pst *pst; -RgInfSfAlloc *sfInfo; -#endif +S16 RgSchMacSfAllocReq(Pst *pst,RgInfSfAlloc *sfInfo) { RgCellCb *cell; RgDlSf *dlSf; RgErrInfo err; - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; Inst inst; @@ -2159,8 +1966,7 @@ RgInfSfAlloc *sfInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgTOMProcCrntiCEInDatInd +static S16 rgTOMProcCrntiCEInDatInd ( RgMacPdu *pdu, RgUeCb *prevUeCb, @@ -2169,15 +1975,6 @@ TfuDatInfo *datInfo, RgInfCeInfo *ceInfo, uint16_t slot ) -#else -PRIVATE S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) -RgMacPdu *pdu; -RgUeCb *prevUeCb; -RgCellCb *cellCb; -TfuDatInfo *datInfo; -RgInfCeInfo *ceInfo; -uint16_t slot; -#endif { RgUeCb *ueCb = NULLP; Inst inst = cellCb->macInst - RG_INST_START; @@ -2260,8 +2057,7 @@ uint16_t slot; * -# ROK * -# RFAILED **/ -#ifdef ANSI -PRIVATE S16 rgTOMProcCCCHSduInDatInd +static S16 rgTOMProcCCCHSduInDatInd ( RgMacPdu *pdu, RgUeCb *prevUeCb, @@ -2270,15 +2066,6 @@ TfuDatInfo *datInfo, RgInfCeInfo *ceInfo, uint16_t slot ) -#else -PRIVATE S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) -RgMacPdu *pdu; -RgUeCb *prevUeCb; -RgCellCb *cellCb; -TfuDatInfo *datInfo; -RgInfCeInfo *ceInfo; -uint16_t slot; -#endif { RgUeCb *ueCb = NULLP; Inst inst = cellCb->macInst - RG_INST_START; @@ -2358,17 +2145,7 @@ uint16_t slot; * @return S16 */ -#ifdef ANSI -PRIVATE S16 rgTOMUtlL2MStoreBufSz -( - RgUeCb *ueCb, - RgInfCeInfo *ceInfo - ) -#else -PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) - RgUeCb *ueCb; - RgInfCeInfo *ceInfo; -#endif +static S16 rgTOMUtlL2MStoreBufSz( RgUeCb *ueCb, RgInfCeInfo *ceInfo ) { uint8_t lcgId; uint8_t bsr; @@ -2409,21 +2186,7 @@ PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) * -# ROK * -# RFAILED */ -#ifdef ANSI -PRIVATE Void rgTOML2MCompileActiveLCs -( - RgCellCb *cellCb, - RgUeCb *ueCb, - RgMacPdu *pdu, - RgInfCeInfo *ceInfo - ) -#else -PRIVATE Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo) - RgCellCb *cellCb; - RgUeCb *ueCb; - RgMacPdu *pdu; - RgInfCeInfo *ceInfo; -#endif +static Void rgTOML2MCompileActiveLCs(RgCellCb *cellCb,RgUeCb *ueCb,RgMacPdu *pdu,RgInfCeInfo *ceInfo) { CmLList *node; RgMacSdu *sdu;