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
new review to be raise
[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
..
5736fc8
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
@@
-112,24
+112,15
@@
PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs ARGS((
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
S16 rgAllocShrablSBuf
(
Inst inst,
Data **pData, /* Pointer of the data to be returned */
Size size /* size */
)
S16 rgAllocShrablSBuf
(
Inst inst,
Data **pData, /* Pointer of the data to be returned */
Size size /* size */
)
-#else
-S16 rgAllocShrablSBuf(inst,pData, size)
-Inst inst;
-Data **pData; /* Pointer of the data to be returned */
-Size size; /* size */
-#endif
{
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
+151,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;
@@
-184,24
+175,15
@@
Size size; /* size */
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
S16 rgAllocSBuf
(
Inst inst,
Data **pData, /* Pointer of the data to be returned */
Size size /* size */
)
S16 rgAllocSBuf
(
Inst inst,
Data **pData, /* Pointer of the data to be returned */
Size size /* size */
)
-#else
-S16 rgAllocSBuf(inst,pData, size)
-Inst inst;
-Data **pData; /* Pointer of the data to be returned */
-Size size; /* size */
-#endif
{
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
+209,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;
@@
-241,7
+223,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
@@
-249,28
+231,19
@@
Size size; /* size */
*
* File: rg_utl.c
*/
*
* File: rg_utl.c
*/
-#ifdef ANSI
Void rgFreeSharableSBuf
(
Inst inst,
Data **data, /* address of pointer to data */
Size size /* size */
)
Void rgFreeSharableSBuf
(
Inst inst,
Data **data, /* address of pointer to data */
Size size /* size */
)
-#else
-Void rgFreeSharableSBuf(inst,data, size)
-Inst inst;
-Data **data; /* address of pointer to data */
-Size size; /* size */
-#endif
{
S16 ret;
{
S16 ret;
- TRC2(rgFreeSharableBuf)
-
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
-
RETVOID
;
+
return
;
}
/* Deallocate buffer */
}
/* Deallocate buffer */
@@
-278,12
+251,12
@@
Size size; /* size */
if (ret != ROK)
{
if (ret != ROK)
{
-
RETVOID
;
+
return
;
}
*data = NULLP;
}
*data = NULLP;
-
RETVOID
;
+
return
;
} /* end of rgFreeSharableBuf */
} /* end of rgFreeSharableBuf */
@@
-297,7
+270,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
@@
-305,28
+278,19
@@
Size size; /* size */
*
* File: rg_utl.c
*/
*
* File: rg_utl.c
*/
-#ifdef ANSI
Void rgFreeSBuf
(
Inst inst,
Data **data, /* address of pointer to data */
Size size /* size */
)
Void rgFreeSBuf
(
Inst inst,
Data **data, /* address of pointer to data */
Size size /* size */
)
-#else
-Void rgFreeSBuf(inst,data, size)
-Inst inst;
-Data **data; /* address of pointer to data */
-Size size; /* size */
-#endif
{
S16 ret;
{
S16 ret;
- TRC2(rgFreeSBuf)
-
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
if ((data == NULLP) || (*data == NULLP) || (size == 0))
{
-
RETVOID
;
+
return
;
}
}
@@
-339,12
+303,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 */
@@
-365,22
+329,14
@@
Size size; /* size */
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
S16 rgGetMsg
(
Inst inst,
Buffer **mBuf /* Message Buffer pointer be returned */
)
S16 rgGetMsg
(
Inst inst,
Buffer **mBuf /* Message Buffer pointer be returned */
)
-#else
-S16 rgGetMsg(inst,mBuf)
-Inst inst;
-Buffer **mBuf; /* Message Buffer pointer be returned */
-#endif
{
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 /* */
@@
-418,27
+374,18
@@
Buffer **mBuf; /* Message Buffer pointer be returned */
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
Void rgFillDgnParams
(
Inst inst,
RgUstaDgn *dgn,
Void rgFillDgnParams
(
Inst inst,
RgUstaDgn *dgn,
-
U8
dgnType
+
uint8_t
dgnType
)
)
-#else
-Void rgFillDgnParams(inst,dgn, dgnType)
-Inst inst;
-RgUstaDgn *dgn;
-U8 dgnType;
-#endif
{
{
- TRC2(rgFillDgnParams)
-
switch(dgnType)
{
case LRG_USTA_DGNVAL_MEM:
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;
@@
-447,7
+394,7
@@
U8 dgnType;
break;
}
break;
}
-
RETVOID
;
+
return
;
} /* end of rgFillDgnParams */
} /* end of rgFillDgnParams */
@@
-467,28
+414,16
@@
U8 dgnType;
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
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 */
)
RgRguDedDatReq *datReq /* DatReq pointer */
)
-#else
-Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq)
-Inst inst;
-RgUpSapCb *rguDlSap;
-U8 stsType; /* Statistics type to update */
-RgRguDedDatReq *datReq; /* DatReq pointer */
-#endif
{
{
- U8 idx1,idx2;
- U32 idx;
-
-
- TRC2(rgUpdtRguDedSts)
-
+ uint8_t idx1,idx2;
+ uint32_t idx;
switch(stsType)
{
switch(stsType)
{
@@
-526,7
+461,7
@@
RgRguDedDatReq *datReq; /* DatReq pointer */
break;
}
break;
}
-
RETVOID
;
+
return
;
} /* rgUpdtRguDedSts */
} /* rgUpdtRguDedSts */
@@
-546,23
+481,13
@@
RgRguDedDatReq *datReq; /* DatReq pointer */
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
Void rgUpdtRguCmnSts
(
Inst inst,
RgUpSapCb *rguDlSap,
Void rgUpdtRguCmnSts
(
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;
-U8 stsType; /* Statistics type to update */
-#endif
{
{
- TRC2(rgUpdtRguCmnSts)
-
-
switch(stsType)
{
switch(stsType)
{
@@
-575,7
+500,7
@@
U8 stsType; /* Statistics type to update */
break;
}
break;
}
-
RETVOID
;
+
return
;
} /* rgUpdtRguCmnSts */
} /* rgUpdtRguCmnSts */
@@
-596,19
+521,8
@@
U8 stsType; /* Statistics type to update */
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
-Void rgUpdtCellCnt
-(
-Inst inst,
-U8 updtType
-)
-#else
-Void rgUpdtCellCnt(inst,updtType)
-Inst inst;
-U8 updtType;
-#endif
+Void rgUpdtCellCnt(Inst inst,uint8_t updtType)
{
{
- TRC2(rgUpdtCellCnt);
switch (updtType)
{
switch (updtType)
{
@@
-622,7
+536,7
@@
U8 updtType;
break;
}
break;
}
-
RETVOID
;
+
return
;
} /* rgUpdtCellCnt */
} /* rgUpdtCellCnt */
@@
-643,20
+557,8
@@
U8 updtType;
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
-Void rgUpdtUeCnt
-(
-Inst inst,
-U8 updtType
-)
-#else
-Void rgUpdtUeCnt (inst,updtType)
-Inst inst;
-U8 updtType;
-#endif
+Void rgUpdtUeCnt(Inst inst,uint8_t updtType)
{
{
- TRC2(rgUpdtUeCnt);
-
switch (updtType)
{
case RG_CFG_ADD:
switch (updtType)
{
case RG_CFG_ADD:
@@
-668,7
+570,7
@@
U8 updtType;
default:
break;
}
default:
break;
}
-
RETVOID
;
+
return
;
} /* rgUpdtUeCnt */
/*
} /* rgUpdtUeCnt */
/*
@@
-685,24
+587,16
@@
U8 updtType;
* File: rg_utl.c
*
*/
* File: rg_utl.c
*
*/
-#ifdef ANSI
S16 rgAllocEventMem
(
Inst inst,
Ptr *memPtr,
Size memSize
)
S16 rgAllocEventMem
(
Inst inst,
Ptr *memPtr,
Size memSize
)
-#else
-S16 rgAllocEventMem(inst,memPtr, memSize)
-Inst inst;
-Ptr *memPtr;
-Size memSize;
-#endif
{
{
- Mem sMem;
-
VOLATILE U32
startTime=0;
+ Mem
sMem;
+
volatile uint32_t
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;
@@
-753,7
+647,6
@@
Size memSize;
* File: rg_utl.c
*
*/
* File: rg_utl.c
*
*/
-#ifdef ANSI
S16 rgGetEventMem
(
Inst inst,
S16 rgGetEventMem
(
Inst inst,
@@
-761,17
+654,9
@@
Ptr *ptr,
Size len,
Ptr memCp
)
Size len,
Ptr memCp
)
-#else
-S16 rgGetEventMem(inst,ptr, len, memCp)
-Inst inst;
-Ptr *ptr;
-Size len;
-Ptr memCp;
-#endif
{
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
@@
-797,21
+682,13
@@
Ptr memCp;
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
Void rgGetPstToInst
(
Pst *pst,
Inst srcInst,
Inst dstInst
)
Void rgGetPstToInst
(
Pst *pst,
Inst srcInst,
Inst dstInst
)
-#else
-Void rgGetPstToInst (pst, srcInst, dstInst)
-Pst *pst;
-Inst srcInst;
-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;
@@
-827,7
+704,7
@@
Inst dstInst;
pst->intfVer = 0;
pst->route = RTESPEC;
pst->intfVer = 0;
pst->route = RTESPEC;
-
RETVOID
;
+
return
;
} /* end of rgGetPstToInst */
/***********************************************************
} /* end of rgGetPstToInst */
/***********************************************************
@@
-851,24
+728,12
@@
Inst dstInst;
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
-S16 RgSchMacLcgRegReq
-(
-Pst *pst,
-RgInfLcgRegReq *lcgRegReq
-)
-#else
-S16 RgSchMacLcgRegReq (pst, lcgRegReq)
-Pst *pst;
-RgInfLcgRegReq *lcgRegReq;
-#endif
+S16 RgSchMacLcgRegReq(Pst *pst,RgInfLcgRegReq *lcgRegReq)
{
Inst inst;
RgCellCb *cell = NULLP;
RgUeCb *ue;
{
Inst inst;
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;
@@
-910,24
+775,12
@@
RgInfLcgRegReq *lcgRegReq;
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
-S16 RgSchMacUlSpsResetReq
-(
-Pst *pst,
-RgInfUlSpsReset *ulSpsResetInfo
-)
-#else
-S16 RgSchMacUlSpsResetReq (pst, lcInfo)
-Pst *pst;
-RgInfUlSpsReset *ulSpsResetInfo;
-#endif
+S16 RgSchMacUlSpsResetReq(Pst *pst,RgInfUlSpsReset *ulSpsResetInfo)
{
Inst inst;
RgCellCb *cell = NULLP;
RgUeCb *ue;
{
Inst inst;
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;
@@
-980,24
+833,12
@@
RgInfUlSpsReset *ulSpsResetInfo;
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
-S16 RgSchMacSpsLcRegReq
-(
-Pst *pst,
-RgInfSpsLcInfo *lcInfo
-)
-#else
-S16 RgSchMacSpsLcRegReq (pst, lcInfo)
-Pst *pst;
-RgInfSpsLcInfo *lcInfo;
-#endif
+S16 RgSchMacSpsLcRegReq(Pst *pst,RgInfSpsLcInfo *lcInfo)
{
Inst inst;
RgCellCb *cell= NULLP;
RgUeCb *ue;
{
Inst inst;
RgCellCb *cell= NULLP;
RgUeCb *ue;
- U8 idx;
-
- TRC2(RgSchMacSpsLcRegReq);
+ 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;
@@
-1063,26
+904,12
@@
RgInfSpsLcInfo *lcInfo;
* File : rg_utl.c
*
**********************************************************/
* File : rg_utl.c
*
**********************************************************/
-#ifdef ANSI
-S16 RgSchMacSpsLcDeregReq
-(
-Pst *pst,
-CmLteCellId cellId,
-CmLteRnti crnti
-)
-#else
-S16 RgSchMacSpsLcDeregReq (pst, cellId, crnti)
-Pst *pst;
-CmLteCellId cellId;
-CmLteRnti crnti;
-#endif
+S16 RgSchMacSpsLcDeregReq(Pst *pst,CmLteCellId cellId,CmLteRnti crnti)
{
Inst inst;
RgCellCb *cell = NULLP;
RgUeCb *ue;
{
Inst inst;
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;
@@
-1131,27
+958,17
@@
CmLteRnti crnti;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-PRIVATE S16 rgUtlHndlCrntiChng
+static S16 rgUtlHndlCrntiChng
(
Inst inst,
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
)
(
Inst inst,
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
)
-#else
-PRIVATE S16 rgUtlHndlCrntiChng(inst,cell, rnti, newRnti)
-Inst inst;
-RgCellCb *cell;
-CmLteRnti rnti;
-CmLteRnti newRnti;
-#endif
{
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
+985,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. */
@@
-1199,26
+1016,14
@@
CmLteRnti newRnti;
* @param[in] RgUeCb *ue
* @return ROK is SUCCESS
**/
* @param[in] RgUeCb *ue
* @return ROK is SUCCESS
**/
-#ifdef ANSI
-S16 rgDelUeFrmAllSCell
-(
-RgCellCb *cell,
-RgUeCb *ue
-)
-#else
-S16 rgDelUeFrmAllSCell(cell, ue)
-RgCellCb *cell;
-RgUeCb *ue;
-#endif
+S16 rgDelUeFrmAllSCell(RgCellCb *cell,RgUeCb *ue)
{
Inst inst = cell->macInst - RG_INST_START;
{
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;
- 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++)
{
@@
-1256,25
+1061,11
@@
RgUeCb *ue;
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
-S16 rgUtlVltdAddSCellCfg
-(
- RgPrgUeSCellCfgInfo *ueSCellCb,
- RgCellCb *cell,
- Inst inst
-)
-#else
-S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
- RgPrgUeSCellCfgInfo *ueSCellCb;
- RgCellCb *cell;
- Inst inst;
-#endif
+S16 rgUtlVltdAddSCellCfg(RgPrgUeSCellCfgInfo *ueSCellCb,RgCellCb *cell,Inst 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))
{
@@
-1315,32
+1106,23
@@
S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst)
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
-PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs
+static S16 rgUtlSndCrntiChngReq2AllSMacs
(
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
)
(
RgCellCb *cell,
CmLteRnti rnti,
CmLteRnti newRnti
)
-#else
-PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs(cell, rnti, newRnti)
-RgCellCb *cell;
-CmLteRnti rnti;
-CmLteRnti newRnti;
-#endif
{
Inst inst = cell->macInst - RG_INST_START;
Inst sCellInstIdx;
Pst dstInstPst;
RgPrgUeSCellDelInfo ueIdChngReq;
RgUeCb *ue;
{
Inst inst = cell->macInst - RG_INST_START;
Inst sCellInstIdx;
Pst dstInstPst;
RgPrgUeSCellDelInfo ueIdChngReq;
RgUeCb *ue;
-
U8
idx;
+
uint8_t
idx;
#ifdef L2_OPTMZ
TfuDelDatReqInfo delDatReq;
#endif
#ifdef L2_OPTMZ
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)
@@
-1399,17
+1181,7
@@
TfuDelDatReqInfo delDatReq;
* @param[in] CmLteRnti rnti
* @return Void
**/
* @param[in] CmLteRnti rnti
* @return Void
**/
-#ifdef ANSI
-PRIVATE Void rgUtlHndlCrntiRls
-(
-RgCellCb *cell,
-RgInfRlsRnti *rlsRnti
-)
-#else
-PRIVATE Void rgUtlHndlCrntiRls(cell, rlsRnti)
-RgCellCb *cell;
-CmLteRnti *rlsRnti;
-#endif
+static Void rgUtlHndlCrntiRls(RgCellCb *cell,RgInfRlsRnti *rlsRnti)
{
Inst inst = cell->macInst - RG_INST_START;
RgUeCb *ue = NULLP;
{
Inst inst = cell->macInst - RG_INST_START;
RgUeCb *ue = NULLP;
@@
-1417,8
+1189,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 */
@@
-1467,7
+1237,7
@@
CmLteRnti *rlsRnti;
}
}
}
}
-
RETVOID
;
+
return
;
} /* end of rgUtlHndlCrntiRls */
/**
} /* end of rgUtlHndlCrntiRls */
/**
@@
-1489,17
+1259,7
@@
CmLteRnti *rlsRnti;
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-#ifdef ANSI
-S16 RgSchMacRlsRntiReq
-(
-Pst *pst,
-RgInfRlsRnti *rlsRnti
-)
-#else
-S16 RgSchMacRlsRntiReq(pst, rlsRnti)
-Pst *pst;
-RgInfRlsRnti *rlsRnti;
-#endif
+S16 RgSchMacRlsRntiReq(Pst *pst,RgInfRlsRnti *rlsRnti)
{
// Pst schPst;
// RgInfUeDelInd ueDelInd;
{
// Pst schPst;
// RgInfUeDelInd ueDelInd;
@@
-1509,8
+1269,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;
@@
-1586,15
+1344,7
@@
TfuDelDatReqInfo delDatReq;
} /* end of RgSchMacRlsRntiReq */
#ifdef L2_OPTMZ
} /* end of RgSchMacRlsRntiReq */
#ifdef L2_OPTMZ
-#ifdef ANSI
-Bool RgUtlIsTbMuxed
-(
- TfuDatReqTbInfo *tb
-)
-#else
-Bool RgUtlIsTbMuxed()
- TfuDatReqTbInfo *tb
-#endif
+Bool RgUtlIsTbMuxed(TfuDatReqTbInfo *tb)
{
MsgLen len = 0;
SFndLenMsg(tb->macHdr, &len);
{
MsgLen len = 0;
SFndLenMsg(tb->macHdr, &len);