X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_umm_ul.c;h=3761777a780eecd4bbec7e4a24db97442b0b2190;hb=5831bf6b3454aa200a92cd3e84209650734e4863;hp=449e1861d4ef21142df16ebf8179c792015dbc66;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_umm_ul.c b/src/5gnrrlc/kw_umm_ul.c index 449e1861d..3761777a7 100755 --- a/src/5gnrrlc/kw_umm_ul.c +++ b/src/5gnrrlc/kw_umm_ul.c @@ -44,16 +44,7 @@ static int RLOG_FILE_ID=240; */ /* header (.h) include files */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ - -#include "gen.h" /* general */ -#include "ssi.h" /* system services interface */ -#include "cm5.h" /* Timer Functions */ -#include "cm_lte.h" /* common umts header file */ -#include "cm_hash.h" /* common hash module file */ -#include "cm_llist.h" /* common list header file */ +#include "common_def.h" #include "ckw.h" /* RRC layer */ #include "lkw.h" /* RRC layer */ #include "kwu.h" /* RLC service user */ @@ -68,13 +59,6 @@ static int RLOG_FILE_ID=240; /* header/extern include files (.x) */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services interface */ -#include "cm_lib.x" /* common library */ -#include "cm5.x" /* Timer Functions */ -#include "cm_hash.x" /* common hash module */ -#include "cm_lte.x" /* common umts file */ -#include "cm_llist.x" /* common list header file */ #include "ckw.x" /* RRC layer */ #include "kwu.x" /* RLC service user */ #include "lkw.x" /* LM Interface */ @@ -85,13 +69,13 @@ static int RLOG_FILE_ID=240; #define KW_MODULE (KW_DBGMASK_UM | KW_DBGMASK_UL) -PRIVATE S16 kwUmmExtractHdr ARGS ((KwCb *gCb, - KwUlRbCb *rbCb, +PRIVATE S16 kwUmmExtractHdr ARGS ((RlcCb *gCb, + RlcUlRbCb *rbCb, Buffer *pdu, KwUmHdr *umHdr)); -PRIVATE Void kwUmmReAssembleSdus ARGS ((KwCb *gCb, - KwUlRbCb *rbCb, +PRIVATE Void kwUmmReAssembleSdus ARGS ((RlcCb *gCb, + RlcUlRbCb *rbCb, KwUmRecBuf *umRecBuf)); #ifndef TENB_ACC @@ -170,15 +154,15 @@ PRIVATE S16 kwUmmCheckSnInReordWindow (KwSn sn, #ifdef ANSI PUBLIC Void kwUmmProcessPdus ( -KwCb *gCb, -KwUlRbCb *rbCb, /* Rb Control Block */ +RlcCb *gCb, +RlcUlRbCb *rbCb, /* Rb Control Block */ KwPduInfo *pduInfo, /* Pdu data and related information */ U32 ttiCnt /* ttiCnt received from MAC */ ) #else PUBLIC Void kwUmmProcessPdus(rbCb,pduInfo,ttiCnt) -KwCb *gCb; -KwUlRbCb *rbCb; /* Rb Control Block */ +RlcCb *gCb; +RlcUlRbCb *rbCb; /* Rb Control Block */ KwPduInfo *pduInfo; /* Pdu data and related information */ U32 ttiCnt; /* ttiCnt received from MAC */ #endif @@ -186,14 +170,14 @@ U32 ttiCnt; /* ttiCnt received from MAC */ #ifdef ANSI PUBLIC Void kwUmmProcessPdus ( -KwCb *gCb, -KwUlRbCb *rbCb, /* Rb Control Block */ +RlcCb *gCb, +RlcUlRbCb *rbCb, /* Rb Control Block */ KwPduInfo *pduInfo /* Pdu data and related information */ ) #else PUBLIC Void kwUmmProcessPdus(rbCb,pduInfo) -KwCb *gCb; -KwUlRbCb *rbCb; /* Rb Control Block */ +RlcCb *gCb; +RlcUlRbCb *rbCb; /* Rb Control Block */ KwPduInfo *pduInfo; /* Pdu data and related information */ #endif #endif @@ -241,7 +225,7 @@ KwPduInfo *pduInfo; /* Pdu data and related information */ #endif #endif /* create a buffer to be later inserted into the reception buffer */ - KW_ALLOC_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf)); + RLC_ALLOC_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf)); #if (ERRCLASS & ERRCLS_ADD_RES) if (tmpRecBuf == NULLP) { @@ -260,12 +244,12 @@ KwPduInfo *pduInfo; /* Pdu data and related information */ #ifndef LTE_PAL_ENB /* Changed the condition to TRUE from ROK */ #ifndef XEON_SPECIFIC_CHANGES - if(isMemThreshReached(kwCb[0]->init.region) == TRUE) + if(isMemThreshReached(rlcCb[0]->init.region) == TRUE) { extern U32 rlculdrop; rlculdrop++; - KW_FREE_BUF(pdu); - KW_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf)); + RLC_FREE_BUF(pdu); + RLC_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf)); /*Fix for CR ccpu00144030: If threshhold is hit then also count *should be incrmented */ count++; @@ -286,7 +270,7 @@ KwPduInfo *pduInfo; /* Pdu data and related information */ /* Header extraction is a problem. * log an error and free the allocated memory */ /* ccpu00136940 */ - KW_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf)); + RLC_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf)); SPutMsg(pdu); count++; /* kw005.201 ccpu00117318, updating the statistics */ @@ -310,8 +294,8 @@ KwPduInfo *pduInfo; /* Pdu data and related information */ rbCb->rlcId.ueId, rbCb->rlcId.cellId); - KW_FREE_BUF(pdu); - KW_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf)); + RLC_FREE_BUF(pdu); + RLC_FREE_WC(gCb, tmpRecBuf, sizeof(KwUmRecBuf)); count++; /* kw005.201 ccpu00117318, updating the statistics */ gCb->genSts.unexpPdusRecv++; @@ -357,7 +341,7 @@ KwPduInfo *pduInfo; /* Pdu data and related information */ if (recBuf[sn]) { kwUmmReAssembleSdus(gCb,rbCb,recBuf[sn]); - KW_FREE_WC(gCb,recBuf[sn],sizeof(KwUmRecBuf)); + RLC_FREE_WC(gCb,recBuf[sn],sizeof(KwUmRecBuf)); recBuf[sn] = NULLP; } sn = (sn + 1) & KW_UMUL.modBitMask; @@ -379,7 +363,7 @@ KwPduInfo *pduInfo; /* Pdu data and related information */ while (recBuf[sn] && tSn < tVrUr) { kwUmmReAssembleSdus(gCb,rbCb,recBuf[sn]); - KW_FREE_WC(gCb,recBuf[sn],sizeof(KwUmRecBuf)); + RLC_FREE_WC(gCb,recBuf[sn],sizeof(KwUmRecBuf)); recBuf[sn] = NULLP; sn = (sn + 1) & KW_UMUL.modBitMask; tSn = KW_UM_GET_VALUE(sn, KW_UMUL); @@ -436,14 +420,14 @@ KwPduInfo *pduInfo; /* Pdu data and related information */ #ifdef ANSI PRIVATE Void kwUmmReAssembleSdus ( -KwCb *gCb, -KwUlRbCb *rbCb, +RlcCb *gCb, +RlcUlRbCb *rbCb, KwUmRecBuf *umRecBuf ) #else PRIVATE Void kwUmmReAssembleSdus(gCb,rbCb,umRecBuf) -KwCb *gCb; -KwUlRbCb *rbCb; +RlcCb *gCb; +RlcUlRbCb *rbCb; KwUmRecBuf *umRecBuf; #endif { @@ -510,7 +494,7 @@ KwUmRecBuf *umRecBuf; (sn == ((rbCb->m.umUl.sn + 1) & rbCb->m.umUl.modBitMask))) { SCatMsg(*partialSdu,sdu,M1M2); - KW_FREE_BUF(sdu); + RLC_FREE_BUF(sdu); if (liCount > 0 || !(fi & 1)) { kwUtlSndDatInd(gCb,rbCb,*partialSdu); @@ -522,11 +506,11 @@ KwUmRecBuf *umRecBuf; /* Partial Sdu stored is not valid now.So free it */ if (*partialSdu) { - KW_FREE_BUF(*partialSdu); + RLC_FREE_BUF(*partialSdu); *partialSdu = NULLP; } - KW_FREE_BUF(sdu); + RLC_FREE_BUF(sdu); sdu = NULLP; } } @@ -534,7 +518,7 @@ KwUmRecBuf *umRecBuf; { if (*partialSdu) { - KW_FREE_BUF(*partialSdu); /* RLC mem leak fix */ + RLC_FREE_BUF(*partialSdu); /* RLC mem leak fix */ *partialSdu = NULLP; } @@ -599,15 +583,15 @@ KwUmRecBuf *umRecBuf; #ifdef ANSI PUBLIC Void kwUmmUlReEstablish ( -KwCb *gCb, +RlcCb *gCb, CmLteRlcId *rlcId, -KwUlRbCb *rbCb +RlcUlRbCb *rbCb ) #else PUBLIC Void kwUmmUlReEstablish(gCb, rlcId, rbCb) -KwCb *gCb; +RlcCb *gCb; CmLteRlcId *rlcId; -KwUlRbCb *rbCb; +RlcUlRbCb *rbCb; #endif { KwSn curSn; @@ -632,7 +616,7 @@ KwUlRbCb *rbCb; if ( recBuf[curSn] != NULLP ) { kwUmmReAssembleSdus(gCb,rbCb,recBuf[curSn]); - KW_FREE_WC(gCb,recBuf[curSn],sizeof(KwUmRecBuf)); + RLC_FREE_WC(gCb,recBuf[curSn],sizeof(KwUmRecBuf)); recBuf[curSn] = NULLP; } curSn = (curSn + 1) & rbCb->m.umUl.modBitMask; @@ -669,15 +653,15 @@ KwUlRbCb *rbCb; #ifdef ANSI PRIVATE S16 kwUmmExtractHdr ( -KwCb *gCb, -KwUlRbCb *rbCb, +RlcCb *gCb, +RlcUlRbCb *rbCb, Buffer *pdu, KwUmHdr *umHdr ) #else PRIVATE S16 kwUmmExtractHdr(gCb, rbCb, pdu, umHdr) -KwCb *gCb; -KwUlRbCb *rbCb; +RlcCb *gCb; +RlcUlRbCb *rbCb; Buffer *pdu; KwUmHdr *umHdr; #endif @@ -858,13 +842,13 @@ KwUmHdr *umHdr; #ifdef ANSI PUBLIC Void kwUmmReOrdTmrExp ( -KwCb *gCb, -KwUlRbCb *rbCb +RlcCb *gCb, +RlcUlRbCb *rbCb ) #else PUBLIC Void kwUmmReOrdTmrExp(gCb, rbCb) -KwCb *gCb; -KwUlRbCb *rbCb; +RlcCb *gCb; +RlcUlRbCb *rbCb; #endif { KwSn prevVrUr; /* prevVrUr */ @@ -885,9 +869,9 @@ KwUlRbCb *rbCb; kwUmmReAssembleSdus(gCb, rbCb, KW_UMUL.recBuf[prevVrUr]); if(KW_UMUL.recBuf[prevVrUr]->pdu != NULLP) /* RLC mem leak fix */ { - KW_FREE_BUF(KW_UMUL.recBuf[prevVrUr]->pdu); + RLC_FREE_BUF(KW_UMUL.recBuf[prevVrUr]->pdu); } - KW_FREE_WC(gCb, KW_UMUL.recBuf[prevVrUr], sizeof(KwUmRecBuf)); + RLC_FREE_WC(gCb, KW_UMUL.recBuf[prevVrUr], sizeof(KwUmRecBuf)); KW_UMUL.recBuf[prevVrUr] = NULLP; } @@ -919,13 +903,13 @@ KwUlRbCb *rbCb; #ifdef ANSI PUBLIC Void kwUmmFreeUlRbCb ( -KwCb *gCb, -KwUlRbCb *rbCb +RlcCb *gCb, +RlcUlRbCb *rbCb ) #else PUBLIC Void kwUmmFreeUlRbCb(gCb,rbCb) -KwCb *gCb; -KwUlRbCb *rbCb; +RlcCb *gCb; +RlcUlRbCb *rbCb; #endif { KwSn curSn = 0; /* sequence number of PDU */ @@ -947,15 +931,15 @@ KwUlRbCb *rbCb; { if (umRecBuf[curSn] != NULLP) { - KW_FREE_BUF_WC(umRecBuf[curSn]->pdu); + RLC_FREE_BUF_WC(umRecBuf[curSn]->pdu); umRecBuf[curSn]->pdu = NULLP; - KW_FREE_WC(gCb, umRecBuf[curSn], sizeof(KwUmRecBuf)); + RLC_FREE_WC(gCb, umRecBuf[curSn], sizeof(KwUmRecBuf)); umRecBuf[curSn] = NULLP; } curSn++; } - KW_FREE_WC(gCb,rbCb->m.umUl.recBuf, (windSz ) * sizeof(KwUmRecBuf*)); + RLC_FREE_WC(gCb,rbCb->m.umUl.recBuf, (windSz ) * sizeof(KwUmRecBuf*)); rbCb->m.umUl.recBuf = NULLP; RETVOID; }