Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
RLC UeCb Changes
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_amm_ul.c
diff --git
a/src/5gnrrlc/kw_amm_ul.c
b/src/5gnrrlc/kw_amm_ul.c
index
e53c7a1
..
ba995ae
100755
(executable)
--- a/
src/5gnrrlc/kw_amm_ul.c
+++ b/
src/5gnrrlc/kw_amm_ul.c
@@
-90,39
+90,39
@@
extern U32 isMemThreshReached(Region region);
/* private function declarations */
/* private function declarations */
-PRIVATE Void kwAmmUlAssembleCntrlInfo ARGS ((
KwCb *gCb, Kw
UlRbCb *rbCb));
+PRIVATE Void kwAmmUlAssembleCntrlInfo ARGS ((
RlcCb *gCb, Rlc
UlRbCb *rbCb));
-PRIVATE S16 kwAmmExtractHdr ARGS ((
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+PRIVATE S16 kwAmmExtractHdr ARGS ((
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
Buffer *pdu,
KwAmHdr *amHdr,
U8 *fByte));
Buffer *pdu,
KwAmHdr *amHdr,
U8 *fByte));
-PRIVATE Bool kwAmmUlPlacePduInRecBuf ARGS ((
Kw
Cb *gCb,
+PRIVATE Bool kwAmmUlPlacePduInRecBuf ARGS ((
Rlc
Cb *gCb,
Buffer *pdu,
Buffer *pdu,
-
Kw
UlRbCb *rbCb,
+
Rlc
UlRbCb *rbCb,
KwAmHdr *amHdr));
KwAmHdr *amHdr));
-PRIVATE Void kwAmmTriggerStatus ARGS ((
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+PRIVATE Void kwAmmTriggerStatus ARGS ((
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwSn sn,
Bool discFlg));
KwSn sn,
Bool discFlg));
-PRIVATE S16 kwAmmUlReassembleSdus ARGS ((
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+PRIVATE S16 kwAmmUlReassembleSdus ARGS ((
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwAmRecBuf *recBuf));
KwAmRecBuf *recBuf));
-PRIVATE Void kwAmmProcPduOrSeg ARGS ((
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+PRIVATE Void kwAmmProcPduOrSeg ARGS ((
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwAmHdr *amHdr,
Buffer *pdu));
KwAmHdr *amHdr,
Buffer *pdu));
-PRIVATE Void kwAmmUpdExpByteSeg ARGS ((
Kw
Cb *gCb,KwAmUl *amUl, KwSeg* newSeg));
+PRIVATE Void kwAmmUpdExpByteSeg ARGS ((
Rlc
Cb *gCb,KwAmUl *amUl, KwSeg* newSeg));
-PRIVATE Void kwAmmExtractElmnt ARGS ((
Kw
Cb *gCb, Buffer *pdu, KwExtHdr *hdrInfo));
+PRIVATE Void kwAmmExtractElmnt ARGS ((
Rlc
Cb *gCb, Buffer *pdu, KwExtHdr *hdrInfo));
-PRIVATE Void kwAmmUlHndlStatusPdu ARGS ((
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+PRIVATE Void kwAmmUlHndlStatusPdu ARGS ((
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
Buffer *cntrlPdu,
U8 *fByte));
Buffer *cntrlPdu,
U8 *fByte));
@@
-162,7
+162,7
@@
PRIVATE Void kwAmmUlHndlStatusPdu ARGS ((KwCb *gCb,
#ifdef ANSI
PRIVATE S16 kwAmmUlSetNackInfo
(
#ifdef ANSI
PRIVATE S16 kwAmmUlSetNackInfo
(
-
Kw
UlRbCb *rbCb,
+
Rlc
UlRbCb *rbCb,
KwSn sn,
Bool isSegment,
U16 soStart,
KwSn sn,
Bool isSegment,
U16 soStart,
@@
-172,7
+172,7
@@
KwSn *prevNackSn
)
#else
PRIVATE S16 kwAmmUlSetNackInfo(rbCb, sn, isSegment, soStart, statusPdu, prevNackSn)
)
#else
PRIVATE S16 kwAmmUlSetNackInfo(rbCb, sn, isSegment, soStart, statusPdu, prevNackSn)
-
Kw
UlRbCb *rbCb;
+
Rlc
UlRbCb *rbCb;
KwSn sn;
Bool isSegment;
U16 soStart;
KwSn sn;
Bool isSegment;
U16 soStart;
@@
-302,13
+302,13
@@
KwSn *prevNackSn;
#ifdef ANSI
PRIVATE Void kwAmmUlAssembleCntrlInfo
(
#ifdef ANSI
PRIVATE Void kwAmmUlAssembleCntrlInfo
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb
)
#else
PRIVATE Void kwAmmUlAssembleCntrlInfo(gCb, rbCb)
)
#else
PRIVATE Void kwAmmUlAssembleCntrlInfo(gCb, rbCb)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
#endif
{
KwUdxDlStaPdu *pStatusPdu;
#endif
{
KwUdxDlStaPdu *pStatusPdu;
@@
-331,7
+331,7
@@
KwUlRbCb *rbCb;
sapCb = KW_GET_UDX_SAP(gCb);
sapCb = KW_GET_UDX_SAP(gCb);
-
KW
_ALLOC_SHRABL_BUF(sapCb->pst.region,
+
RLC
_ALLOC_SHRABL_BUF(sapCb->pst.region,
sapCb->pst.pool,
pStatusPdu,
sizeof(KwUdxDlStaPdu));
sapCb->pst.pool,
pStatusPdu,
sizeof(KwUdxDlStaPdu));
@@
-500,7
+500,7
@@
KwUlRbCb *rbCb;
AMUL.gatherStaPduInfo = FALSE;
AMUL.gatherStaPduInfo = FALSE;
- if (
Kw
UlUdxStaPduReq(&sapCb->pst,
+ if (
rlc
UlUdxStaPduReq(&sapCb->pst,
sapCb->spId,
&rbCb->rlcId,
pStatusPdu) != ROK)
sapCb->spId,
&rbCb->rlcId,
pStatusPdu) != ROK)
@@
-509,7
+509,7
@@
KwUlRbCb *rbCb;
"Failed to Send Sta Pdu UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
"Failed to Send Sta Pdu UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
-
KW
_FREE_SHRABL_BUF_WC(sapCb->pst.region,
+
RLC
_FREE_SHRABL_BUF_WC(sapCb->pst.region,
sapCb->pst.pool,
pStatusPdu,
sizeof(KwUdxDlStaPdu));
sapCb->pst.pool,
pStatusPdu,
sizeof(KwUdxDlStaPdu));
@@
-545,15
+545,15
@@
PUBLIC U32 drpRlcDrbPack;
#ifdef ANSI
PUBLIC Void kwAmmProcessPdus
(
#ifdef ANSI
PUBLIC Void kwAmmProcessPdus
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwPduInfo *pduInfo,
U32 ttiCnt
)
#else
PUBLIC Void kwAmmProcessPdus(gCb, rbCb, pduInfo, ulTimeInfo)
KwPduInfo *pduInfo,
U32 ttiCnt
)
#else
PUBLIC Void kwAmmProcessPdus(gCb, rbCb, pduInfo, ulTimeInfo)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
KwPduInfo *pduInfo;
U32 ttiCnt;
#endif
KwPduInfo *pduInfo;
U32 ttiCnt;
#endif
@@
-561,14
+561,14
@@
U32 ttiCnt;
#ifdef ANSI
PUBLIC Void kwAmmProcessPdus
(
#ifdef ANSI
PUBLIC Void kwAmmProcessPdus
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwPduInfo *pduInfo
)
#else
PUBLIC Void kwAmmProcessPdus(gCb, rbCb, pduInfo)
KwPduInfo *pduInfo
)
#else
PUBLIC Void kwAmmProcessPdus(gCb, rbCb, pduInfo)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
KwPduInfo *pduInfo;
#endif
#endif
KwPduInfo *pduInfo;
#endif
#endif
@@
-636,7
+636,7
@@
KwPduInfo *pduInfo;
"Header Extraction Failed UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
"Header Extraction Failed UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
gCb->genSts.errorPdusRecv++;
continue;
}
gCb->genSts.errorPdusRecv++;
continue;
}
@@
-644,7
+644,7
@@
KwPduInfo *pduInfo;
if (amHdr.dc == 0)
{
kwAmmUlHndlStatusPdu(gCb, rbCb, pdu, &fByte);
if (amHdr.dc == 0)
{
kwAmmUlHndlStatusPdu(gCb, rbCb, pdu, &fByte);
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
continue;
}
if((amHdr.si == KW_SI_LAST_SEG) && (!amHdr.so))
continue;
}
if((amHdr.si == KW_SI_LAST_SEG) && (!amHdr.so))
@@
-655,7
+655,7
@@
KwPduInfo *pduInfo;
amHdr.sn,
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
amHdr.sn,
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
continue;
}
#ifndef RGL_SPECIFIC_CHANGES
continue;
}
#ifndef RGL_SPECIFIC_CHANGES
@@
-664,22
+664,22
@@
KwPduInfo *pduInfo;
#ifndef TENB_T2K3K_SPECIFIC_CHANGES
#ifndef LTE_PAL_ENB
/* Changed the condition to TRUE from ROK */
#ifndef TENB_T2K3K_SPECIFIC_CHANGES
#ifndef LTE_PAL_ENB
/* Changed the condition to TRUE from ROK */
- if(isMemThreshReached(
kw
Cb[0]->init.region) == TRUE)
+ if(isMemThreshReached(
rlc
Cb[0]->init.region) == TRUE)
{
extern U32 rlculdrop;
rlculdrop++;
{
extern U32 rlculdrop;
rlculdrop++;
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
continue;
}
#endif
#else
#ifndef LTE_PAL_ENB
/*ccpu00142274 - UL memory based flow control*/
continue;
}
#endif
#else
#ifndef LTE_PAL_ENB
/*ccpu00142274 - UL memory based flow control*/
- if(isMemThreshReached(
kw
Cb[0]->init.region) != ROK)
+ if(isMemThreshReached(
rlc
Cb[0]->init.region) != ROK)
{
extern U32 rlculdrop;
rlculdrop++;
{
extern U32 rlculdrop;
rlculdrop++;
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
continue;
}
#endif
continue;
}
#endif
@@
-693,7
+693,7
@@
KwPduInfo *pduInfo;
{
if(rbCb->rlcId.rbType == CM_LTE_DRB)
{
{
if(rbCb->rlcId.rbType == CM_LTE_DRB)
{
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
continue;
}
}
continue;
}
}
@@
-873,16
+873,16
@@
KwPduInfo *pduInfo;
#ifdef ANSI
PRIVATE S16 kwAmmExtractHdr
(
#ifdef ANSI
PRIVATE S16 kwAmmExtractHdr
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
Buffer *pdu,
KwAmHdr *amHdr,
U8 *fByte
)
#else
PRIVATE S16 kwAmmExtractHdr(gCb, rbCb, pdu, amHdr, fByte)
Buffer *pdu,
KwAmHdr *amHdr,
U8 *fByte
)
#else
PRIVATE S16 kwAmmExtractHdr(gCb, rbCb, pdu, amHdr, fByte)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
Buffer *pdu;
KwAmHdr *amHdr;
U8 *fByte;
Buffer *pdu;
KwAmHdr *amHdr;
U8 *fByte;
@@
-966,14
+966,14
@@
U8 *fByte;
#ifdef ANSI
PRIVATE S16 kwAmmExtractHdrOld
(
#ifdef ANSI
PRIVATE S16 kwAmmExtractHdrOld
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
Buffer *pdu,
KwAmHdr *amHdr,
U8 *fByte
)
#else
PRIVATE S16 kwAmmExtractHdrOld(gCb, pdu, amHdr, fByte)
Buffer *pdu,
KwAmHdr *amHdr,
U8 *fByte
)
#else
PRIVATE S16 kwAmmExtractHdrOld(gCb, pdu, amHdr, fByte)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
Buffer *pdu;
KwAmHdr *amHdr;
U8 *fByte;
Buffer *pdu;
KwAmHdr *amHdr;
U8 *fByte;
@@
-1091,15
+1091,15
@@
U8 *fByte;
#ifdef ANSI
PRIVATE Void kwAmmUlHndlStatusPdu
(
#ifdef ANSI
PRIVATE Void kwAmmUlHndlStatusPdu
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
Buffer *cntrlPdu,
U8 *fByte
)
#else
PRIVATE Void kwAmmUlHndlStatusPdu(gCb, rbCb, cntrlPdu, fByte)
Buffer *cntrlPdu,
U8 *fByte
)
#else
PRIVATE Void kwAmmUlHndlStatusPdu(gCb, rbCb, cntrlPdu, fByte)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
Buffer *cntrlPdu;
U8 *fByte;
#endif
Buffer *cntrlPdu;
U8 *fByte;
#endif
@@
-1136,7
+1136,7
@@
U8 *fByte;
sapCb = KW_GET_UDX_SAP(gCb);
sapCb = KW_GET_UDX_SAP(gCb);
-
KW
_ALLOC_SHRABL_BUF(sapCb->pst.region,
+
RLC
_ALLOC_SHRABL_BUF(sapCb->pst.region,
sapCb->pst.pool,
pStaPdu,
sizeof(KwUdxStaPdu));
sapCb->pst.pool,
pStaPdu,
sizeof(KwUdxStaPdu));
@@
-1274,7
+1274,7
@@
U8 *fByte;
/* Parse & send Status PDU to RLC-DL */
/* Parse & send Status PDU to RLC-DL */
-
Kw
UlUdxStaUpdReq(&(sapCb->pst), sapCb->spId, &rbCb->rlcId, pStaPdu);
+
rlc
UlUdxStaUpdReq(&(sapCb->pst), sapCb->spId, &rbCb->rlcId, pStaPdu);
RETVOID;
}
RETVOID;
}
@@
-1295,12
+1295,12
@@
U8 *fByte;
#ifdef ANSI
PRIVATE Void kwAmmUlRlsAllSegs
(
#ifdef ANSI
PRIVATE Void kwAmmUlRlsAllSegs
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
KwAmRecBuf *recBuf
)
#else
PRIVATE Void kwAmmUlRlsAllSegs(gCb,recBuf)
KwAmRecBuf *recBuf
)
#else
PRIVATE Void kwAmmUlRlsAllSegs(gCb,recBuf)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
KwAmRecBuf *recBuf;
#endif
{
KwAmRecBuf *recBuf;
#endif
{
@@
-1311,9
+1311,9
@@
KwAmRecBuf *recBuf;
KW_LLIST_FIRST_SEG(recBuf->segLst, seg);
while (seg != NULLP)
{
KW_LLIST_FIRST_SEG(recBuf->segLst, seg);
while (seg != NULLP)
{
-
KW
_FREE_BUF_WC(seg->seg);
+
RLC
_FREE_BUF_WC(seg->seg);
cmLListDelFrm(&(recBuf->segLst),&(seg->lstEnt));
cmLListDelFrm(&(recBuf->segLst),&(seg->lstEnt));
-
KW
_FREE_WC(gCb,seg, sizeof(KwSeg));
+
RLC
_FREE_WC(gCb,seg, sizeof(KwSeg));
KW_LLIST_FIRST_SEG(recBuf->segLst, seg);
}
KW_LLIST_FIRST_SEG(recBuf->segLst, seg);
}
@@
-1343,16
+1343,16
@@
KwAmRecBuf *recBuf;
#ifdef ANSI
PRIVATE Bool kwAmmAddRcvdSeg
(
#ifdef ANSI
PRIVATE Bool kwAmmAddRcvdSeg
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwAmHdr *amHdr,
Buffer *pdu,
U16 pduSz
)
#else
PRIVATE Bool kwAmmAddRcvdSeg(gCb, rbCb, amHdr, pdu, pduSz)
KwAmHdr *amHdr,
Buffer *pdu,
U16 pduSz
)
#else
PRIVATE Bool kwAmmAddRcvdSeg(gCb, rbCb, amHdr, pdu, pduSz)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
KwAmHdr *amHdr;
Buffer *pdu;
U16 pduSz;
KwAmHdr *amHdr;
Buffer *pdu;
U16 pduSz;
@@
-1371,7
+1371,7
@@
U16 pduSz;
if (NULLP == recBuf)
{
if (NULLP == recBuf)
{
-
KW
_ALLOC(gCb,recBuf, sizeof(KwAmRecBuf));
+
RLC
_ALLOC(gCb,recBuf, sizeof(KwAmRecBuf));
#if (ERRCLASS & ERRCLS_ADD_RES)
if (recBuf == NULLP)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
if (recBuf == NULLP)
{
@@
-1380,7
+1380,7
@@
U16 pduSz;
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
RETVALUE(FALSE);
}
#endif /* ERRCLASS & ERRCLS_RES */
RETVALUE(FALSE);
}
#endif /* ERRCLASS & ERRCLS_RES */
@@
-1390,7
+1390,7
@@
U16 pduSz;
{
if (recBuf->allRcvd == TRUE)
{
{
if (recBuf->allRcvd == TRUE)
{
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
RETVALUE(FALSE);
}
}
RETVALUE(FALSE);
}
}
@@
-1410,7
+1410,7
@@
U16 pduSz;
{
/* This is a duplicate segment */
gRlcStats.amRlcStats.numRlcAmCellDupPduRx++;
{
/* This is a duplicate segment */
gRlcStats.amRlcStats.numRlcAmCellDupPduRx++;
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
RETVALUE(FALSE);
}
RETVALUE(FALSE);
}
@@
-1418,14
+1418,14
@@
U16 pduSz;
{
/* This is a duplicate segment */
gRlcStats.amRlcStats.numRlcAmCellDupPduRx++;
{
/* This is a duplicate segment */
gRlcStats.amRlcStats.numRlcAmCellDupPduRx++;
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
RETVALUE(FALSE);
}
/* If we have come this far, we have to add this segment to the */
/* reception buffer as we either have eliminated duplicates or */
/* have found none. */
RETVALUE(FALSE);
}
/* If we have come this far, we have to add this segment to the */
/* reception buffer as we either have eliminated duplicates or */
/* have found none. */
-
KW
_ALLOC_WC(gCb,tseg, sizeof(KwSeg));
+
RLC
_ALLOC_WC(gCb,tseg, sizeof(KwSeg));
#if (ERRCLASS & ERRCLS_ADD_RES)
if (tseg == NULLP)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
if (tseg == NULLP)
{
@@
-1433,7
+1433,7
@@
U16 pduSz;
"Memory allocation failed UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
"Memory allocation failed UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
RETVALUE(FALSE);
}
#endif /* ERRCLASS & ERRCLS_RES */
RETVALUE(FALSE);
}
#endif /* ERRCLASS & ERRCLS_RES */
@@
-1480,16
+1480,16
@@
U16 pduSz;
#ifdef ANSI
PRIVATE Bool kwAmmUlPlacePduInRecBuf
(
#ifdef ANSI
PRIVATE Bool kwAmmUlPlacePduInRecBuf
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
Buffer *pdu,
Buffer *pdu,
-
Kw
UlRbCb *rbCb,
+
Rlc
UlRbCb *rbCb,
KwAmHdr *amHdr
)
#else
PRIVATE Bool kwAmmUlPlacePduInRecBuf(gCb, pdu, rbCb, amHdr)
KwAmHdr *amHdr
)
#else
PRIVATE Bool kwAmmUlPlacePduInRecBuf(gCb, pdu, rbCb, amHdr)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
Buffer *pdu;
Buffer *pdu;
-
Kw
UlRbCb *rbCb;
+
Rlc
UlRbCb *rbCb;
KwAmHdr *amHdr;
#endif
{
KwAmHdr *amHdr;
#endif
{
@@
-1516,7
+1516,7
@@
KwAmHdr *amHdr;
rbCb->rlcId.cellId);
gCb->genSts.unexpPdusRecv++;
rbCb->rlcId.cellId);
gCb->genSts.unexpPdusRecv++;
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
RETVALUE(FALSE);
}
RETVALUE(FALSE);
}
@@
-1529,7
+1529,7
@@
KwAmHdr *amHdr;
/* store the received PDU in the reception buffer */
if (NULLP == recBuf)
{
/* store the received PDU in the reception buffer */
if (NULLP == recBuf)
{
-
KW
_ALLOC(gCb, recBuf, sizeof(KwAmRecBuf));
+
RLC
_ALLOC(gCb, recBuf, sizeof(KwAmRecBuf));
#if (ERRCLASS & ERRCLS_ADD_RES)
if (recBuf == NULLP)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
if (recBuf == NULLP)
{
@@
-1537,7
+1537,7
@@
KwAmHdr *amHdr;
"Memory allocation failed UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
"Memory allocation failed UEID:%d CELLID:%d",
rbCb->rlcId.ueId,
rbCb->rlcId.cellId);
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
RETVALUE(FALSE);
}
#endif /* ERRCLASS & ERRCLS_RES */
RETVALUE(FALSE);
}
#endif /* ERRCLASS & ERRCLS_RES */
@@
-1551,7
+1551,7
@@
KwAmHdr *amHdr;
{
gRlcStats.amRlcStats.numRlcAmCellDupPduRx++;
gCb->genSts.unexpPdusRecv++;
{
gRlcStats.amRlcStats.numRlcAmCellDupPduRx++;
gCb->genSts.unexpPdusRecv++;
-
KW
_FREE_BUF(pdu);
+
RLC
_FREE_BUF(pdu);
RETVALUE(FALSE);
}
recBuf->isDelvUpperLayer = FALSE;
RETVALUE(FALSE);
}
recBuf->isDelvUpperLayer = FALSE;
@@
-1596,15
+1596,15
@@
KwAmHdr *amHdr;
#ifdef ANSI
PRIVATE Void kwAmmTriggerStatus
(
#ifdef ANSI
PRIVATE Void kwAmmTriggerStatus
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwSn sn,
Bool discFlg
)
#else
PRIVATE Void kwAmmTriggerStatus(gCb,rbCb, sn, discFlg)
KwSn sn,
Bool discFlg
)
#else
PRIVATE Void kwAmmTriggerStatus(gCb,rbCb, sn, discFlg)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
KwSn sn;
Bool discFlg;
#endif
KwSn sn;
Bool discFlg;
#endif
@@
-1667,15
+1667,15
@@
Bool discFlg;
#ifdef ANSI
PRIVATE Void kwAmmProcPduOrSeg
(
#ifdef ANSI
PRIVATE Void kwAmmProcPduOrSeg
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwAmHdr *amHdr,
Buffer *pdu
)
#else
PRIVATE Void kwAmmProcPduOrSeg(gCb, rbCb, amHdr, pdu)
KwAmHdr *amHdr,
Buffer *pdu
)
#else
PRIVATE Void kwAmmProcPduOrSeg(gCb, rbCb, amHdr, pdu)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
KwAmHdr *amHdr;
Buffer *pdu;
#endif
KwAmHdr *amHdr;
Buffer *pdu;
#endif
@@
-1688,7
+1688,7
@@
Buffer *pdu;
/* Release the existing partial SDU as we have PDUs or */
/* segments that are out of sequence */
rbCb->m.amUl.isOutOfSeq = TRUE;
/* Release the existing partial SDU as we have PDUs or */
/* segments that are out of sequence */
rbCb->m.amUl.isOutOfSeq = TRUE;
-
KW
_FREE_BUF(AMUL.partialSdu);
+
RLC
_FREE_BUF(AMUL.partialSdu);
}
//if (amHdr->fi & KW_FI_FIRST_SEG)
}
//if (amHdr->fi & KW_FI_FIRST_SEG)
@@
-1696,7
+1696,7
@@
Buffer *pdu;
{/* first Segment of the SDU */
if (AMUL.partialSdu != NULLP)
{ /* Some old SDU may be present */
{/* first Segment of the SDU */
if (AMUL.partialSdu != NULLP)
{ /* Some old SDU may be present */
-
KW
_FREE_BUF_WC(AMUL.partialSdu);
+
RLC
_FREE_BUF_WC(AMUL.partialSdu);
}
AMUL.partialSdu = pdu;
pdu = NULLP;
}
AMUL.partialSdu = pdu;
pdu = NULLP;
@@
-1704,13
+1704,13
@@
Buffer *pdu;
else if(amHdr->si == 0x03)
{/* Middle or last segment of the SUD */
SCatMsg(AMUL.partialSdu,pdu, M1M2);
else if(amHdr->si == 0x03)
{/* Middle or last segment of the SUD */
SCatMsg(AMUL.partialSdu,pdu, M1M2);
-
KW
_FREE_BUF_WC(pdu);
+
RLC
_FREE_BUF_WC(pdu);
pdu = NULLP;
}
else if (amHdr->si == 0x02)
{
SCatMsg(pdu,AMUL.partialSdu,M2M1);
pdu = NULLP;
}
else if (amHdr->si == 0x02)
{
SCatMsg(pdu,AMUL.partialSdu,M2M1);
-
KW
_FREE_BUF_WC(AMUL.partialSdu);
+
RLC
_FREE_BUF_WC(AMUL.partialSdu);
}
if (pdu != NULLP)
}
if (pdu != NULLP)
@@
-1745,14
+1745,14
@@
Buffer *pdu;
#ifdef ANSI
PRIVATE S16 kwAmmUlReassembleSdus
(
#ifdef ANSI
PRIVATE S16 kwAmmUlReassembleSdus
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
KwAmRecBuf *recBuf
)
#else
PRIVATE S16 kwAmmUlReassembleSdus(gCb, rbCb, recBuf)
KwAmRecBuf *recBuf
)
#else
PRIVATE S16 kwAmmUlReassembleSdus(gCb, rbCb, recBuf)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
KwAmRecBuf *recBuf;
#endif
{
KwAmRecBuf *recBuf;
#endif
{
@@
-1781,7
+1781,7
@@
KwAmRecBuf *recBuf;
AMUL.expSo = seg->soEnd + 1;
cmLListDelFrm(&(recBuf->segLst),&(seg->lstEnt));
AMUL.expSo = seg->soEnd + 1;
cmLListDelFrm(&(recBuf->segLst),&(seg->lstEnt));
-
KW
_FREE_WC(gCb, seg, sizeof(KwSeg));
+
RLC
_FREE_WC(gCb, seg, sizeof(KwSeg));
KW_LLIST_FIRST_SEG(recBuf->segLst, seg);
}
KW_LLIST_FIRST_SEG(recBuf->segLst, seg);
}
@@
-1806,17
+1806,17
@@
KwAmRecBuf *recBuf;
#ifdef ANSI
PUBLIC Void kwAmmUlReEstablish
(
#ifdef ANSI
PUBLIC Void kwAmmUlReEstablish
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
CmLteRlcId rlcId,
Bool sendReEst,
CmLteRlcId rlcId,
Bool sendReEst,
-
Kw
UlRbCb *rbCb
+
Rlc
UlRbCb *rbCb
)
#else
PUBLIC Void kwAmmUlReEstablish(gCb, rlcId, sendReEst, rbCb)
)
#else
PUBLIC Void kwAmmUlReEstablish(gCb, rlcId, sendReEst, rbCb)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
CmLteRlcId rlcId;
Bool sendReEst;
CmLteRlcId rlcId;
Bool sendReEst;
-
Kw
UlRbCb *rbCb;
+
Rlc
UlRbCb *rbCb;
#endif
{
KwSn sn;
#endif
{
KwSn sn;
@@
-1851,7
+1851,7
@@
KwUlRbCb *rbCb;
/* Remove PDU and segments */
if(recBuf->pdu)
{
/* Remove PDU and segments */
if(recBuf->pdu)
{
-
KW
_FREE_BUF_WC(recBuf->pdu);
+
RLC
_FREE_BUF_WC(recBuf->pdu);
}
/* Release all the segments*/
kwAmmUlRlsAllSegs(gCb,recBuf);
}
/* Release all the segments*/
kwAmmUlRlsAllSegs(gCb,recBuf);
@@
-1884,7
+1884,7
@@
KwUlRbCb *rbCb;
AMUL.expSo = 0;
if (AMUL.partialSdu != NULLP)
{
AMUL.expSo = 0;
if (AMUL.partialSdu != NULLP)
{
-
KW
_FREE_BUF(AMUL.partialSdu);
+
RLC
_FREE_BUF(AMUL.partialSdu);
}
kwKwSap = gCb->u.ulCb->kwuUlSap + KW_UI_PDCP;
}
kwKwSap = gCb->u.ulCb->kwuUlSap + KW_UI_PDCP;
@@
-1913,13
+1913,13
@@
KwUlRbCb *rbCb;
#ifdef ANSI
PUBLIC Void kwAmmReOrdTmrExp
(
#ifdef ANSI
PUBLIC Void kwAmmReOrdTmrExp
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb
)
#else
PUBLIC Void kwAmmReOrdTmrExp(rbCb)
)
#else
PUBLIC Void kwAmmReOrdTmrExp(rbCb)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
#endif
{
KwAmUl *amUl = &(rbCb->m.amUl);
#endif
{
KwAmUl *amUl = &(rbCb->m.amUl);
@@
-1995,13
+1995,13
@@
KwUlRbCb *rbCb;
#ifdef ANSI
PUBLIC Void kwAmmStaProTmrExp
(
#ifdef ANSI
PUBLIC Void kwAmmStaProTmrExp
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb
)
#else
PUBLIC Void kwAmmStaProTmrExp(gCb, rbCb)
)
#else
PUBLIC Void kwAmmStaProTmrExp(gCb, rbCb)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
#endif
{
KwAmUl *amUl = &(rbCb->m.amUl);
#endif
{
KwAmUl *amUl = &(rbCb->m.amUl);
@@
-2037,13
+2037,13
@@
KwUlRbCb *rbCb;
#ifdef ANSI
PRIVATE Void kwAmmExtractElmnt
(
#ifdef ANSI
PRIVATE Void kwAmmExtractElmnt
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
Buffer *pdu,
KwExtHdr *hdrInfo
)
#else
PRIVATE Void kwAmmExtractElmnt(gCb, pdu, hdrInfo)
Buffer *pdu,
KwExtHdr *hdrInfo
)
#else
PRIVATE Void kwAmmExtractElmnt(gCb, pdu, hdrInfo)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
Buffer *pdu;
KwExtHdr *hdrInfo;
#endif
Buffer *pdu;
KwExtHdr *hdrInfo;
#endif
@@
-2134,13
+2134,13
@@
KwExtHdr *hdrInfo;
#ifdef ANSI
PRIVATE Void kwAmmUpdExpByteSeg
(
#ifdef ANSI
PRIVATE Void kwAmmUpdExpByteSeg
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
KwAmUl *amUl,
KwSeg *seg
)
#else
PRIVATE Void kwAmmUpdExpByteSeg(gCb, amUl, seg)
KwAmUl *amUl,
KwSeg *seg
)
#else
PRIVATE Void kwAmmUpdExpByteSeg(gCb, amUl, seg)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
KwAmUl *amUl;
KwSeg *seg;
#endif
KwAmUl *amUl;
KwSeg *seg;
#endif
@@
-2214,13
+2214,13
@@
KwSeg *seg;
#ifdef ANSI
PUBLIC Void kwAmmFreeUlRbCb
(
#ifdef ANSI
PUBLIC Void kwAmmFreeUlRbCb
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb
)
#else
PUBLIC Void kwAmmFreeUlRbCb(gCb,rbCb)
)
#else
PUBLIC Void kwAmmFreeUlRbCb(gCb,rbCb)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
#endif
{
KwSn curSn = 0; /* Sequence number of PDU */
#endif
{
KwSn curSn = 0; /* Sequence number of PDU */
@@
-2251,7
+2251,7
@@
KwUlRbCb *rbCb;
{
if (recBuf->pdu != NULLP)
{
{
if (recBuf->pdu != NULLP)
{
-
KW
_FREE_BUF_WC(recBuf->pdu);
+
RLC
_FREE_BUF_WC(recBuf->pdu);
}
/* Release all the segments */
kwAmmUlRlsAllSegs(gCb,recBuf);
}
/* Release all the segments */
kwAmmUlRlsAllSegs(gCb,recBuf);
@@
-2261,13
+2261,13
@@
KwUlRbCb *rbCb;
}while ( curSn < windSz );
#ifndef LTE_TDD
}while ( curSn < windSz );
#ifndef LTE_TDD
-
KW
_FREE_WC(gCb,rbCb->m.amUl.recBufLst, (KW_RCV_BUF_BIN_SIZE * sizeof(CmLListCp)));
+
RLC
_FREE_WC(gCb,rbCb->m.amUl.recBufLst, (KW_RCV_BUF_BIN_SIZE * sizeof(CmLListCp)));
rbCb->m.amUl.recBufLst = NULLP;
#endif
if(rbCb->m.amUl.partialSdu != NULLP)
{
rbCb->m.amUl.recBufLst = NULLP;
#endif
if(rbCb->m.amUl.partialSdu != NULLP)
{
-
KW
_FREE_BUF_WC(rbCb->m.amUl.partialSdu);
+
RLC
_FREE_BUF_WC(rbCb->m.amUl.partialSdu);
}
RETVOID;
} /* kwAmmFreeUlRbCb */
}
RETVOID;
} /* kwAmmFreeUlRbCb */