X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_udx_ptul.c;h=0e1bdd33526d13ba9a4cbf342036ba151ad1734e;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=1e072a74d7be530d8e4b721c0335391eb9c4f859;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c index 1e072a74d..0e1bdd335 100755 --- a/src/5gnrrlc/kw_udx_ptul.c +++ b/src/5gnrrlc/kw_udx_ptul.c @@ -18,7 +18,7 @@ /************************************************************************ - Name: LTE-RLC ULDL Interface + Name: NR RLC ULDL Interface Type: C source file @@ -56,28 +56,21 @@ #ifndef LCKWULUDX -PRIVATE S16 PtUlUdxBndReq ARGS((Pst* pst, SuId suId,SpId spId )); -PRIVATE S16 PtUlUdxUbndReq ARGS((Pst* pst, SuId suId,Reason reason)); -PRIVATE S16 PtUlUdxCfgReq ARGS((Pst *pst, SpId spId, RlcCfgInfo *cfgInfo)); -PRIVATE S16 PtUlUdxStaUpdReq ARGS((Pst* pst,SpId spId,CmLteRlcId *rlcId, +static S16 PtUlUdxBndReq ARGS((Pst* pst, SuId suId,SpId spId )); +static S16 PtUlUdxUbndReq ARGS((Pst* pst, SuId suId,Reason reason)); +static S16 PtUlUdxCfgReq ARGS((Pst *pst, SpId spId, RlcCfgInfo *cfgInfo)); +static S16 PtUlUdxStaUpdReq ARGS((Pst* pst,SpId spId,CmLteRlcId *rlcId, RlcUdxStaPdu *pStaPdu )); -PRIVATE S16 PtUlUdxUeIdChgReq ARGS((Pst *pst, SpId spId, U32 transId, +static S16 PtUlUdxUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo)); -PRIVATE S16 PtUlUdxStaPduReq ARGS(( Pst* pst,SpId spId, CmLteRlcId *rlcId, +static S16 PtUlUdxStaPduReq ARGS(( Pst* pst,SpId spId, CmLteRlcId *rlcId, RlcUdxDlStaPdu *pStaPdu )); -#ifdef ANSI -PRIVATE S16 PtUlUdxBndReq +static S16 PtUlUdxBndReq ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ SpId spId /* Status */ ) -#else -PRIVATE S16 PtUlUdxBndReq(pst, suId,spId) -Pst *pst; /* post structure */ -SuId suId; /* Service User Id */ -SpId spId; /* Status */ -#endif { return ROK; @@ -104,61 +97,38 @@ SpId spId; /* Status */ * -# ROK * */ -#ifdef ANSI -PRIVATE S16 PtUlUdxUbndReq +static S16 PtUlUdxUbndReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ Reason reason /* Status */ ) -#else -PRIVATE S16 PtUlUdxUbndReq(pst, suId, status) -Pst *pst; /* post structure */ -SpId spId; /* Service User Id */ -Reason Reason; /* Status */ -#endif { return ROK; } /* end of PtDlUdxBndReq */ -#ifdef ANSI -PRIVATE S16 PtUlUdxCfgReq +static S16 PtUlUdxCfgReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ RlcCfgInfo *cfmInfo /* Config Info */ ) -#else -PRIVATE S16 PtUlUdxCfgReq(pst, spId, status) -Pst *pst; /* post structure */ -SpId spId; /* Service User Id */ -RlcCfgInfo *cfmInfo; /* Config Info */ -#endif { return ROK; } /* end of rlcDlUdxCfgReq */ -#ifdef ANSI -PRIVATE S16 PtUlUdxUeIdChgReq +static S16 PtUlUdxUeIdChgReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ -U32 transId, /* transaction Id */ +uint32_t transId, /* transaction Id */ CkwUeInfo *ueInfo, /* Config Info */ CkwUeInfo *newUeInfo /* Config Info */ ) -#else -PRIVATE S16 PtUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo) -Pst *pst; /* post structure */ -SpId spId; /* Service User Id */ -U32 transId; /* transaction Id */ -CkwUeInfo *ueInfo; /* Config Info */ -CkwUeInfo *newUeInfo; /* Config Info */ -#endif { return ROK; @@ -166,7 +136,7 @@ CkwUeInfo *newUeInfo; /* Config Info */ } /* end of rlcDlUdxCfgReq */ -PRIVATE S16 PtUlUdxStaPduReq +static S16 PtUlUdxStaPduReq ( Pst* pst, SpId spId, @@ -190,21 +160,13 @@ RlcUdxDlStaPdu *pStaPdu * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 PtUlUdxStaUpdReq +static S16 PtUlUdxStaUpdReq ( Pst* pst, SpId spId, CmLteRlcId *rlcId, RlcUdxStaPdu *pStaPdu ) -#else -PRIVATE S16 PtUlUdxStaUpdReq(pst, rlcId, pStaPdu) -Pst* pst; -SpId spId; -CmLteRlcId *rlcId; -RlcUdxDlStaPdu *pStaPdu; -#endif { return ROK; @@ -223,17 +185,7 @@ RlcUdxDlStaPdu *pStaPdu; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasReq -( -Pst* pst, -RlcL2MeasReqEvt *measReqEvt -) -#else -PRIVATE S16 PtUlUdxL2MeasReq(pst, measReqEvt ) -Pst* pst; -RlcL2MeasReqEvt *measReqEvt; -#endif +static S16 PtUlUdxL2MeasReq(Pst* pst,RlcL2MeasReqEvt *measReqEvt) { return ROK; @@ -251,17 +203,7 @@ RlcL2MeasReqEvt *measReqEvt; * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasSendReq -( -Pst* pst, -U8 status -) -#else -PRIVATE S16 PtUlUdxL2MeasSendReq(pst, status ) -Pst* pst; -U8 status -#endif +static S16 PtUlUdxL2MeasSendReq(Pst* pst,uint8_t status) { return ROK; @@ -279,17 +221,7 @@ U8 status * @return S16 * -# ROK **/ -#ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasStopReq -( -Pst* pst, -U8 status -) -#else -PRIVATE S16 PtUlUdxL2MeasStopReq(pst, status ) -Pst* pst; -U8 status -#endif +static S16 PtUlUdxL2MeasStopReq(Pst* pst,uint8_t status) { return ROK; @@ -297,7 +229,7 @@ U8 status #endif #endif -PRIVATE UdxBndReq rlcUlUdxBndReqMt[] = +static UdxBndReq rlcUlUdxBndReqMt[] = { #ifdef LCKWULUDX cmPkUdxBndReq, /* 0 - loosely coupled */ @@ -316,7 +248,7 @@ PRIVATE UdxBndReq rlcUlUdxBndReqMt[] = #endif /* KW */ }; -PRIVATE UdxUbndReq rlcUlUdxUbndReqMt[] = +static UdxUbndReq rlcUlUdxUbndReqMt[] = { #ifdef LCKWULUDX cmPkUdxUbndReq, /* 0 - loosely coupled */ @@ -336,7 +268,7 @@ PRIVATE UdxUbndReq rlcUlUdxUbndReqMt[] = }; -PRIVATE UdxCfgReq rlcUlUdxCfgReqMt[] = +static UdxCfgReq rlcUlUdxCfgReqMt[] = { #ifdef LCKWULUDX cmPkUdxCfgReq, /* 0 - loosely coupled */ @@ -355,7 +287,7 @@ PRIVATE UdxCfgReq rlcUlUdxCfgReqMt[] = #endif /* KW */ }; -PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = +static UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = { #ifdef LCKWULUDX cmPkUdxUeIdChgReq, /* 0 - loosely coupled */ @@ -375,7 +307,7 @@ PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = }; -PRIVATE CONSTANT UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] = +static const UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxStaUpdReq, /* 0 - loosely coupled */ @@ -394,7 +326,7 @@ PRIVATE CONSTANT UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] = #endif /* KW */ }; -PRIVATE CONSTANT UdxStaPduReq rlcUlUdxStaPduReqMt[RLC_MAX_UDX] = +static const UdxStaPduReq rlcUlUdxStaPduReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxStaPduReq, /* 0 - loosely coupled */ @@ -413,7 +345,7 @@ PRIVATE CONSTANT UdxStaPduReq rlcUlUdxStaPduReqMt[RLC_MAX_UDX] = #endif /* KW */ }; #ifdef LTE_L2_MEAS -PRIVATE CONSTANT UdxL2MeasReq rlcUlUdxL2MeasReqMt[RLC_MAX_UDX] = +static const UdxL2MeasReq rlcUlUdxL2MeasReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxL2MeasReq, /* 0 - loosely coupled */ @@ -432,7 +364,7 @@ PRIVATE CONSTANT UdxL2MeasReq rlcUlUdxL2MeasReqMt[RLC_MAX_UDX] = #endif /* KW */ }; -PRIVATE CONSTANT UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[RLC_MAX_UDX] = +static const UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxL2MeasSendReq, /* 0 - loosely coupled */ @@ -451,7 +383,7 @@ PRIVATE CONSTANT UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[RLC_MAX_UDX] = #endif /* KW */ }; -PRIVATE CONSTANT UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[RLC_MAX_UDX] = +static const UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxL2MeasStopReq, /* 0 - loosely coupled */ @@ -490,19 +422,12 @@ PRIVATE CONSTANT UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[RLC_MAX_UDX] = * -# ROK * */ -#ifdef ANSI S16 rlcUlUdxBndReq ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ SpId spId /* Status */ ) -#else -S16 rlcUlUdxBndReq(pst, suId, status) -Pst *pst; /* post structure */ -SuId suId; /* Service User Id */ -SpId spId; /* Status */ -#endif { /* jump to specific primitive depending on configured selector */ (*rlcUlUdxBndReqMt[pst->selector])(pst, suId, spId); @@ -531,19 +456,12 @@ SpId spId; /* Status */ * -# ROK * */ -#ifdef ANSI S16 rlcUlUdxUbndReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ Reason reason /* Status */ ) -#else -S16 rlcUlUdxUbndReq(pst, suId, status) -Pst *pst; /* post structure */ -SpId spId; /* Service User Id */ -Reason Reason; /* Status */ -#endif { /* jump to specific primitive depending on configured selector */ (*rlcUlUdxUbndReqMt[pst->selector])(pst, spId,reason ); @@ -552,19 +470,12 @@ Reason Reason; /* Status */ } /* end of rlcDlUdxBndReq */ -#ifdef ANSI S16 rlcUlUdxCfgReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ RlcCfgInfo *cfmInfo /* Config Info */ ) -#else -S16 rlcUlUdxCfgReq(pst, suId, status) -Pst *pst; /* post structure */ -SuId spId; /* Service User Id */ -RlcCfgInfo *cfmInfo; /* Config Info */ -#endif { /* jump to specific primitive depending on configured selector */ @@ -574,23 +485,14 @@ RlcCfgInfo *cfmInfo; /* Config Info */ } /* end of rlcDlUdxCfgReq */ -#ifdef ANSI S16 rlcUlUdxUeIdChgReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ -U32 transId, /* transaction Id */ +uint32_t transId, /* transaction Id */ CkwUeInfo *ueInfo, /* Config Info */ CkwUeInfo *newUeInfo /* Config Info */ ) -#else -S16 rlcUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo) -Pst *pst; /* post structure */ -SpId spId; /* Service User Id */ -U32 transId; /* transaction Id */ -CkwUeInfo *ueInfo; /* Config Info */ -CkwUeInfo *newUeInfo; /* Config Info */ -#endif { /* jump to specific primitive depending on configured selector */ @@ -637,17 +539,7 @@ uint8_t rlcUlUdxStaUpdReq(Pst* pst, SpId spId, CmLteRlcId *rlcId, RlcUdxStaPdu * * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rlcUlUdxL2MeasReq -( -Pst* pst, -RlcL2MeasReqEvt *measReqEvt -) -#else -S16 rlcUlUdxL2MeasReq(pst,measReqEvt) -Pst* pst; -RlcL2MeasReqEvt *measReqEvt; -#endif +S16 rlcUlUdxL2MeasReq(Pst* pst,RlcL2MeasReqEvt *measReqEvt ) { return ((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt)); @@ -665,17 +557,7 @@ RlcL2MeasReqEvt *measReqEvt; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rlcUlUdxL2MeasSendReq -( -Pst* pst, -U8 measType -) -#else -S16 rlcUlUdxL2MeasSendReq(pst,measReqEvt) -Pst* pst; -U8 measType; -#endif +S16 rlcUlUdxL2MeasSendReq(Pst* pst,uint8_t measType) { return ((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType)); @@ -693,17 +575,7 @@ U8 measType; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rlcUlUdxL2MeasStopReq -( -Pst* pst, -U8 measType -) -#else -S16 rlcUlUdxL2MeasStopReq(pst,measReqEvt) -Pst* pst; -U8 measType; -#endif +S16 rlcUlUdxL2MeasStopReq(Pst* pst,uint8_t measType) { return ((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType));