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_utl_ul.c
diff --git
a/src/5gnrrlc/kw_utl_ul.c
b/src/5gnrrlc/kw_utl_ul.c
index
6cb027c
..
b4742a4
100755
(executable)
--- a/
src/5gnrrlc/kw_utl_ul.c
+++ b/
src/5gnrrlc/kw_utl_ul.c
@@
-98,19
+98,19
@@
PUBLIC KwAmRecBuf* kwUtlGetRecBuf(CmLListCp *recBufLst, KwSn sn);
#ifdef ANSI
PUBLIC S16 kwUtlRcvFrmLi
(
#ifdef ANSI
PUBLIC S16 kwUtlRcvFrmLi
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
KwDatIndInfo *datIndInfo
)
#else
PUBLIC S16 kwUtlRcvFrmLi(gCb,datIndInfo)
KwDatIndInfo *datIndInfo
)
#else
PUBLIC S16 kwUtlRcvFrmLi(gCb,datIndInfo)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
KwDatIndInfo *datIndInfo;
#endif
{
U32 count; /* Loop Counter */
KwPduInfo *pduInfo; /* PDU Information */
KwDatIndInfo *datIndInfo;
#endif
{
U32 count; /* Loop Counter */
KwPduInfo *pduInfo; /* PDU Information */
-
Kw
UlRbCb *rbCb; /* RB Control Block */
-
Kw
UlUeCb *ueCb; /* UE Control Block */
+
Rlc
UlRbCb *rbCb; /* RB Control Block */
+
Rlc
UlUeCb *ueCb; /* UE Control Block */
/* kw005.201 added support for L2 Measurement */
TRC2(kwUtlRcvFrmLi)
/* kw005.201 added support for L2 Measurement */
TRC2(kwUtlRcvFrmLi)
@@
-133,7
+133,7
@@
KwDatIndInfo *datIndInfo;
{
if(datIndInfo->lchData[i].pdu.mBuf[j])
{
{
if(datIndInfo->lchData[i].pdu.mBuf[j])
{
-
KW
_FREE_BUF_WC(datIndInfo->lchData[i].pdu.mBuf[j]);
+
RLC
_FREE_BUF_WC(datIndInfo->lchData[i].pdu.mBuf[j]);
}
}
}
}
}
}
@@
-168,7
+168,7
@@
KwDatIndInfo *datIndInfo;
{
if(pduInfo->mBuf[j])
{
{
if(pduInfo->mBuf[j])
{
-
KW
_FREE_BUF_WC(pduInfo->mBuf[j]);
+
RLC
_FREE_BUF_WC(pduInfo->mBuf[j]);
}
}
continue;
}
}
continue;
@@
-217,14
+217,14
@@
KwDatIndInfo *datIndInfo;
#ifdef ANSI
PUBLIC S16 kwUtlSndDatInd
(
#ifdef ANSI
PUBLIC S16 kwUtlSndDatInd
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
Buffer *sdu
)
#else
PUBLIC S16 kwUtlSndDatInd(gCb,rbCb,sdu)
Buffer *sdu
)
#else
PUBLIC S16 kwUtlSndDatInd(gCb,rbCb,sdu)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
Buffer *sdu;
#endif
{
Buffer *sdu;
#endif
{
@@
-248,7
+248,7
@@
Buffer *sdu;
"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(sdu);
+
RLC
_FREE_BUF(sdu);
RETVALUE(RFAILED);
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
RETVALUE(RFAILED);
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
@@
-273,7
+273,7
@@
Buffer *sdu;
} /* kwUtlSndDatInd */
} /* kwUtlSndDatInd */
-PRIVATE Void dumpRLCUlRbInformation(
Kw
UlRbCb* ulRbCb)
+PRIVATE Void dumpRLCUlRbInformation(
Rlc
UlRbCb* ulRbCb)
{
if(ulRbCb->mode == CM_LTE_MODE_UM)
{
{
if(ulRbCb->mode == CM_LTE_MODE_UM)
{
@@
-324,9
+324,9
@@
PRIVATE Void dumpRLCUlRbInformation(KwUlRbCb* ulRbCb)
Void DumpRLCUlDebugInformation(Void)
{
Void DumpRLCUlDebugInformation(Void)
{
-
KwCb* ulInst = kw
Cb[0]; /* TODO : Check whether UL is 0 or 1 */
-
Kw
UlCb* ulCb = ulInst->u.ulCb;
-
Kw
UlUeCb *ueCb = NULLP;
+
RlcCb* ulInst = rlc
Cb[0]; /* TODO : Check whether UL is 0 or 1 */
+
Rlc
UlCb* ulCb = ulInst->u.ulCb;
+
Rlc
UlUeCb *ueCb = NULLP;
/* Until no more ueCb is ueLstCp hash list get and delete ueCb */
while (ROK == cmHashListGetNext(&ulCb->ueLstCp,
/* Until no more ueCb is ueLstCp hash list get and delete ueCb */
while (ROK == cmHashListGetNext(&ulCb->ueLstCp,
@@
-336,7
+336,7
@@
Void DumpRLCUlDebugInformation(Void)
U32 i;
for(i = 0; i< KW_MAX_SRB_PER_UE; i++)
{
U32 i;
for(i = 0; i< KW_MAX_SRB_PER_UE; i++)
{
-
Kw
UlRbCb* ulRbCb = ueCb->srbCb[i];
+
Rlc
UlRbCb* ulRbCb = ueCb->srbCb[i];
if(ulRbCb != NULLP)
{
dumpRLCUlRbInformation(ulRbCb);
if(ulRbCb != NULLP)
{
dumpRLCUlRbInformation(ulRbCb);
@@
-344,7
+344,7
@@
Void DumpRLCUlDebugInformation(Void)
}
for(i = 0; i< KW_MAX_DRB_PER_UE; i++)
{
}
for(i = 0; i< KW_MAX_DRB_PER_UE; i++)
{
-
Kw
UlRbCb* ulRbCb = ueCb->drbCb[i];
+
Rlc
UlRbCb* ulRbCb = ueCb->drbCb[i];
if(ulRbCb != NULLP)
{
dumpRLCUlRbInformation(ulRbCb);
if(ulRbCb != NULLP)
{
dumpRLCUlRbInformation(ulRbCb);
@@
-376,7
+376,7
@@
Void DumpRLCUlDebugInformation(Void)
* @return S16
* -# ROK
*/
* @return S16
* -# ROK
*/
-S16 kwUtlL2MeasUlInit(
Kw
Cb *gCb)
+S16 kwUtlL2MeasUlInit(
Rlc
Cb *gCb)
{
U16 cntr;
{
U16 cntr;
@@
-406,14
+406,14
@@
S16 kwUtlL2MeasUlInit(KwCb *gCb)
#ifdef ANSI
PUBLIC Void kwUtlCalUlIpThrPutIncTTI
(
#ifdef ANSI
PUBLIC Void kwUtlCalUlIpThrPutIncTTI
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
U32 ttiCnt
)
#else
PUBLIC Void kwUtlCalUlIpThrPutIncTTI(gCb, rbCb, ttiCnt)
U32 ttiCnt
)
#else
PUBLIC Void kwUtlCalUlIpThrPutIncTTI(gCb, rbCb, ttiCnt)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
U32 ttiCnt;
#endif
{
U32 ttiCnt;
#endif
{
@@
-485,15
+485,15
@@
U32 ttiCnt;
#ifdef ANSI
PUBLIC Void kwUtlCalUlIpThrPut
(
#ifdef ANSI
PUBLIC Void kwUtlCalUlIpThrPut
(
-
Kw
Cb *gCb,
-
Kw
UlRbCb *rbCb,
+
Rlc
Cb *gCb,
+
Rlc
UlRbCb *rbCb,
Buffer *pdu,
U32 ttiCnt
)
#else
PUBLIC Void kwUtlCalUlIpThrPut(gCb, rbCb, pdu, ttiCnt)
Buffer *pdu,
U32 ttiCnt
)
#else
PUBLIC Void kwUtlCalUlIpThrPut(gCb, rbCb, pdu, ttiCnt)
-
Kw
Cb *gCb;
-
Kw
UlRbCb *rbCb;
+
Rlc
Cb *gCb;
+
Rlc
UlRbCb *rbCb;
Buffer *pdu;
U32 ttiCnt;
#endif
Buffer *pdu;
U32 ttiCnt;
#endif
@@
-542,12
+542,12
@@
PUBLIC Void kwUtlCalUlIpThrPut(gCb, rbCb, pdu, ttiCnt)
#ifdef ANSI
PUBLIC S16 kwUtlHdlL2TmrExp
(
#ifdef ANSI
PUBLIC S16 kwUtlHdlL2TmrExp
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
KwL2MeasEvtCb *measEvtCb
)
#else
PUBLIC S16 kwUtlHdlL2TmrExp(measEvtCb)
KwL2MeasEvtCb *measEvtCb
)
#else
PUBLIC S16 kwUtlHdlL2TmrExp(measEvtCb)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
KwL2MeasEvtCb *measEvtCb;
#endif
{
KwL2MeasEvtCb *measEvtCb;
#endif
{
@@
-566,7
+566,7
@@
KwL2MeasEvtCb *measEvtCb;
for(qciIdx = 0; qciIdx < measCb->val.nonIpThMeas.numQci;qciIdx++)
{
measCb->val.nonIpThMeas.measData[measCb->val.nonIpThMeas.qci[qciIdx]].actUe.numActvUe +=
for(qciIdx = 0; qciIdx < measCb->val.nonIpThMeas.numQci;qciIdx++)
{
measCb->val.nonIpThMeas.measData[measCb->val.nonIpThMeas.qci[qciIdx]].actUe.numActvUe +=
-
kw
Cb.kwL2Cb.numActUe[measCb->val.nonIpThMeas.qci[qciIdx]];
+
rlc
Cb.kwL2Cb.numActUe[measCb->val.nonIpThMeas.qci[qciIdx]];
measCb->val.nonIpThMeas.measData[measCb->val.nonIpThMeas.qci[qciIdx]].actUe.sampOc++;
}
measEvtCb->val.nonIpThMeas.measCb.numSamples--;
measCb->val.nonIpThMeas.measData[measCb->val.nonIpThMeas.qci[qciIdx]].actUe.sampOc++;
}
measEvtCb->val.nonIpThMeas.measCb.numSamples--;
@@
-598,12
+598,12
@@
KwL2MeasEvtCb *measEvtCb;
#ifdef ANSI
PUBLIC S16 kwUtlSndUlL2MeasCfm
(
#ifdef ANSI
PUBLIC S16 kwUtlSndUlL2MeasCfm
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
KwL2MeasEvtCb *measEvtCb
)
#else
PUBLIC S16 kwUtlSndUlL2MeasCfm(gCb, measEvtCb)
KwL2MeasEvtCb *measEvtCb
)
#else
PUBLIC S16 kwUtlSndUlL2MeasCfm(gCb, measEvtCb)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
KwL2MeasEvtCb *measEvtCb;
#endif
{
KwL2MeasEvtCb *measEvtCb;
#endif
{
@@
-706,13
+706,13
@@
KwL2MeasEvtCb *measEvtCb;
#ifdef ANSI
PUBLIC S16 kwUtlSndUlL2MeasNCfm
(
#ifdef ANSI
PUBLIC S16 kwUtlSndUlL2MeasNCfm
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
KwL2MeasReqEvt *measReqEvt,
KwL2MeasCfmEvt *measCfmEvt
)
#else
PUBLIC S16 kwUtlSndUlL2MeasNCfm(gCb, measReqEvt, measCfmEvt)
KwL2MeasReqEvt *measReqEvt,
KwL2MeasCfmEvt *measCfmEvt
)
#else
PUBLIC S16 kwUtlSndUlL2MeasNCfm(gCb, measReqEvt, measCfmEvt)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
KwL2MeasReqEvt *measReqEvt;
KwL2MeasCfmEvt *measCfmEvt;
#endif
KwL2MeasReqEvt *measReqEvt;
KwL2MeasCfmEvt *measCfmEvt;
#endif
@@
-803,7
+803,7
@@
U8 *numLCh;
}
/* Check for total maximum number of Measurement Control Block */
}
/* Check for total maximum number of Measurement Control Block */
- if(
kw
Cb.kwL2Cb.kwNumMeas >= LKW_MAX_L2MEAS )
+ if(
rlc
Cb.kwL2Cb.kwNumMeas >= LKW_MAX_L2MEAS )
{
measCfmEvt->transId = measReqEvt->transId;
measCfmEvt->measType = measType;
{
measCfmEvt->transId = measReqEvt->transId;
measCfmEvt->measType = measType;
@@
-842,7
+842,7
@@
U8 *numLCh;
for(qciIdx = 0; qciIdx < numQci; qciIdx++)
{
qci = qciVal[qciIdx];
for(qciIdx = 0; qciIdx < numQci; qciIdx++)
{
qci = qciVal[qciIdx];
- ret = cmHashListFind(&(
kw
Cb.kwL2Cb.qciHlCp),
+ ret = cmHashListFind(&(
rlc
Cb.kwL2Cb.qciHlCp),
(U8 *)&qci, (U16)sizeof(qci), 0, (PTR *)&rbCb);
if(ret != ROK)
{
(U8 *)&qci, (U16)sizeof(qci), 0, (PTR *)&rbCb);
if(ret != ROK)
{
@@
-862,7
+862,7
@@
U8 *numLCh;
{
for(qciIdx = 0; qciIdx < numQci; qciIdx++)
{
{
for(qciIdx = 0; qciIdx < numQci; qciIdx++)
{
- if(
kw
Cb.kwL2Cb.measOn[qci] & measReqEvt->measReq.measType)
+ if(
rlc
Cb.kwL2Cb.measOn[qci] & measReqEvt->measReq.measType)
{
/* measurement is already ongoing */
measCfmEvt->status.status = LCM_PRIM_NOK;
{
/* measurement is already ongoing */
measCfmEvt->status.status = LCM_PRIM_NOK;
@@
-947,13
+947,13
@@
KwL2MeasCfmEvt *measCfmEvt;
PUBLIC Void kwUtlResetUlL2MeasInKwRb
(
PUBLIC Void kwUtlResetUlL2MeasInKwRb
(
-
Kw
Cb *gCb,
+
Rlc
Cb *gCb,
KwL2MeasCb *measCb,
U8 measType
)
#else
PUBLIC Void kwUtlResetUlL2MeasInKwRb(measCb, measType)
KwL2MeasCb *measCb,
U8 measType
)
#else
PUBLIC Void kwUtlResetUlL2MeasInKwRb(measCb, measType)
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
KwL2MeasCb *measCb;
U8 measType;
#endif
KwL2MeasCb *measCb;
U8 measType;
#endif
@@
-961,7
+961,7
@@
U8 measType;
U32 rbIdx;
U32 ueIdx;
U32 qciIdx;
U32 rbIdx;
U32 ueIdx;
U32 qciIdx;
-
Kw
UlUeCb *ueCb = NULL;
+
Rlc
UlUeCb *ueCb = NULL;
@@
-1169,13
+1169,13
@@
PUBLIC Void kwUtlDelRecBuf
(
CmLListCp *recBufLst,
KwAmRecBuf *recBuf,
(
CmLListCp *recBufLst,
KwAmRecBuf *recBuf,
-
Kw
Cb *gCb
+
Rlc
Cb *gCb
)
#else
PUBLIC Void kwUtlDelRecBuf(recBufLst, recBufi, gCb)
CmLListCp *recBufLst;
KwAmRecBuf *recBuf;
)
#else
PUBLIC Void kwUtlDelRecBuf(recBufLst, recBufi, gCb)
CmLListCp *recBufLst;
KwAmRecBuf *recBuf;
-
Kw
Cb *gCb;
+
Rlc
Cb *gCb;
#endif
{
U32 hashKey;
#endif
{
U32 hashKey;
@@
-1187,7
+1187,7
@@
KwCb *gCb;
recBufLstCp = &recBufLst[hashKey];
cmLListDelFrm(recBufLstCp, &recBuf->lnk);
recBufLstCp = &recBufLst[hashKey];
cmLListDelFrm(recBufLstCp, &recBuf->lnk);
-
KW
_FREE_WC(gCb, recBuf, sizeof(KwAmRecBuf));
+
RLC
_FREE_WC(gCb, recBuf, sizeof(KwAmRecBuf));
RETVOID;
} /* kwUtlDelRecBuf */
RETVOID;
} /* kwUtlDelRecBuf */