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
Merge "replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC()...
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_utl.c
diff --git
a/src/5gnrmac/rg_utl.c
b/src/5gnrmac/rg_utl.c
index
f6b7b50
..
87fe3e5
100755
(executable)
--- a/
src/5gnrmac/rg_utl.c
+++ b/
src/5gnrmac/rg_utl.c
@@
-128,8
+128,6
@@
Size size; /* size */
{
RgUstaDgn dgn; /* Alarm diagnostics structure */
{
RgUstaDgn dgn; /* Alarm diagnostics structure */
- TRC2(rgAllocShrablSBuf)
-
/* Initialize the param to NULLP */
*pData = NULLP;
/* Initialize the param to NULLP */
*pData = NULLP;
@@
-160,7
+158,7
@@
Size size; /* size */
#endif
/* zero out the allocated memory */
#endif
/* zero out the allocated memory */
-
cmMemset((U8 *)
*pData, 0x00, size);
+
memset(
*pData, 0x00, size);
return ROK;
return ROK;
@@
-200,8
+198,6
@@
Size size; /* size */
{
RgUstaDgn dgn; /* Alarm diagnostics structure */
{
RgUstaDgn dgn; /* Alarm diagnostics structure */
- TRC2(rgAllocSBuf)
-
/* Initialize the param to NULLP */
*pData = NULLP;
/* Initialize the param to NULLP */
*pData = NULLP;
@@
-227,7
+223,7
@@
Size size; /* size */
}
/* zero out the allocated memory */
}
/* zero out the allocated memory */
-
cmMemset((U8 *)
*pData, 0x00, size);
+
memset(
*pData, 0x00, size);
return ROK;
return ROK;
@@
-266,8
+262,6
@@
Size size; /* size */
S16 ret;
S16 ret;
- TRC2(rgFreeSharableBuf)
-
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
RETVOID;
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
RETVOID;
@@
-322,8
+316,6
@@
Size size; /* size */
S16 ret;
S16 ret;
- TRC2(rgFreeSBuf)
-
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
RETVOID;
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
RETVOID;
@@
-379,8
+371,6
@@
Buffer **mBuf; /* Message Buffer pointer be returned */
{
S16 ret;
{
S16 ret;
- TRC2(rgGetMsg)
-
#ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */
MS_BUF_ADD_ALLOC_CALLER();
#endif /* */
#ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */
MS_BUF_ADD_ALLOC_CALLER();
#endif /* */
@@
-433,8
+423,6
@@
U8 dgnType;
#endif
{
#endif
{
- TRC2(rgFillDgnParams)
-
switch(dgnType)
{
case LRG_USTA_DGNVAL_MEM:
switch(dgnType)
{
case LRG_USTA_DGNVAL_MEM:
@@
-486,10
+474,6
@@
RgRguDedDatReq *datReq; /* DatReq pointer */
U8 idx1,idx2;
U32 idx;
U8 idx1,idx2;
U32 idx;
-
- TRC2(rgUpdtRguDedSts)
-
-
switch(stsType)
{
case RG_RGU_SDU_RCVD:
switch(stsType)
{
case RG_RGU_SDU_RCVD:
@@
-560,9
+544,6
@@
RgUpSapCb *rguDlSap;
U8 stsType; /* Statistics type to update */
#endif
{
U8 stsType; /* Statistics type to update */
#endif
{
- TRC2(rgUpdtRguCmnSts)
-
-
switch(stsType)
{
switch(stsType)
{
@@
-608,7
+589,6
@@
Inst inst;
U8 updtType;
#endif
{
U8 updtType;
#endif
{
- TRC2(rgUpdtCellCnt);
switch (updtType)
{
switch (updtType)
{
@@
-655,8
+635,6
@@
Inst inst;
U8 updtType;
#endif
{
U8 updtType;
#endif
{
- TRC2(rgUpdtUeCnt);
-
switch (updtType)
{
case RG_CFG_ADD:
switch (updtType)
{
case RG_CFG_ADD:
@@
-702,8
+680,6
@@
Size memSize;
Mem sMem;
VOLATILE U32 startTime=0;
Mem sMem;
VOLATILE U32 startTime=0;
- TRC2(rgAllocEventMem)
-
sMem.region = rgCb[inst].rgInit.region;
sMem.pool = rgCb[inst].rgInit.pool;
sMem.region = rgCb[inst].rgInit.region;
sMem.pool = rgCb[inst].rgInit.pool;
@@
-771,7
+747,6
@@
Ptr memCp;
{
S16 ret;
{
S16 ret;
- TRC2(rgGetEventMem)
#ifdef TFU_ALLOC_EVENT_NO_INIT
ret = cmGetMemNoInit(memCp, len, (Ptr *)ptr);
#else
#ifdef TFU_ALLOC_EVENT_NO_INIT
ret = cmGetMemNoInit(memCp, len, (Ptr *)ptr);
#else
@@
-811,7
+786,6
@@
Inst srcInst;
Inst dstInst;
#endif
{
Inst dstInst;
#endif
{
- TRC2(rgGetPstToInst);
pst->srcEnt = rgCb[srcInst].rgInit.ent;
pst->srcInst = rgCb[srcInst].rgInit.inst;
pst->srcEnt = rgCb[srcInst].rgInit.ent;
pst->srcInst = rgCb[srcInst].rgInit.inst;
@@
-867,8
+841,6
@@
RgInfLcgRegReq *lcgRegReq;
RgCellCb *cell = NULLP;
RgUeCb *ue;
RgCellCb *cell = NULLP;
RgUeCb *ue;
- TRC2(RgSchMacLcgRegReq);
-
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
@@
-926,8
+898,6
@@
RgInfUlSpsReset *ulSpsResetInfo;
RgCellCb *cell = NULLP;
RgUeCb *ue;
RgCellCb *cell = NULLP;
RgUeCb *ue;
- TRC2(RgSchMacUlSpsResetReq);
-
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
@@
-997,8
+967,6
@@
RgInfSpsLcInfo *lcInfo;
RgUeCb *ue;
U8 idx;
RgUeCb *ue;
U8 idx;
- TRC2(RgSchMacSpsLcRegReq);
-
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
@@
-1081,8
+1049,6
@@
CmLteRnti crnti;
RgCellCb *cell = NULLP;
RgUeCb *ue;
RgCellCb *cell = NULLP;
RgUeCb *ue;
- TRC2(RgSchMacSpsLcDeregReq);
-
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
cell = rgCb[inst].cell;
@@
-1150,8
+1116,6
@@
CmLteRnti newRnti;
RgUeCb *ue = NULLP;
RgUeCb *newUe = NULLP;
RgUeCb *ue = NULLP;
RgUeCb *newUe = NULLP;
- TRC3(rgUtlHndlCrntiChng)
-
ue = rgDBMGetUeCb(cell, rnti);
newUe = rgDBMGetUeCbFromRachLst(cell, newRnti);
if ((ue == NULLP) || (newUe == NULLP))
ue = rgDBMGetUeCb(cell, rnti);
newUe = rgDBMGetUeCbFromRachLst(cell, newRnti);
if ((ue == NULLP) || (newUe == NULLP))
@@
-1168,7
+1132,7
@@
CmLteRnti newRnti;
ue->ueId = newRnti;
ue->ueId = newRnti;
-
cmMemcpy((U8*)&(ue->contResId), (U8*)
&(newUe->contResId),
+
memcpy(&(ue->contResId),
&(newUe->contResId),
sizeof(newUe->contResId));
/* Fix : syed MSG4 might be RETXing need to store the
* HARQ context. */
sizeof(newUe->contResId));
/* Fix : syed MSG4 might be RETXing need to store the
* HARQ context. */
@@
-1217,8
+1181,6
@@
RgUeCb *ue;
Pst dstInstPst;
RgPrgUeSCellDelInfo ueSCellDelInfo;
Pst dstInstPst;
RgPrgUeSCellDelInfo ueSCellDelInfo;
- TRC2(rgDelUeFrmAllSCell)
-
/* To Delete the SCells if exisits for that UE */
for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++)
{
/* To Delete the SCells if exisits for that UE */
for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++)
{
@@
-1272,9
+1234,7
@@
S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
{
S16 ret = ROK;
{
S16 ret = ROK;
- TRC3(rgUtlVltdAddSCellCfg)
-
- /* To Validate the CellID presence */
+ /* To Validate the CellID presence */
if((cell == NULLP) ||
(cell->cellId != ueSCellCb->cellId))
{
if((cell == NULLP) ||
(cell->cellId != ueSCellCb->cellId))
{
@@
-1339,8
+1299,6
@@
CmLteRnti newRnti;
TfuDelDatReqInfo delDatReq;
#endif
TfuDelDatReqInfo delDatReq;
#endif
- TRC2(rgUtlSndCrntiChngReq2AllSMacs)
-
/* use newRnti to get UeCb in PMac because rnti is already changed in PMac*/
ue = rgDBMGetUeCb(cell, newRnti);
if (ue == NULLP)
/* use newRnti to get UeCb in PMac because rnti is already changed in PMac*/
ue = rgDBMGetUeCb(cell, newRnti);
if (ue == NULLP)
@@
-1417,8
+1375,6
@@
CmLteRnti *rlsRnti;
RgUeCb *spsUeCb = NULLP;
#endif
RgUeCb *spsUeCb = NULLP;
#endif
- TRC3(rgUtlHndlCrntiRls)
-
if ((ue = rgDBMGetUeCb(cell, rlsRnti->rnti)) == NULLP)
{
/* Check in RachLst */
if ((ue = rgDBMGetUeCb(cell, rlsRnti->rnti)) == NULLP)
{
/* Check in RachLst */
@@
-1509,8
+1465,6
@@
RgInfRlsRnti *rlsRnti;
TfuDelDatReqInfo delDatReq;
#endif
TfuDelDatReqInfo delDatReq;
#endif
- TRC3(RgSchMacRlsRntiReq)
-
RG_IS_INST_VALID(pst->dstInst);
macInst = pst->dstInst - RG_INST_START;
cell = rgCb[macInst].cell;
RG_IS_INST_VALID(pst->dstInst);
macInst = pst->dstInst - RG_INST_START;
cell = rgCb[macInst].cell;