#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
#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
#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
#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)
{
#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++;
/* 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 */
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++;
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;
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);
#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
{
(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);
/* 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;
}
}
{
if (*partialSdu)
{
- KW_FREE_BUF(*partialSdu); /* RLC mem leak fix */
+ RLC_FREE_BUF(*partialSdu); /* RLC mem leak fix */
*partialSdu = NULLP;
}
#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;
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;
#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
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else
SRemPreMsg(dst,pdu);
"SRemPreMsgMult Failed for 10 bits SN UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else
SRemPreMsgMult(dst,2,pdu);
"SRemPreMsgMult Failed UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else
SRemPreMsgMult(dst,2,pdu);
"Received LI as 0 UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
totalSz += umHdr->li[umHdr->numLi];
if ( pduSz <= totalSz )
pduSz,
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
- RETVALUE(RFAILED); /* the situation where in the PDU size
+ return RFAILED; /* the situation where in the PDU size
is something that does not match with
the size in LIs*/
}
"SRemPreMsg Failed UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
#else
SRemPreMsg(dst,pdu);
"Received LI as 0 UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
- RETVALUE(RFAILED);
+ return RFAILED;
}
totalSz += umHdr->li[umHdr->numLi];
pduSz--;
if (pduSz < totalSz)
{
- RETVALUE(RFAILED); /* the situation where in the PDU size is
+ return RFAILED; /* the situation where in the PDU size is
something that does not match with the
size in LIs*/
}
if (e)
{
/* PDU was constructed with LIs that exceeded KW_MAX_LI */
- RETVALUE(RFAILED);
+ return RFAILED;
}
- RETVALUE(ROK);
+ return ROK;
}
/**
#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 */
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;
}
#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 */
{
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;
}