X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrmac%2Frg_tom.c;h=ba4d25def8f3051deb6ec1abeaf6e65df7604f7b;hb=27d8d877e837c2879a452538cdbe81afe48bed62;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..ba4d25def 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 @@ -182,7 +182,7 @@ EXTERN uint32_t grgUlrate_tfu; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgTOMUtlFillDatReqPdus +static S16 rgTOMUtlFillDatReqPdus ( TfuDatReqInfo *datInfo, RgDlSf *dlSf, @@ -190,7 +190,7 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus RgErrInfo *err ) #else -PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) +static S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) TfuDatReqInfo *datInfo; RgDlSf *dlSf; RgCellCb *cellCb; @@ -372,14 +372,14 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) /* ADD Changes for Downlink UE Timing Optimization */ #ifndef LTEMAC_DLUE_TMGOPTMZ #ifdef ANSI -PRIVATE S16 rgTOMUtlProcDlSf +static S16 rgTOMUtlProcDlSf ( RgDlSf *dlSf, RgCellCb *cellCb, RgErrInfo *err ) #else -PRIVATE S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) +static S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) RgDlSf *dlSf; RgCellCb *cellCb; RgErrInfo *err; @@ -454,7 +454,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"); } @@ -486,21 +486,21 @@ uint32_t rgMacGT; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgTOMUtlAllocPduEvnt +static S16 rgTOMUtlAllocPduEvnt ( Inst inst, RgMacPdu **pdu ) #else -PRIVATE S16 rgTOMUtlAllocPduEvnt (inst,pdu) +static S16 rgTOMUtlAllocPduEvnt (inst,pdu) Inst inst; - RgMacPdu **pdu; +RgMacPdu **pdu; #endif { Mem evntMem; RgUstaDgn dgn; /* Alarm diagnostics structure */ - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; evntMem.region = rgCb[inst].rgInit.region; @@ -544,13 +544,13 @@ Inst inst; * @return */ #ifdef ANSI -PRIVATE Void rgTOMUtlFreePduEvnt +static Void rgTOMUtlFreePduEvnt ( RgMacPdu *pdu, Bool error ) #else -PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error) +static Void rgTOMUtlFreePduEvnt (pdu, error) RgMacPdu *pdu; Bool error; #endif @@ -593,13 +593,13 @@ PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error) * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgTOMInfAllocPduEvnt +static S16 rgTOMInfAllocPduEvnt ( Inst inst, RgInfSfDatInd **sfInfo ) #else -PRIVATE S16 rgTOMInfAllocPduEvnt (inst,sfInfo) +static S16 rgTOMInfAllocPduEvnt (inst,sfInfo) Inst inst; RgInfSfDatInd **sfInfo; #endif @@ -607,7 +607,7 @@ 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; @@ -649,12 +649,12 @@ RgInfSfDatInd **sfInfo; * @return */ #ifdef ANSI -PRIVATE Void rgTOMInfFreePduEvnt +static Void rgTOMInfFreePduEvnt ( RgInfSfDatInd *sfInfo ) #else -PRIVATE Void rgTOMInfFreePduEvnt (sfInfo) +static Void rgTOMInfFreePduEvnt (sfInfo) RgInfSfDatInd *sfInfo; #endif { @@ -682,14 +682,14 @@ RgInfSfDatInd *sfInfo; * @return */ #ifdef ANSI -PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo +static S16 rgTomUtlPrepareL2MUlThrpInfo ( RgCellCb *cellCb, RgUeCb *ueCb, RgRguDedDatInd *dDatInd ) #else -PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) +static S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) RgCellCb *cellCb; RgUeCb *ueCb; RgRguDedDatInd *dDatInd; @@ -751,7 +751,7 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) #ifdef LTEMAC_SPS #ifdef ANSI -PRIVATE S16 rgTOMUtlProcMsg +static S16 rgTOMUtlProcMsg ( RgCellCb *cellCb, RgUeCb *ueCb, @@ -763,7 +763,7 @@ PRIVATE S16 rgTOMUtlProcMsg uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes) +static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes) RgCellCb *cellCb; RgUeCb *ueCb; RgMacPdu *pdu; @@ -775,7 +775,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, #endif #else /* LTEMAC_SPS */ #ifdef ANSI -PRIVATE S16 rgTOMUtlProcMsg +static S16 rgTOMUtlProcMsg ( RgCellCb *cellCb, RgUeCb *ueCb, @@ -784,7 +784,7 @@ PRIVATE S16 rgTOMUtlProcMsg uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) +static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) RgCellCb *cellCb; RgUeCb *ueCb; RgMacPdu *pdu; @@ -928,7 +928,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), @@ -1127,7 +1127,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) */ #ifdef LTEMAC_SPS #ifdef ANSI -PRIVATE S16 rgTOMUtlInsSchInfo +static S16 rgTOMUtlInsSchInfo ( RgMacPdu *pdu, RgInfSfDatInd *sfInfo, @@ -1138,7 +1138,7 @@ uint16_t sduSize, uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes) +static S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes) RgMacPdu *pdu; RgInfSfDatInd *sfInfo; RgInfCeInfo *ceInfo; @@ -1150,7 +1150,7 @@ uint32_t *lcgBytes; #else #ifdef ANSI -PRIVATE S16 rgTOMUtlInsSchInfo +static S16 rgTOMUtlInsSchInfo ( RgMacPdu *pdu, RgInfSfDatInd *sfInfo, @@ -1159,7 +1159,7 @@ CmLteRnti rnti, uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes) +static S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes) RgMacPdu *pdu; RgInfSfDatInd *sfInfo; RgInfCeInfo *ceInfo; @@ -1323,7 +1323,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 @@ -1533,7 +1533,7 @@ Inst inst; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgHndlCmnChnl +static S16 rgHndlCmnChnl ( RgCellCb *cell, CmLteTimingInfo timingInfo, @@ -1541,7 +1541,7 @@ RgInfCmnLcInfo *cmnLcInfo, RgErrInfo *err ) #else -PRIVATE S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err) +static S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err) RgCellCb *cell; CmLteTimingInfo timingInfo; RgInfCmnLcInfo *cmnLcInfo; @@ -1724,7 +1724,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgHndlSchdUe +static S16 rgHndlSchdUe ( RgCellCb *cell, CmLteTimingInfo timingInfo, @@ -1732,7 +1732,7 @@ RgInfUeInfo *ueInfo, RgErrInfo *err ) #else -PRIVATE S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */ +static S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */ RgCellCb *cell; CmLteTimingInfo timingInfo; RgInfUeInfo *ueInfo; @@ -1768,14 +1768,14 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgHndlUlUeInfo +static S16 rgHndlUlUeInfo ( RgCellCb *cell, CmLteTimingInfo timingInfo, RgInfUlUeInfo *ueInfo ) #else -PRIVATE S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo) +static S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo) RgCellCb *cell; CmLteTimingInfo timingInfo; RgInfUlUeInfo *ueInfo; @@ -2028,7 +2028,7 @@ RgInfSfAlloc *sfInfo; RgCellCb *cell; RgDlSf *dlSf; RgErrInfo err; - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; Inst inst; @@ -2160,7 +2160,7 @@ RgInfSfAlloc *sfInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgTOMProcCrntiCEInDatInd +static S16 rgTOMProcCrntiCEInDatInd ( RgMacPdu *pdu, RgUeCb *prevUeCb, @@ -2170,7 +2170,7 @@ RgInfCeInfo *ceInfo, uint16_t slot ) #else -PRIVATE S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) +static S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) RgMacPdu *pdu; RgUeCb *prevUeCb; RgCellCb *cellCb; @@ -2261,7 +2261,7 @@ uint16_t slot; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgTOMProcCCCHSduInDatInd +static S16 rgTOMProcCCCHSduInDatInd ( RgMacPdu *pdu, RgUeCb *prevUeCb, @@ -2271,7 +2271,7 @@ RgInfCeInfo *ceInfo, uint16_t slot ) #else -PRIVATE S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) +static S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) RgMacPdu *pdu; RgUeCb *prevUeCb; RgCellCb *cellCb; @@ -2359,13 +2359,13 @@ uint16_t slot; */ #ifdef ANSI -PRIVATE S16 rgTOMUtlL2MStoreBufSz +static S16 rgTOMUtlL2MStoreBufSz ( RgUeCb *ueCb, RgInfCeInfo *ceInfo ) #else -PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) +static S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) RgUeCb *ueCb; RgInfCeInfo *ceInfo; #endif @@ -2410,7 +2410,7 @@ PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) * -# RFAILED */ #ifdef ANSI -PRIVATE Void rgTOML2MCompileActiveLCs +static Void rgTOML2MCompileActiveLCs ( RgCellCb *cellCb, RgUeCb *ueCb, @@ -2418,7 +2418,7 @@ PRIVATE Void rgTOML2MCompileActiveLCs RgInfCeInfo *ceInfo ) #else -PRIVATE Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo) +static Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo) RgCellCb *cellCb; RgUeCb *ueCb; RgMacPdu *pdu;