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
removed ANSI part -2 JIRA ID - ODUHIGH-249
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_utl.c
diff --git
a/src/5gnrmac/rg_utl.c
b/src/5gnrmac/rg_utl.c
index
87fe3e5
..
aa02d4c
100755
(executable)
--- a/
src/5gnrmac/rg_utl.c
+++ b/
src/5gnrmac/rg_utl.c
@@
-70,13
+70,13
@@
static int RLOG_FILE_ID=179;
/* local externs */
/* forward references */
/* local externs */
/* forward references */
-
PRIVATE
S16 rgUtlHndlCrntiChng ARGS((
+
static
S16 rgUtlHndlCrntiChng ARGS((
Inst inst,
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
));
Inst inst,
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
));
-
PRIVATE
Void rgUtlHndlCrntiRls ARGS((
+
static
Void rgUtlHndlCrntiRls ARGS((
RgCellCb *cell,
RgInfRlsRnti *rlsRnti
));
RgCellCb *cell,
RgInfRlsRnti *rlsRnti
));
@@
-87,7
+87,7
@@
S16 rgDelUeFrmAllSCell ARGS((
));
#ifdef LTE_ADV
));
#ifdef LTE_ADV
-
PRIVATE
S16 rgUtlSndCrntiChngReq2AllSMacs ARGS((
+
static
S16 rgUtlSndCrntiChngReq2AllSMacs ARGS((
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
@@
-237,7
+237,7
@@
Size size; /* size */
* previously allocated by rgAllocSBuf() and size. It
* deallocates the memory.
*
* previously allocated by rgAllocSBuf() and size. It
* deallocates the memory.
*
-* Ret:
RETVOID
+* Ret:
void
*
* Notes: ccpu00117052 - MOD- changed the Data parameter from
* pointer to address of pointer so that
*
* Notes: ccpu00117052 - MOD- changed the Data parameter from
* pointer to address of pointer so that
@@
-264,7
+264,7
@@
Size size; /* size */
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
-
RETVOID
;
+
return
;
}
/* Deallocate buffer */
}
/* Deallocate buffer */
@@
-272,12
+272,12
@@
Size size; /* size */
if (ret != ROK)
{
if (ret != ROK)
{
-
RETVOID
;
+
return
;
}
*data = NULLP;
}
*data = NULLP;
-
RETVOID
;
+
return
;
} /* end of rgFreeSharableBuf */
} /* end of rgFreeSharableBuf */
@@
-291,7
+291,7
@@
Size size; /* size */
* previously allocated by rgAllocSBuf() and size. It
* deallocates the memory.
*
* previously allocated by rgAllocSBuf() and size. It
* deallocates the memory.
*
-* Ret:
RETVOID
+* Ret:
void
*
* Notes: ccpu00117052 - MOD- changed the Data parameter from
* pointer to address of pointer so that
*
* Notes: ccpu00117052 - MOD- changed the Data parameter from
* pointer to address of pointer so that
@@
-318,7
+318,7
@@
Size size; /* size */
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
-
RETVOID
;
+
return
;
}
}
@@
-331,12
+331,12
@@
Size size; /* size */
if (ret != ROK)
{
RGLOGERROR(inst,ERRCLS_DEBUG, ERG029, (ErrVal) 0, "rgFreeSBuf failed.\n");
if (ret != ROK)
{
RGLOGERROR(inst,ERRCLS_DEBUG, ERG029, (ErrVal) 0, "rgFreeSBuf failed.\n");
-
RETVOID
;
+
return
;
}
*data = NULLP;
}
*data = NULLP;
-
RETVOID
;
+
return
;
} /* end of rgFreeSBuf */
} /* end of rgFreeSBuf */
@@
-413,20
+413,20
@@
Void rgFillDgnParams
(
Inst inst,
RgUstaDgn *dgn,
(
Inst inst,
RgUstaDgn *dgn,
-
U8
dgnType
+
uint8_t
dgnType
)
#else
Void rgFillDgnParams(inst,dgn, dgnType)
Inst inst;
RgUstaDgn *dgn;
)
#else
Void rgFillDgnParams(inst,dgn, dgnType)
Inst inst;
RgUstaDgn *dgn;
-
U8
dgnType;
+
uint8_t
dgnType;
#endif
{
switch(dgnType)
{
case LRG_USTA_DGNVAL_MEM:
#endif
{
switch(dgnType)
{
case LRG_USTA_DGNVAL_MEM:
- dgn->type = (
U8
) LRG_USTA_DGNVAL_MEM;
+ dgn->type = (
uint8_t
) LRG_USTA_DGNVAL_MEM;
dgn->u.mem.region = rgCb[inst].rgInit.region;
dgn->u.mem.pool = rgCb[inst].rgInit.pool;
break;
dgn->u.mem.region = rgCb[inst].rgInit.region;
dgn->u.mem.pool = rgCb[inst].rgInit.pool;
break;
@@
-435,7
+435,7
@@
U8 dgnType;
break;
}
break;
}
-
RETVOID
;
+
return
;
} /* end of rgFillDgnParams */
} /* end of rgFillDgnParams */
@@
-459,20
+459,20
@@
U8 dgnType;
Void rgUpdtRguDedSts
(
Inst inst,
Void rgUpdtRguDedSts
(
Inst inst,
-RgUpSapCb *rguDlSap,
-
U8
stsType, /* Statistics type to update */
+RgUpSapCb
*rguDlSap,
+
uint8_t
stsType, /* Statistics type to update */
RgRguDedDatReq *datReq /* DatReq pointer */
)
#else
Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq)
Inst inst;
RgRguDedDatReq *datReq /* DatReq pointer */
)
#else
Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq)
Inst inst;
-RgUpSapCb *rguDlSap;
-
U8
stsType; /* Statistics type to update */
+RgUpSapCb
*rguDlSap;
+
uint8_t
stsType; /* Statistics type to update */
RgRguDedDatReq *datReq; /* DatReq pointer */
#endif
{
RgRguDedDatReq *datReq; /* DatReq pointer */
#endif
{
-
U8
idx1,idx2;
-
U32
idx;
+
uint8_t
idx1,idx2;
+
uint32_t
idx;
switch(stsType)
{
switch(stsType)
{
@@
-510,7
+510,7
@@
RgRguDedDatReq *datReq; /* DatReq pointer */
break;
}
break;
}
-
RETVOID
;
+
return
;
} /* rgUpdtRguDedSts */
} /* rgUpdtRguDedSts */
@@
-535,13
+535,13
@@
Void rgUpdtRguCmnSts
(
Inst inst,
RgUpSapCb *rguDlSap,
(
Inst inst,
RgUpSapCb *rguDlSap,
-
U8
stsType /* Statistics type to update */
+
uint8_t
stsType /* Statistics type to update */
)
#else
Void rgUpdtRguCmnSts(inst,rguDlSap,stsType)
Inst inst;
RgUpSapCb *rguDlSap;
)
#else
Void rgUpdtRguCmnSts(inst,rguDlSap,stsType)
Inst inst;
RgUpSapCb *rguDlSap;
-
U8
stsType; /* Statistics type to update */
+
uint8_t
stsType; /* Statistics type to update */
#endif
{
#endif
{
@@
-556,7
+556,7
@@
U8 stsType; /* Statistics type to update */
break;
}
break;
}
-
RETVOID
;
+
return
;
} /* rgUpdtRguCmnSts */
} /* rgUpdtRguCmnSts */
@@
-581,12
+581,12
@@
U8 stsType; /* Statistics type to update */
Void rgUpdtCellCnt
(
Inst inst,
Void rgUpdtCellCnt
(
Inst inst,
-
U8
updtType
+
uint8_t
updtType
)
#else
Void rgUpdtCellCnt(inst,updtType)
Inst inst;
)
#else
Void rgUpdtCellCnt(inst,updtType)
Inst inst;
-
U8
updtType;
+
uint8_t
updtType;
#endif
{
#endif
{
@@
-602,7
+602,7
@@
U8 updtType;
break;
}
break;
}
-
RETVOID
;
+
return
;
} /* rgUpdtCellCnt */
} /* rgUpdtCellCnt */
@@
-627,12
+627,12
@@
U8 updtType;
Void rgUpdtUeCnt
(
Inst inst,
Void rgUpdtUeCnt
(
Inst inst,
-
U8
updtType
+
uint8_t
updtType
)
#else
Void rgUpdtUeCnt (inst,updtType)
Inst inst;
)
#else
Void rgUpdtUeCnt (inst,updtType)
Inst inst;
-
U8
updtType;
+
uint8_t
updtType;
#endif
{
switch (updtType)
#endif
{
switch (updtType)
@@
-646,7
+646,7
@@
U8 updtType;
default:
break;
}
default:
break;
}
-
RETVOID
;
+
return
;
} /* rgUpdtUeCnt */
/*
} /* rgUpdtUeCnt */
/*
@@
-677,8
+677,9
@@
Ptr *memPtr;
Size memSize;
#endif
{
Size memSize;
#endif
{
- Mem sMem;
- VOLATILE U32 startTime=0;
+ Mem sMem;
+ volatile uint32_t startTime=0;
+
sMem.region = rgCb[inst].rgInit.region;
sMem.pool = rgCb[inst].rgInit.pool;
sMem.region = rgCb[inst].rgInit.region;
sMem.pool = rgCb[inst].rgInit.pool;
@@
-801,7
+802,7
@@
Inst dstInst;
pst->intfVer = 0;
pst->route = RTESPEC;
pst->intfVer = 0;
pst->route = RTESPEC;
-
RETVOID
;
+
return
;
} /* end of rgGetPstToInst */
/***********************************************************
} /* end of rgGetPstToInst */
/***********************************************************
@@
-965,7
+966,7
@@
RgInfSpsLcInfo *lcInfo;
Inst inst;
RgCellCb *cell= NULLP;
RgUeCb *ue;
Inst inst;
RgCellCb *cell= NULLP;
RgUeCb *ue;
-
U8
idx;
+
uint8_t
idx;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
@@
-1098,7
+1099,7
@@
CmLteRnti crnti;
* -# RFAILED
**/
#ifdef ANSI
* -# RFAILED
**/
#ifdef ANSI
-
PRIVATE
S16 rgUtlHndlCrntiChng
+
static
S16 rgUtlHndlCrntiChng
(
Inst inst,
RgCellCb *cell,
(
Inst inst,
RgCellCb *cell,
@@
-1106,7
+1107,7
@@
CmLteRnti rnti,
CmLteRnti newRnti
)
#else
CmLteRnti newRnti
)
#else
-
PRIVATE
S16 rgUtlHndlCrntiChng(inst,cell, rnti, newRnti)
+
static
S16 rgUtlHndlCrntiChng(inst,cell, rnti, newRnti)
Inst inst;
RgCellCb *cell;
CmLteRnti rnti;
Inst inst;
RgCellCb *cell;
CmLteRnti rnti;
@@
-1176,7
+1177,7
@@
RgUeCb *ue;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
#endif
{
Inst inst = cell->macInst - RG_INST_START;
-
U8
idx = 0;
+
uint8_t
idx = 0;
Inst sCellInstIdx;
Pst dstInstPst;
RgPrgUeSCellDelInfo ueSCellDelInfo;
Inst sCellInstIdx;
Pst dstInstPst;
RgPrgUeSCellDelInfo ueSCellDelInfo;
@@
-1276,14
+1277,14
@@
S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
* -# ROK
**/
#ifdef ANSI
* -# ROK
**/
#ifdef ANSI
-
PRIVATE
S16 rgUtlSndCrntiChngReq2AllSMacs
+
static
S16 rgUtlSndCrntiChngReq2AllSMacs
(
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
)
#else
(
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
)
#else
-
PRIVATE
S16 rgUtlSndCrntiChngReq2AllSMacs(cell, rnti, newRnti)
+
static
S16 rgUtlSndCrntiChngReq2AllSMacs(cell, rnti, newRnti)
RgCellCb *cell;
CmLteRnti rnti;
CmLteRnti newRnti;
RgCellCb *cell;
CmLteRnti rnti;
CmLteRnti newRnti;
@@
-1294,7
+1295,7
@@
CmLteRnti newRnti;
Pst dstInstPst;
RgPrgUeSCellDelInfo ueIdChngReq;
RgUeCb *ue;
Pst dstInstPst;
RgPrgUeSCellDelInfo ueIdChngReq;
RgUeCb *ue;
-
U8
idx;
+
uint8_t
idx;
#ifdef L2_OPTMZ
TfuDelDatReqInfo delDatReq;
#endif
#ifdef L2_OPTMZ
TfuDelDatReqInfo delDatReq;
#endif
@@
-1358,13
+1359,13
@@
TfuDelDatReqInfo delDatReq;
* @return Void
**/
#ifdef ANSI
* @return Void
**/
#ifdef ANSI
-
PRIVATE
Void rgUtlHndlCrntiRls
+
static
Void rgUtlHndlCrntiRls
(
RgCellCb *cell,
RgInfRlsRnti *rlsRnti
)
#else
(
RgCellCb *cell,
RgInfRlsRnti *rlsRnti
)
#else
-
PRIVATE
Void rgUtlHndlCrntiRls(cell, rlsRnti)
+
static
Void rgUtlHndlCrntiRls(cell, rlsRnti)
RgCellCb *cell;
CmLteRnti *rlsRnti;
#endif
RgCellCb *cell;
CmLteRnti *rlsRnti;
#endif
@@
-1423,7
+1424,7
@@
CmLteRnti *rlsRnti;
}
}
}
}
-
RETVOID
;
+
return
;
} /* end of rgUtlHndlCrntiRls */
/**
} /* end of rgUtlHndlCrntiRls */
/**