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
Temporary fix of o1 compilation .[Issue-Id: ODUHIGH-285]
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_udx_dl.c
diff --git
a/src/5gnrrlc/kw_udx_dl.c
b/src/5gnrrlc/kw_udx_dl.c
index
0b6ab64
..
fb2a464
100755
(executable)
--- a/
src/5gnrrlc/kw_udx_dl.c
+++ b/
src/5gnrrlc/kw_udx_dl.c
@@
-58,7
+58,7
@@
static int RLOG_FILE_ID=203;
#define RLC_MODULE RLC_DBGMASK_UDX
/* local defines */
#define RLC_MODULE RLC_DBGMASK_UDX
/* local defines */
-
EXTERN
S16 rlcDlmHndlStaRsp ARGS (( RlcCb *gCb,RlcDlRbCb *rbCb,
+S16 rlcDlmHndlStaRsp ARGS (( RlcCb *gCb,RlcDlRbCb *rbCb,
RlcUdxStaPdu *pStaPdu, RlcUdxBufLst *rlsPduLst));
RlcUdxStaPdu *pStaPdu, RlcUdxBufLst *rlsPduLst));
@@
-82,19
+82,12
@@
EXTERN S16 rlcDlmHndlStaRsp ARGS (( RlcCb *gCb,RlcDlRbCb *rbCb,
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcDlUdxBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
S16 rlcDlUdxBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
-#else
-S16 rlcDlUdxBndReq (pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
{
RlcUdxDlSapCb *udxSap; /* pointer to session SAP */
RlcCb *tRlcCb;
{
RlcUdxDlSapCb *udxSap; /* pointer to session SAP */
RlcCb *tRlcCb;
@@
-179,19
+172,12
@@
SpId spId;
* @return S16
* -# ROK
*/
* @return S16
* -# ROK
*/
-#ifdef ANSI
S16 rlcDlUdxUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
S16 rlcDlUdxUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
-#else
-S16 rlcDlUdxUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
{
RlcUdxDlSapCb *udxSap;
RlcCb *tRlcCb;
{
RlcUdxDlSapCb *udxSap;
RlcCb *tRlcCb;
@@
-240,19
+226,12
@@
Reason reason;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcDlUdxCfgReq
(
Pst *pst,
SpId spId,
RlcCfgInfo *cfg
)
S16 rlcDlUdxCfgReq
(
Pst *pst,
SpId spId,
RlcCfgInfo *cfg
)
-#else
-S16 rlcDlUdxCfgReq(pst, spId, cfg)
-Pst *pst;
-SpId spId;
-RlcCfgInfo *cfg;
-#endif
{
RlcCfgCfmInfo *cfgCfm;
uint8_t idx;
{
RlcCfgCfmInfo *cfgCfm;
uint8_t idx;
@@
-427,7
+406,6
@@
RlcCfgInfo *cfg;
* -# ROK
* -# RFAILED
*/
* -# ROK
* -# RFAILED
*/
-#ifdef ANSI
S16 rlcDlUdxUeIdChgReq
(
Pst *pst,
S16 rlcDlUdxUeIdChgReq
(
Pst *pst,
@@
-436,14
+414,6
@@
uint32_t transId,
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo
)
CkwUeInfo *ueInfo,
CkwUeInfo *newUeInfo
)
-#else
-S16 rlcDlUdxUeIdChgReq(pst,spId,transId,ueInfo,newUeInfo)
-Pst *pst;
-SpId spId;
-uint32_t transId;
-CkwUeInfo *ueInfo;
-CkwUeInfo *newUeInfo;
-#endif
{
CmStatus status;
RlcCb *tRlcCb;
{
CmStatus status;
RlcCb *tRlcCb;
@@
-493,7
+463,6
@@
CkwUeInfo *newUeInfo;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rlcDlUdxStaPduReq
(
Pst *pst,
S16 rlcDlUdxStaPduReq
(
Pst *pst,
@@
-501,13
+470,6
@@
SpId spId,
CmLteRlcId *rlcId,
RlcUdxDlStaPdu *pStaPdu
)
CmLteRlcId *rlcId,
RlcUdxDlStaPdu *pStaPdu
)
-#else
-S16 rlcDlUdxStaPduReq(pst, spId, rlcId, pStaPdu)
-Pst *pst;
-SpId spId;
-CmLteRlcId *rlcId;
-RlcUdxDlStaPdu *pStaPdu;
-#endif
{
RlcDlRbCb *rbCb;
RlcCb *tRlcCb;
{
RlcDlRbCb *rbCb;
RlcCb *tRlcCb;
@@
-526,19
+488,19
@@
RlcUdxDlStaPdu *pStaPdu;
return RFAILED;
}
return RFAILED;
}
- AMDL.cntrlBo = pStaPdu->controlBo;
+
RLC_
AMDL.cntrlBo = pStaPdu->controlBo;
/* If there already exists a STAUS PDU, free it and take the new one
into account */
/* If there already exists a STAUS PDU, free it and take the new one
into account */
- if(AMDL.pStaPdu)
+ if(
RLC_
AMDL.pStaPdu)
{
RLC_FREE_SHRABL_BUF(pst->region,
pst->pool,
{
RLC_FREE_SHRABL_BUF(pst->region,
pst->pool,
- AMDL.pStaPdu,
+
RLC_
AMDL.pStaPdu,
sizeof(RlcUdxDlStaPdu));
}
sizeof(RlcUdxDlStaPdu));
}
- AMDL.pStaPdu = pStaPdu;
- rlcAmmSendDedLcBoStatus(tRlcCb, rbCb, &AMDL);
+
RLC_
AMDL.pStaPdu = pStaPdu;
+ rlcAmmSendDedLcBoStatus(tRlcCb, rbCb, &
RLC_
AMDL);
return (ROK);
}
return (ROK);
}
@@
-556,7
+518,6
@@
RlcUdxDlStaPdu *pStaPdu;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 rlcDlUdxStaUpdReq
(
Pst* pst,
S16 rlcDlUdxStaUpdReq
(
Pst* pst,
@@
-564,13
+525,6
@@
SpId spId,
CmLteRlcId *rlcId,
RlcUdxStaPdu *pStaPdu
)
CmLteRlcId *rlcId,
RlcUdxStaPdu *pStaPdu
)
-#else
-S16 rlcDlUdxStaUpdReq(pst, spId, rlcId,pStaPdu)
-Pst* pst;
-SpId spId;
-CmLteRlcId *rlcId;
-RlcUdxStaPdu *pStaPdu;
-#endif
{
RlcCb *tRlcCb;
RlcDlRbCb *rbCb;
{
RlcCb *tRlcCb;
RlcDlRbCb *rbCb;
@@
-598,21
+552,15
@@
RlcUdxStaPdu *pStaPdu;
#ifdef LTE_L2_MEAS
/**
*/
#ifdef LTE_L2_MEAS
/**
*/
-#ifdef ANSI
S16 rlcDlUdxL2MeasReq
(
Pst *pst,
RlcL2MeasReqEvt *measReqEvt
)
S16 rlcDlUdxL2MeasReq
(
Pst *pst,
RlcL2MeasReqEvt *measReqEvt
)
-#else
-S16 rlcDlUdxL2MeasReq (pst, measReqEvt)
-Pst *pst;
-RlcL2MeasReqEvt *measReqEvt;
-#endif
{
uint32_t cntr;
uint8_t measType;
{
uint32_t cntr;
uint8_t measType;
-
VOLATILE
uint32_t startTime = 0;
+
volatile
uint32_t startTime = 0;
RlcCb *tRlcCb;
/*starting Task*/
RlcCb *tRlcCb;
/*starting Task*/
@@
-671,24
+619,18
@@
After receving this request, RLC stops L2 Measurement
* -# Failure : RFAILED
*/
* -# Failure : RFAILED
*/
-#ifdef ANSI
S16 rlcDlUdxL2MeasStopReq
(
Pst *pst,
uint8_t measType
)
S16 rlcDlUdxL2MeasStopReq
(
Pst *pst,
uint8_t measType
)
-#else
-S16 rlcDlUdxL2MeasStopReq (pst, measType)
-Pst *pst;
-uint8_t measType;
-#endif
{
/* S16 ret = ROK;*/
RlcL2MeasEvtCb *measEvtCb = NULLP;
uint16_t cntr;
uint8_t status = ROK;
/* RlcL2MeasCfmEvt measCfmEvt; */
{
/* S16 ret = ROK;*/
RlcL2MeasEvtCb *measEvtCb = NULLP;
uint16_t cntr;
uint8_t status = ROK;
/* RlcL2MeasCfmEvt measCfmEvt; */
-
VOLATILE
uint32_t startTime = 0;
+
volatile
uint32_t startTime = 0;
RlcCb *tRlcCb=NULLP;
/*starting Task*/
RlcCb *tRlcCb=NULLP;
/*starting Task*/
@@
-732,22
+674,15
@@
After receving this request, RLC sends L2 Measurement
* -# Failure : RFAILED
*/
* -# Failure : RFAILED
*/
-#ifdef ANSI
S16 rlcDlUdxL2MeasSendReq
(
Pst *pst,
uint8_t measType
)
S16 rlcDlUdxL2MeasSendReq
(
Pst *pst,
uint8_t measType
)
-#else
-S16 rlcDlUdxL2MeasSendReq (pst, measType)
-Pst *pst;
-uint8_t measType;
-#endif
{
RlcL2MeasEvtCb *measEvtCb;
uint16_t cntr;
{
RlcL2MeasEvtCb *measEvtCb;
uint16_t cntr;
-
- VOLATILE uint32_t startTime = 0;
+ volatile uint32_t startTime = 0;
RlcCb *tRlcCb;
tRlcCb = RLC_GET_RLCCB(pst->dstInst);
RlcCb *tRlcCb;
tRlcCb = RLC_GET_RLCCB(pst->dstInst);