X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_amm_ul.c;h=500235226a7b62bb3f140aaab671122f8d323afa;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=9c052e3c5fb5b800486424b96836d9241cd3969a;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_amm_ul.c b/src/5gnrrlc/kw_amm_ul.c index 9c052e3c5..500235226 100755 --- a/src/5gnrrlc/kw_amm_ul.c +++ b/src/5gnrrlc/kw_amm_ul.c @@ -66,7 +66,7 @@ static int RLOG_FILE_ID=190; #ifndef RGL_SPECIFIC_CHANGES #ifndef TENB_ACC #ifndef LTE_PAL_ENB -extern uint32_t ulrate_rgu; +uint32_t ulrate_rgu; #endif #endif #endif @@ -74,11 +74,11 @@ extern uint32_t ulrate_rgu; #ifndef TENB_ACC #ifndef TENB_T2K3K_SPECIFIC_CHANGES #ifndef LTE_PAL_ENB -extern uint32_t isMemThreshReached(Region region); +uint32_t isMemThreshReached(Region region); #endif #else #ifndef LTE_PAL_ENB -extern uint32_t isMemThreshReached(Region region); +uint32_t isMemThreshReached(Region region); #endif #endif #endif @@ -90,38 +90,38 @@ extern uint32_t isMemThreshReached(Region region); /* private function declarations */ -void rlcAmmUlAssembleCntrlInfo ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb)); +static void rlcAmmUlAssembleCntrlInfo ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb)); -uint8_t rlcAmmExtractHdr ARGS ((RlcCb *gCb, +static uint8_t rlcAmmExtractHdr ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmHdr *amHdr, uint8_t *fByte)); -bool rlcAmmUlPlacePduInRecBuf ARGS ((RlcCb *gCb, +static bool rlcAmmUlPlacePduInRecBuf ARGS ((RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, RlcAmHdr *amHdr)); -void rlcAmmTriggerStatus ARGS ((RlcCb *gCb, +static void rlcAmmTriggerStatus ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool discFlg)); -uint8_t rlcAmmUlReassembleSdus ARGS ((RlcCb *gCb, +static uint8_t rlcAmmUlReassembleSdus ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf *recBuf)); -PRIVATE Void rlcAmmProcPduOrSeg ARGS ((RlcCb *gCb, +static Void rlcAmmProcPduOrSeg ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu)); -PRIVATE Void rlcAmmUpdExpByteSeg ARGS ((RlcCb *gCb,RlcAmUl *amUl, RlcSeg* newSeg)); +static Void rlcAmmUpdExpByteSeg ARGS ((RlcCb *gCb,RlcAmUl *amUl, RlcSeg* newSeg)); -PRIVATE Void rlcAmmExtractElmnt ARGS ((RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo)); +static Void rlcAmmExtractElmnt ARGS ((RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo)); -PRIVATE Void rlcAmmUlHndlStatusPdu ARGS ((RlcCb *gCb, +static Void rlcAmmUlHndlStatusPdu ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *cntrlPdu, uint8_t *fByte)); @@ -159,7 +159,7 @@ PRIVATE Void rlcAmmUlHndlStatusPdu ARGS ((RlcCb *gCb, * The number of bytes required to encode this NACK information * */ -uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ +static uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ uint16_t soStart, uint16_t soEnd, RlcUdxDlStaPdu *statusPdu, RlcSn *prevNackSn) { RlcNackInfo *nackInfo = (statusPdu->nackInfo + statusPdu->nackCount); @@ -278,7 +278,7 @@ uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ * @return Void * */ -void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) +static void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) { RlcUdxDlStaPdu *pStatusPdu; RlcNackInfo *nackInfo; @@ -464,7 +464,7 @@ void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) } #ifdef XEON_SPECIFIC_CHANGES -extern uint32_t gRlcDatIndUL; +uint32_t gRlcDatIndUL; #endif #ifdef T2K_TRIGGER_RLC_REEST @@ -569,7 +569,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) /* Changed the condition to TRUE from ROK */ if(isMemThreshReached(rlcCb[0]->init.region) == TRUE) { - extern uint32_t rlculdrop; + uint32_t rlculdrop; rlculdrop++; RLC_FREE_BUF(pdu); continue; @@ -580,7 +580,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) /*ccpu00142274 - UL memory based flow control*/ if(isMemThreshReached(rlcCb[0]->init.region) != ROK) { - extern uint32_t rlculdrop; + uint32_t rlculdrop; rlculdrop++; RLC_FREE_BUF(pdu); continue; @@ -768,7 +768,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) * -# RFAILED * */ -uint8_t rlcAmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmHdr *amHdr, uint8_t *fByte) +static uint8_t rlcAmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmHdr *amHdr, uint8_t *fByte) { uint8_t snByte; RlcSn sn = 0; @@ -842,7 +842,7 @@ uint8_t rlcAmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmHdr *amH * */ #ifdef ANSI -PRIVATE S16 rlcAmmExtractHdrOld +static S16 rlcAmmExtractHdrOld ( RlcCb *gCb, Buffer *pdu, @@ -850,7 +850,7 @@ RlcAmHdr *amHdr, uint8_t *fByte ) #else -PRIVATE S16 rlcAmmExtractHdrOld(gCb, pdu, amHdr, fByte) +static S16 rlcAmmExtractHdrOld(gCb, pdu, amHdr, fByte) RlcCb *gCb; Buffer *pdu; RlcAmHdr *amHdr; @@ -963,7 +963,7 @@ uint8_t *fByte; * @return Void * */ -void rlcAmmUlHndlStatusPdu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *cntrlPdu, uint8_t *fByte) +static void rlcAmmUlHndlStatusPdu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *cntrlPdu, uint8_t *fByte) { uint8_t e1; RlcExtHdr hdrInfo; @@ -1141,7 +1141,7 @@ void rlcAmmUlHndlStatusPdu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *cntrlPdu, uint8_ * @return Void * */ -void rlcAmmUlRlsAllSegs(RlcCb *gCb, RlcAmRecBuf *recBuf) +static void rlcAmmUlRlsAllSegs(RlcCb *gCb, RlcAmRecBuf *recBuf) { RlcSeg *seg; @@ -1177,7 +1177,7 @@ void rlcAmmUlRlsAllSegs(RlcCb *gCb, RlcAmRecBuf *recBuf) * -#TRUE Successful insertion into the receiver buffer * -#FALSE Possibly a duplicate segment */ -bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu, uint16_t pduSz) +static bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu, uint16_t pduSz) { RlcAmRecBuf *recBuf = NULLP; RlcSeg *seg; @@ -1292,7 +1292,7 @@ bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu, * -# FALSE * */ -bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, RlcAmHdr *amHdr) +static bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, RlcAmHdr *amHdr) { RlcSn sn; MsgLen pduSz; @@ -1385,7 +1385,7 @@ bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, RlcAmHdr * @return Void * */ -void rlcAmmTriggerStatus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool discFlg) +static void rlcAmmTriggerStatus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool discFlg) { bool tmrRunning; RlcSn tSn; @@ -1437,7 +1437,7 @@ void rlcAmmTriggerStatus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool discFlg) * @return Void * */ -void rlcAmmProcPduOrSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu) +static void rlcAmmProcPduOrSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu) { if ((AMUL.expSn != amHdr->sn) || (AMUL.expSo != amHdr->so)) @@ -1499,7 +1499,7 @@ void rlcAmmProcPduOrSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pd * -# RFAILED * */ -uint8_t rlcAmmUlReassembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf *recBuf) +static uint8_t rlcAmmUlReassembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf *recBuf) { RlcSeg *seg; @@ -1769,7 +1769,7 @@ RlcUlRbCb *rbCb; * */ -void rlcAmmExtractElmnt(RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo) +static void rlcAmmExtractElmnt(RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo) { uint8_t hdr; uint8_t pLen = hdrInfo->pLen; @@ -1852,7 +1852,7 @@ void rlcAmmExtractElmnt(RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo) * */ -void rlcAmmUpdExpByteSeg(RlcCb *gCb, RlcAmUl *amUl, RlcSeg *seg) +static void rlcAmmUpdExpByteSeg(RlcCb *gCb, RlcAmUl *amUl, RlcSeg *seg) { uint16_t newExpSo; /* The new expected SO */ RlcSn sn = seg->amHdr.sn;