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
JIRA-ID ODUHIGH-275 classification of logs of RLC
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_uim.c
diff --git
a/src/5gnrmac/rg_uim.c
b/src/5gnrmac/rg_uim.c
index
8f177a6
..
043292d
100755
(executable)
--- a/
src/5gnrmac/rg_uim.c
+++ b/
src/5gnrmac/rg_uim.c
@@
-76,8
+76,8
@@
static int RLOG_FILE_ID=178;
#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
S16 rgBatchProc(Void);
#endif
#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
S16 rgBatchProc(Void);
#endif
-
U8
rgRguDlSap;
-
U8
rgRguUlSap;
+
uint8_t
rgRguDlSap;
+
uint8_t
rgRguUlSap;
/**
* @brief Handler for Bind request.
*
/**
* @brief Handler for Bind request.
*
@@
-95,19
+95,12
@@
U8 rgRguUlSap;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgUiRguBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
S16 RgUiRguBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
-#else
-S16 RgUiRguBndReq(pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
{
Inst inst;
S16 ret = ROK;
{
Inst inst;
S16 ret = ROK;
@@
-200,19
+193,12
@@
SpId spId;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgUiRguUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
S16 RgUiRguUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
-#else
-S16 RgUiRguUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
{
Inst inst;
{
Inst inst;
@@
-260,24
+246,12
@@
Reason reason;
*
* @param[in] Inst inst
* @param[in] SuId suId
*
* @param[in] Inst inst
* @param[in] SuId suId
- * @param[in]
U8
status
+ * @param[in]
uint8_t
status
* @return S16
* -# ROK
* -# RFAILED
**/
* @return S16
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgUIMRguBndCfm
-(
-Inst inst,
-SpId spId,
-U8 status
-)
-#else
-S16 rgUIMRguBndCfm(inst,spId, status)
-Inst inst;
-SpId spId;
-U8 status;
-#endif
+S16 rgUIMRguBndCfm(Inst inst,SpId spId,uint8_t status)
{
S16 ret = ROK;
{
S16 ret = ROK;
@@
-309,27
+283,15
@@
U8 status;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 RgUiRguDDatReq
-(
-Pst *pst,
-SpId spId,
-RguDDatReqInfo *datReq
-)
-#else
-S16 RgUiRguDDatReq(pst, spId, datReq)
-Pst *pst;
-SpId spId;
-RguDDatReqInfo *datReq;
-#endif
+S16 RgUiRguDDatReq(Pst *pst,SpId spId,RguDDatReqInfo *datReq)
{
S16 ret = ROK;
Inst inst;
#ifndef NO_ERRCLS
{
S16 ret = ROK;
Inst inst;
#ifndef NO_ERRCLS
-
U32
id;
-
U32
id1;
-
U32
id2;
-
U32
id3;
+
uint32_t
id;
+
uint32_t
id1;
+
uint32_t
id2;
+
uint32_t
id3;
#endif
RG_IS_INST_VALID(pst->dstInst);
#endif
RG_IS_INST_VALID(pst->dstInst);
@@
-428,19
+390,12
@@
RguDDatReqInfo *datReq;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgUiRguCDatReq
(
Pst *pst,
SpId spId,
RguCDatReqInfo *datReq
)
S16 RgUiRguCDatReq
(
Pst *pst,
SpId spId,
RguCDatReqInfo *datReq
)
-#else
-S16 RgUiRguCDatReq(pst, spId, datReq)
-Pst *pst;
-SpId spId;
-RguCDatReqInfo *datReq;
-#endif
{
Inst inst;
S16 ret = ROK;
{
Inst inst;
S16 ret = ROK;
@@
-516,24
+471,17
@@
RguCDatReqInfo *datReq;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgUiRguDStaRsp
(
Pst *pst,
SpId spId,
RguDStaRspInfo *staRsp
)
S16 RgUiRguDStaRsp
(
Pst *pst,
SpId spId,
RguDStaRspInfo *staRsp
)
-#else
-S16 RgUiRguDStaRsp(pst, spId, staRsp)
-Pst *pst;
-SpId spId;
-RguDStaRspInfo *staRsp;
-#endif
{
Inst inst;
{
Inst inst;
+ S16 ret = ROK;
+ volatile uint32_t startTime = 0;
- S16 ret = ROK;
- VOLATILE U32 startTime = 0;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
@@
-572,19
+520,12
@@
RguDStaRspInfo *staRsp;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgUiRguCStaRsp
(
Pst *pst,
SpId spId,
RguCStaRspInfo *staRsp
)
S16 RgUiRguCStaRsp
(
Pst *pst,
SpId spId,
RguCStaRspInfo *staRsp
)
-#else
-S16 RgUiRguCStaRsp(pst, spId, staRsp)
-Pst *pst;
-SpId spId;
-RguCStaRspInfo *staRsp;
-#endif
{
Inst inst;
S16 ret = ROK;
{
Inst inst;
S16 ret = ROK;
@@
-652,19
+593,12
@@
RguCStaRspInfo *staRsp;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgUiRguL2MUlThrpMeasReq
(
Pst *pst,
SpId spId,
RguL2MUlThrpMeasReqInfo *measReq
)
S16 RgUiRguL2MUlThrpMeasReq
(
Pst *pst,
SpId spId,
RguL2MUlThrpMeasReqInfo *measReq
)
-#else
-S16 RgUiRguL2MUlThrpMeasReq(pst, spId, measReq)
-Pst *pst;
-SpId spId;
-RguL2MUlThrpMeasReqInfo *measReq;
-#endif
{
Inst inst;
{
Inst inst;
@@
-733,19
+667,12
@@
RguL2MUlThrpMeasReqInfo *measReq;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgUIMSndDedStaInd
(
Inst inst,
RgUpSapCb *rguSap,
RgRguDedStaInd *staInd
)
S16 rgUIMSndDedStaInd
(
Inst inst,
RgUpSapCb *rguSap,
RgRguDedStaInd *staInd
)
-#else
-S16 rgUIMSndDedStaInd(inst,rguSap,staInd)
-Inst inst;
-RgUpSapCb *rguSap;
-RgRguDedStaInd *staInd;
-#endif
{
S16 ret = ROK;
{
S16 ret = ROK;
@@
-780,19
+707,12
@@
RgRguDedStaInd *staInd;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgUIMSndCmnStaInd
(
Inst inst,
RgUpSapCb *rguDlSap,
RgRguCmnStaInd *staInd
)
S16 rgUIMSndCmnStaInd
(
Inst inst,
RgUpSapCb *rguDlSap,
RgRguCmnStaInd *staInd
)
-#else
-S16 rgUIMSndCmnStaInd(inst,rguDlSap,staInd)
-Inst inst,
-RgUpSapCb *rguDlSap,
-RgRguCmnStaInd *staInd;
-#endif
{
S16 ret = ROK;
{
S16 ret = ROK;
@@
-825,19
+745,12
@@
RgRguCmnStaInd *staInd;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgUIMSndDedDatInd
(
Inst inst,
RgUpSapCb *rguUlSap,
RgRguDedDatInd *datInd
)
S16 rgUIMSndDedDatInd
(
Inst inst,
RgUpSapCb *rguUlSap,
RgRguDedDatInd *datInd
)
-#else
-S16 rgUIMSndDedDatInd(datInd)
-Inst inst;
-RgUpSapCb *rguUlSap;
-RgRguDedDatInd *datInd;
-#endif
{
S16 ret = ROK;
{
S16 ret = ROK;
@@
-876,19
+789,7
@@
RgRguDedDatInd *datInd;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgUIMSndCmnDatInd
-(
-Inst inst,
-RgUpSapCb *rguUlSap,
-RgRguCmnDatInd *datInd
-)
-#else
-S16 rgUIMSndCmnDatInd(datInd)
-Inst inst;
-RgUpSapCb *rguUlSap;
-RgRguCmnDatInd *datInd;
-#endif
+S16 rgUIMSndCmnDatInd(Inst inst,RgUpSapCb *rguUlSap,RgRguCmnDatInd *datInd)
{
S16 ret = ROK;
{
S16 ret = ROK;
@@
-927,19
+828,7
@@
RgRguCmnDatInd *datInd;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 RgUiCrgBndReq
-(
-Pst *pst,
-SuId suId,
-SpId spId
-)
-#else
-S16 RgUiCrgBndReq(pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
+S16 RgUiCrgBndReq(Pst *pst, SuId suId,SpId spId)
{
S16 ret = ROK;
Pst tmpPst; /* Temporary Post Structure */
{
S16 ret = ROK;
Pst tmpPst; /* Temporary Post Structure */
@@
-1032,19
+921,7
@@
SpId spId;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 RgUiCrgUbndReq
-(
-Pst *pst,
-SpId spId,
-Reason reason
-)
-#else
-S16 RgUiCrgUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
+S16 RgUiCrgUbndReq(Pst *pst,SpId spId,Reason reason)
{
Inst inst;
{
Inst inst;
@@
-1093,24
+970,12
@@
Reason reason;
*
* @param[in] Inst inst
* @param[in] SuId suId
*
* @param[in] Inst inst
* @param[in] SuId suId
- * @param[in]
U8
status
+ * @param[in]
uint8_t
status
* @return S16
* -# ROK
* -# RFAILED
**/
* @return S16
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgUIMCrgBndCfm
-(
-Inst inst,
-SuId suId,
-U8 status
-)
-#else
-S16 rgUIMCrgBndCfm(inst,suId, status)
-Inst inst;
-SuId suId;
-U8 status;
-#endif
+S16 rgUIMCrgBndCfm(Inst inst,SuId suId,uint8_t status)
{
if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK)
{
if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK)
@@
-1142,7
+1007,6
@@
U8 status;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgUiCrgCfgReq
(
Pst *pst,
S16 RgUiCrgCfgReq
(
Pst *pst,
@@
-1150,18
+1014,11
@@
SpId spId,
CrgCfgTransId transId,
CrgCfgReqInfo *cfgReqInfo
)
CrgCfgTransId transId,
CrgCfgReqInfo *cfgReqInfo
)
-#else
-S16 RgUiCrgCfgReq(pst, spId, transId, cfgReqInfo)
-Pst *pst;
-SpId spId;
-CrgCfgTransId transId;
-CrgCfgReqInfo *cfgReqInfo;
-#endif
{
Inst inst;
S16 ret = ROK;
{
Inst inst;
S16 ret = ROK;
-
U8
cfmStatus = 0x00ff;
-
U8
prntTrans[CRG_CFG_TRANSID_SIZE+1];
+
uint8_t
cfmStatus = 0x00ff;
+
uint8_t
prntTrans[CRG_CFG_TRANSID_SIZE+1];
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
@@
-1237,27
+1094,20
@@
CrgCfgReqInfo *cfgReqInfo;
*
* @param[in] Inst inst
* @param[in] CrgCfgTransId transId
*
* @param[in] Inst inst
* @param[in] CrgCfgTransId transId
- * @param[in]
U8
status
+ * @param[in]
uint8_t
status
* @return S16
* -# ROK
* -# RFAILED
**/
* @return S16
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rgUIMCrgCfgCfm
(
Inst inst,
CrgCfgTransId transId,
S16 rgUIMCrgCfgCfm
(
Inst inst,
CrgCfgTransId transId,
-
U8
status
+
uint8_t
status
)
)
-#else
-S16 rgUIMCrgCfgCfm(inst,transId, status)
-Inst inst;
-CrgCfgTransId transId;
-U8 status;
-#endif
{
S16 ret = ROK;
{
S16 ret = ROK;
-
U8
prntTrans[CRG_CFG_TRANSID_SIZE+1];
+
uint8_t
prntTrans[CRG_CFG_TRANSID_SIZE+1];
memcpy(prntTrans, transId.trans, CRG_CFG_TRANSID_SIZE);
prntTrans[CRG_CFG_TRANSID_SIZE] = '\0';
memcpy(prntTrans, transId.trans, CRG_CFG_TRANSID_SIZE);
prntTrans[CRG_CFG_TRANSID_SIZE] = '\0';
@@
-1274,21
+1124,13
@@
U8 status;
} /* rgUIMCrgCfgCfm */
#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
} /* rgUIMCrgCfgCfm */
#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
-#ifdef ANSI
-S16 rgBatchProc
-(
-Void
-)
-#else
-S16 rgBatchProc()
-Void;
-#endif
+S16 rgBatchProc(Void)
{
/* Read from Ring Buffer and process RLC BO Update */
Pst pst = {0};
SpId spId = 0;
RguDStaRspInfo *staRsp;
{
/* Read from Ring Buffer and process RLC BO Update */
Pst pst = {0};
SpId spId = 0;
RguDStaRspInfo *staRsp;
-
U32
elmIndx = 0;
+
uint32_t
elmIndx = 0;
#ifndef LTE_ADV
/* Fill pst */
pst.srcProcId = 1;
#ifndef LTE_ADV
/* Fill pst */
pst.srcProcId = 1;
@@
-1306,7
+1148,7
@@
Void;
#else
#endif
#else
#endif
- elmIndx = (
U32
)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC);
+ elmIndx = (
uint32_t
)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC);
while(NULLP != elmIndx)
{
staRsp = (RguDStaRspInfo *)elmIndx;
while(NULLP != elmIndx)
{
staRsp = (RguDStaRspInfo *)elmIndx;
@@
-1319,7
+1161,7
@@
Void;
staRsp = NULLP;
SRngIncrRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC);
staRsp = NULLP;
SRngIncrRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC);
- if((elmIndx = (
U32
)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC)) == NULLP)
+ if((elmIndx = (
uint32_t
)SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC)) == NULLP)
break;
}
return ROK;
break;
}
return ROK;