X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ptui.c;fp=src%2F5gnrmac%2Frg_ptui.c;h=f4d91207b9ca93c81ac4100fd0cd55d89d577681;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=ff502749f7dc7b183613fe906c4b11fd67609034;hpb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c index ff502749f..f4d91207b 100755 --- a/src/5gnrmac/rg_ptui.c +++ b/src/5gnrmac/rg_ptui.c @@ -83,7 +83,7 @@ extern "C" { #ifdef PTRGUIRGU /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiRguBndCfm ARGS((Pst* pst, SuId suId, U8 status)); +EXTERN S16 PtUiRguBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ EXTERN S16 PtUiRguCDatInd ARGS((Pst* pst, SuId suId, RguCDatIndInfo * datInd)); @@ -136,29 +136,29 @@ RgrUeStaIndInfo *staInd #ifdef PTRGUICRG /** @brief Confirmation from MAC to RRC for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiCrgBndCfm ARGS((Pst* pst, SuId suId, U8 status)); +EXTERN S16 PtUiCrgBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Configuration Confirm from MAC to RRC */ -EXTERN S16 PtUiCrgCfgCfm ARGS((Pst* pst, SuId suId, CrgCfgTransId transId, U8 status)); +EXTERN S16 PtUiCrgCfgCfm ARGS((Pst* pst, SuId suId, CrgCfgTransId transId, uint8_t status)); #endif /*--#ifdef PTRGUICRG--*/ #ifdef PTRGUIRGR /** @brief Confirmation from MAC to RRM for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiRgrBndCfm ARGS((Pst* pst, SuId suId, U8 status)); +EXTERN S16 PtUiRgrBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Configuration Confirm from MAC to RRM */ -EXTERN S16 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, U8 status)); +EXTERN S16 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status)); EXTERN S16 PtUiRgrTtiInd ARGS((Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd)); /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH -EXTERN S16 PtUiRgrSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, U8 status)); +EXTERN S16 PtUiRgrSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status)); EXTERN S16 PtUiRgrWarningSiCfgCfm ARGS((Pst* pst, SuId suId, - RgrCfgTransId transId, U8 siId, U8 status)); + RgrCfgTransId transId, uint8_t siId, uint8_t status)); #endif/*RGR_SI_SCH*/ #endif /*--#ifdef PTRGUIRGR--*/ #ifdef PTRGUIRGM S16 PtUiRgmPrbRprtInd ARGS((Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd)); -S16 PtUiRgmBndCfm ARGS((Pst* pst, SuId suId, U8 status)); +S16 PtUiRgmBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); S16 PtUiRgmTransModeInd ARGS((Pst* pst, SuId suId, RgmTransModeInd *transModeInd)); #endif S16 RgUiRgmSendPrbRprtInd ARGS((Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd)); @@ -544,7 +544,7 @@ PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] = * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -553,13 +553,13 @@ S16 RgUiRgrBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 RgUiRgrBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { @@ -576,7 +576,7 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -585,13 +585,13 @@ S16 RgUiRgmBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 RgUiRgmBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { @@ -647,7 +647,7 @@ RgrTtiIndInfo *ttiInd; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -656,13 +656,13 @@ S16 RgUiRgrCfgCfm ( Pst* pst, RgrCfgTransId transId, -U8 status +uint8_t status ) #else S16 RgUiRgrCfgCfm(pst, transId, status) Pst* pst; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { @@ -681,7 +681,7 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -690,13 +690,13 @@ S16 RgUiCrgBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 RgUiCrgBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { @@ -716,7 +716,7 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CrgCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -726,14 +726,14 @@ S16 RgUiCrgCfgCfm Pst* pst, SuId suId, CrgCfgTransId transId, -U8 status +uint8_t status ) #else S16 RgUiCrgCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; CrgCfgTransId transId; -U8 status; +uint8_t status; #endif { @@ -752,7 +752,7 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -761,13 +761,13 @@ S16 RgUiRguBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 RgUiRguBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { @@ -980,7 +980,7 @@ RguFlowCntrlInd *flowCntrlInd; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -990,14 +990,14 @@ S16 RgUiRgrSiCfgCfm Pst* pst, SuId suId, RgrCfgTransId transId, -U8 status +uint8_t status ) #else S16 RgUiRgrSiCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { @@ -1015,8 +1015,8 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 siId -* @param[in] U8 status +* @param[in] uint8_t siId +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1026,16 +1026,16 @@ S16 RgUiRgrWarningSiCfgCfm Pst* pst, SuId suId, RgrCfgTransId transId, -U8 siId, -U8 status +uint8_t siId, +uint8_t status ) #else S16 RgUiRgrWarningSiCfgCfm(pst, suId, transId, siId,status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 siId; -U8 status; +uint8_t siId; +uint8_t status; #endif { return ((*RgUiRgrWarningSiCfgCfmMt[pst->selector]) @@ -1160,7 +1160,7 @@ RgrUeStaIndInfo *ueStaInd; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1169,13 +1169,13 @@ S16 PtUiCrgBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 PtUiCrgBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { @@ -1199,7 +1199,7 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CrgCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1209,14 +1209,14 @@ S16 PtUiCrgCfgCfm Pst* pst, SuId suId, CrgCfgTransId transId, -U8 status +uint8_t status ) #else S16 PtUiCrgCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; CrgCfgTransId transId; -U8 status; +uint8_t status; #endif { @@ -1242,7 +1242,7 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1251,13 +1251,13 @@ S16 PtUiRguBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 PtUiRguBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { @@ -1491,7 +1491,7 @@ RguHarqStatusInd *flowCntrlInd; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1500,13 +1500,13 @@ S16 PtUiRgrBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 PtUiRgrBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { @@ -1568,7 +1568,7 @@ RgrTtiIndInfo *ttiInd; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1578,14 +1578,14 @@ S16 PtUiRgrCfgCfm Pst* pst, SuId suId, RgrCfgTransId transId, -U8 status +uint8_t status ) #else S16 PtUiRgrCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { @@ -1610,7 +1610,7 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1620,14 +1620,14 @@ S16 PtUiRgrSiCfgCfm Pst* pst, SuId suId, RgrCfgTransId transId, -U8 status +uint8_t status ) #else S16 PtUiRgrSiCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 status; +uint8_t status; #endif { @@ -1650,8 +1650,8 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] RgrCfgTransId transId -* @param[in] U8 siId -* @param[in] U8 status +* @param[in] uint8_t siId +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1661,16 +1661,16 @@ S16 PtUiRgrWarningSiCfgCfm Pst* pst, SuId suId, RgrCfgTransId transId, -U8 siId, -U8 status +uint8_t siId, +uint8_t status ) #else S16 PtUiRgrWarningSiCfgCfm(pst, suId, transId, siId, status) Pst* pst; SuId suId; RgrCfgTransId transId; -U8 siId; -U8 status; +uint8_t siId; +uint8_t status; #endif { UNUSED(pst); @@ -1810,7 +1810,7 @@ RgrUeStaIndInfo *ueStaInd; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -1819,13 +1819,13 @@ S16 PtUiRgmBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 PtUiRgmBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { @@ -1983,7 +1983,7 @@ PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo *datInd) if (NULLP == elem) { SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].pktDrop++; - U32 i,j; + uint32_t i,j; for(i = 0; i< datInd->numLch; i++) { for(j = 0; j < datInd->lchData[i].pdu.numPdu; j++) @@ -2019,7 +2019,7 @@ Void; { /* Read from Ring Buffer and process PDCP packets */ - U8 rngBufDeqIndx = 0; + uint8_t rngBufDeqIndx = 0; PRIVATE Pst rgDDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDDATREQ,0,0,2,0}; PRIVATE Pst rgCDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCDATREQ,0,0,2,0}; Void *elmIndx = NULLP; @@ -2028,7 +2028,7 @@ Void; while(NULLP != elmIndx) { datReqRing= (RguInfoRingElem *)elmIndx; - SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].nPktProc++;;//Number of pkt processed in tti + SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].nPktProc++;//Number of pkt processed in tti if(datReqRing->msg) { if(datReqRing->event == EVTRGUDDATREQ) @@ -2089,7 +2089,7 @@ Void; { /* Read from Ring Buffer and process PDCP packets */ - U8 rngBufDeqIndx = 0; + uint8_t rngBufDeqIndx = 0; PRIVATE Pst rgDStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDSTARSP,0,0,2,0}; PRIVATE Pst rgCStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCSTARSP,0,0,2,0}; Void *elmIndx = NULLP; @@ -2099,7 +2099,7 @@ Void; while(NULLP != elmIndx) { staRspRing= (RguInfoRingElem *)elmIndx; - SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].nPktProc++;;//Number of pkt processed in tti + SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].nPktProc++;//Number of pkt processed in tti if(staRspRing->msg!= NULLP) {