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
replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC() traces...
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_lmm.c
diff --git
a/src/5gnrsch/rg_sch_lmm.c
b/src/5gnrsch/rg_sch_lmm.c
index
9903a9f
..
8f06546
100755
(executable)
--- a/
src/5gnrsch/rg_sch_lmm.c
+++ b/
src/5gnrsch/rg_sch_lmm.c
@@
-139,8
+139,6
@@
Elmnt sapType; /* SAP Type */
RgSchUpSapCfgInfo *upSapCfg = NULLP;
Inst inst = (dInst - SCH_INST_START);
RgSchUpSapCfgInfo *upSapCfg = NULLP;
Inst inst = (dInst - SCH_INST_START);
- TRC2(rgSCHLmmSapCfg)
-
/* Check if Gen Config has been done */
switch(sapType)
/* Check if Gen Config has been done */
switch(sapType)
@@
-214,8
+212,8
@@
Elmnt sapType; /* SAP Type */
lowSapCfg->sapPst.prior = cfg->s.schInstCfg.tfuSap[sapIdx].prior;
lowSapCfg->suId = cfg->s.schInstCfg.tfuSap[sapIdx].suId;
lowSapCfg->spId = cfg->s.schInstCfg.tfuSap[sapIdx].spId;
lowSapCfg->sapPst.prior = cfg->s.schInstCfg.tfuSap[sapIdx].prior;
lowSapCfg->suId = cfg->s.schInstCfg.tfuSap[sapIdx].suId;
lowSapCfg->spId = cfg->s.schInstCfg.tfuSap[sapIdx].spId;
-
cmMemcpy((U8 *)
&lowSapCfg->bndTmr,
-
(U8 *)
&cfg->s.schInstCfg.tfuSap[sapIdx].bndTmr,
+
memcpy(
&lowSapCfg->bndTmr,
+ &cfg->s.schInstCfg.tfuSap[sapIdx].bndTmr,
sizeof(TmrCfg));
break;
case STRGMSAP:
sizeof(TmrCfg));
break;
case STRGMSAP:
@@
-299,8
+297,6
@@
Inst inst;
RgSchClcBoRpt *bo = NULL;
#endif
RgSchClcBoRpt *bo = NULL;
#endif
- TRC2(rgSCHLmmShutdown)
-
#ifdef LTE_L2_MEAS
for (idx = 0; idx < instCb->numSaps; idx++)
{
#ifdef LTE_L2_MEAS
for (idx = 0; idx < instCb->numSaps; idx++)
{
@@
-453,7
+449,6
@@
Pst *cfmPst;
#endif
{
Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance ID */
#endif
{
Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance ID */
- TRC2(rgSCHLmmGenCntrl)
cfm->cfm.status = LCM_PRIM_OK;
cfm->cfm.reason = LCM_REASON_NOT_APPL;
cfm->cfm.status = LCM_PRIM_OK;
cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@
-469,8
+464,8
@@
Pst *cfmPst;
/* Enable Unsolicited Status (alarms) */
rgSchCb[inst].rgSchInit.usta = TRUE;
/*Store the response and TransId for sending the Alarms */
/* Enable Unsolicited Status (alarms) */
rgSchCb[inst].rgSchInit.usta = TRUE;
/*Store the response and TransId for sending the Alarms */
-
cmMemcpy((U8 *)
&rgSchCb[inst].genCfg.ustaResp.response,
-
(U8 *)
&cntrl->hdr.response, sizeof(Resp));
+
memcpy(
&rgSchCb[inst].genCfg.ustaResp.response,
+ &cntrl->hdr.response, sizeof(Resp));
rgSchCb[inst].genCfg.ustaResp.transId = cntrl->hdr.transId;
break;
case SADBG:
rgSchCb[inst].genCfg.ustaResp.transId = cntrl->hdr.transId;
break;
case SADBG:
@@
-498,8
+493,8
@@
Pst *cfmPst;
* L2
* statistics
* */
* L2
* statistics
* */
-
cmMemset((U8 *)
&hqRetxStats, 0, sizeof(RgSchHqRetxStats));
-
cmMemset((U8 *)
&hqFailStats, 0, sizeof(RgSchNackAckStats));
+
memset(
&hqRetxStats, 0, sizeof(RgSchHqRetxStats));
+
memset(
&hqFailStats, 0, sizeof(RgSchNackAckStats));
#endif
break;
}
#endif
break;
}
@@
-585,7
+580,6
@@
Pst *cfmPst;
/* TODO Pass InstId instead of using InstId from cfmPst */
Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance Id */
/* TODO Pass InstId instead of using InstId from cfmPst */
Inst inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance Id */
- TRC2(rgSCHLmmSapCntrl)
/* Only TFU SAP can be controlled by LM */
switch(cntrl->hdr.elmId.elmnt)
/* Only TFU SAP can be controlled by LM */
switch(cntrl->hdr.elmId.elmnt)
@@
-620,8
+614,8
@@
Pst *cfmPst;
rgSchCb[inst].tfuSap[idx].numBndRetries++;
/* Store the response and TransId for sending
* the Control confirm */
rgSchCb[inst].tfuSap[idx].numBndRetries++;
/* Store the response and TransId for sending
* the Control confirm */
-
cmMemcpy((U8 *)
&rgSchCb[inst].genCfg.bndCfmResp[idx].response,
-
(U8 *)
&cntrl->hdr.response, sizeof(Resp));
+
memcpy(
&rgSchCb[inst].genCfg.bndCfmResp[idx].response,
+ &cntrl->hdr.response, sizeof(Resp));
rgSchCb[inst].genCfg.bndCfmResp[idx].transId =
cntrl->hdr.transId;
rgSchCb[inst].genCfg.bndCfmResp[idx].transId =
cntrl->hdr.transId;
@@
-675,7
+669,7
@@
Pst *cfmPst;
(PTR)&rgSchCb[inst].tfuSap[idx]);
}
}
(PTR)&rgSchCb[inst].tfuSap[idx]);
}
}
-
cmMemset((U8 *)
&rgSchCb[inst].tfuSap[idx], 0, sizeof(RgSchLowSapCb));
+
memset(
&rgSchCb[inst].tfuSap[idx], 0, sizeof(RgSchLowSapCb));
rgSchCb[inst].tfuSap[idx].sapSta.sapState = LRG_NOT_CFG;
cfm->cfm.status = LCM_PRIM_OK;
cfm->cfm.reason = LCM_REASON_NOT_APPL;
rgSchCb[inst].tfuSap[idx].sapSta.sapState = LRG_NOT_CFG;
cfm->cfm.status = LCM_PRIM_OK;
cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@
-698,7
+692,7
@@
Pst *cfmPst;
switch(cntrl->t.cntrl.action)
{
case ADEL:
switch(cntrl->t.cntrl.action)
{
case ADEL:
-
cmMemset((U8 *)
&rgSchCb[inst].rgrSap[idx], 0, sizeof(RgSchUpSapCb));
+
memset(
&rgSchCb[inst].rgrSap[idx], 0, sizeof(RgSchUpSapCb));
rgSchCb[inst].rgrSap[idx].sapSta.sapState = LRG_NOT_CFG;
cfm->cfm.status = LCM_PRIM_OK;
cfm->cfm.reason = LCM_REASON_NOT_APPL;
rgSchCb[inst].rgrSap[idx].sapSta.sapState = LRG_NOT_CFG;
cfm->cfm.status = LCM_PRIM_OK;
cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@
-721,7
+715,7
@@
Pst *cfmPst;
switch(cntrl->t.cntrl.action)
{
case ADEL:
switch(cntrl->t.cntrl.action)
{
case ADEL:
-
cmMemset((U8 *)
&rgSchCb[inst].rgmSap[idx], 0, sizeof(RgSchUpSapCb));
+
memset(
&rgSchCb[inst].rgmSap[idx], 0, sizeof(RgSchUpSapCb));
rgSchCb[inst].rgmSap[idx].sapSta.sapState = LRG_NOT_CFG;
cfm->cfm.status = LCM_PRIM_OK;
cfm->cfm.reason = LCM_REASON_NOT_APPL;
rgSchCb[inst].rgmSap[idx].sapSta.sapState = LRG_NOT_CFG;
cfm->cfm.status = LCM_PRIM_OK;
cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@
-776,8
+770,6
@@
RgMngmt *cfm;
{
Inst inst;
{
Inst inst;
- TRC2(SchFillCfmPst)
-
inst = (reqPst->dstInst - SCH_INST_START);
cfmPst->srcEnt = ENTMAC;
inst = (reqPst->dstInst - SCH_INST_START);
cfmPst->srcEnt = ENTMAC;
@@
-832,12
+824,10
@@
PTR cb; /* Entry for which Timer Expired */
CmTmrArg arg;
/* Inst dInst = inst + SCH_INST_START; */
CmTmrArg arg;
/* Inst dInst = inst + SCH_INST_START; */
- TRC2(rgSCHLmmStartTmr)
-
UNUSED(tmrEvnt);
/* Initialize the arg structure */
UNUSED(tmrEvnt);
/* Initialize the arg structure */
-
cmMemset((U8 *)
&arg, 0, sizeof(CmTmrArg));
+
memset(
&arg, 0, sizeof(CmTmrArg));
arg.tqCp = &rgSchCb[inst].tmrTqCp;
arg.tq = rgSchCb[inst].tmrTq;
arg.tqCp = &rgSchCb[inst].tmrTqCp;
arg.tq = rgSchCb[inst].tmrTq;
@@
-890,8
+880,6
@@
PTR cb; /* Entry for which Timer Expired */
U8 i;
S16 ret;
U8 i;
S16 ret;
- TRC2(rgSCHLmmStopTmr)
-
ret = RFAILED;
for(i=0;i<RGSCH_MAX_TIMER;i++)
ret = RFAILED;
for(i=0;i<RGSCH_MAX_TIMER;i++)
@@
-900,7
+888,7
@@
PTR cb; /* Entry for which Timer Expired */
if(((RgSchLowSapCb *)cb)->tmrBlk.tmrEvnt == tmrEvnt)
{
/* Initialize the arg structure */
if(((RgSchLowSapCb *)cb)->tmrBlk.tmrEvnt == tmrEvnt)
{
/* Initialize the arg structure */
-
cmMemset((U8 *)
&arg, 0, sizeof(CmTmrArg));
+
memset(
&arg, 0, sizeof(CmTmrArg));
arg.tqCp = &rgSchCb[inst].tmrTqCp;
arg.tq = rgSchCb[inst].tmrTq;
arg.tqCp = &rgSchCb[inst].tmrTqCp;
arg.tq = rgSchCb[inst].tmrTq;
@@
-955,7
+943,6
@@
S16 tmrEvnt; /* Timer Event */
#ifdef DEBUGP
Inst inst = tfuSap->cell->instIdx;
#endif
#ifdef DEBUGP
Inst inst = tfuSap->cell->instIdx;
#endif
- TRC2(rgSCHLmmTmrExpiry)
switch(tmrEvnt)
switch(tmrEvnt)
@@
-1032,8
+1019,6
@@
U8 status; /* Status */
Pst cfmPst;
Inst inst = (pst->dstInst - SCH_INST_START); /* scheduler instance */
Pst cfmPst;
Inst inst = (pst->dstInst - SCH_INST_START); /* scheduler instance */
- TRC2(rgSCHLmmBndCfm)
-
/* check the SAP State */
switch(rgSchCb[inst].tfuSap[suId].sapSta.sapState)
/* check the SAP State */
switch(rgSchCb[inst].tfuSap[suId].sapSta.sapState)
@@
-1054,7
+1039,7
@@
U8 status; /* Status */
cfmPst.region = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.region;
cfmPst.pool = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.pool;
cfmPst.region = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.region;
cfmPst.pool = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.pool;
-
cmMemset((U8 *)
&cntrlCfm, 0, sizeof(RgMngmt));
+
memset(
&cntrlCfm, 0, sizeof(RgMngmt));
switch(status)
{
switch(status)
{
@@
-1132,14
+1117,12
@@
RgUstaDgn *dgn;
{
RgMngmt usta;
{
RgMngmt usta;
- TRC2(rgSCHLmmStaInd)
-
if(rgSchCb[inst].rgSchInit.usta == FALSE)
{
return ROK;
}
if(rgSchCb[inst].rgSchInit.usta == FALSE)
{
return ROK;
}
-
cmMemset((U8 *)
&usta, 0, sizeof(RgMngmt));
+
memset(
&usta, 0, sizeof(RgMngmt));
SGetDateTime(&usta.t.usta.cmAlarm.dt);
usta.t.usta.cmAlarm.category = category;
SGetDateTime(&usta.t.usta.cmAlarm.dt);
usta.t.usta.cmAlarm.category = category;
@@
-1147,7
+1130,7
@@
RgUstaDgn *dgn;
usta.t.usta.cmAlarm.cause = cause;
if (dgn != NULLP)
{
usta.t.usta.cmAlarm.cause = cause;
if (dgn != NULLP)
{
-
cmMemcpy((U8 *)&usta.t.usta.dgn, (U8 *)
dgn, sizeof(RgUstaDgn));
+
memcpy(&usta.t.usta.dgn,
dgn, sizeof(RgUstaDgn));
}
rgSchCb[inst].rgSchInit.lmPst.selector =
}
rgSchCb[inst].rgSchInit.lmPst.selector =
@@
-1195,7
+1178,6
@@
Inst inst;
#endif
{
Inst schInst = (inst - SCH_INST_START);
#endif
{
Inst schInst = (inst - SCH_INST_START);
- TRC2(schActvTmr)
/* Check if any timer in the scheduler instance has expired */
cmPrcTmr(&rgSchCb[schInst].tmrTqCp,
/* Check if any timer in the scheduler instance has expired */
cmPrcTmr(&rgSchCb[schInst].tmrTqCp,