X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_udx_ptul.c;h=5bfbbc0bdd56eadb9972233e181d5bddd9e37d30;hb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;hp=a6c3fa8de89fb0583f26db9cf2bbe558a6edf3a4;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c index a6c3fa8de..5bfbbc0bd 100755 --- a/src/5gnrrlc/kw_udx_ptul.c +++ b/src/5gnrrlc/kw_udx_ptul.c @@ -56,30 +56,29 @@ #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) +static S16 PtUlUdxBndReq(pst, suId,spId) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ SpId spId; /* Status */ #endif { - TRC3(PtUlUdxBndReq) return ROK; @@ -106,72 +105,68 @@ SpId spId; /* Status */ * */ #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) +static S16 PtUlUdxUbndReq(pst, suId, status) Pst *pst; /* post structure */ SpId spId; /* Service User Id */ Reason Reason; /* Status */ #endif { - TRC3(PtUlUdxUbndReq) 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) +static S16 PtUlUdxCfgReq(pst, spId, status) Pst *pst; /* post structure */ SpId spId; /* Service User Id */ RlcCfgInfo *cfmInfo; /* Config Info */ #endif { - TRC3(PtUlUdxCfgReq) 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) +static S16 PtUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo) 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 */ #endif { - TRC3(PtUlUdxUeIdChgReq) - return ROK; } /* end of rlcDlUdxCfgReq */ -PRIVATE S16 PtUlUdxStaPduReq +static S16 PtUlUdxStaPduReq ( Pst* pst, SpId spId, @@ -179,7 +174,6 @@ CmLteRlcId *rlcId, RlcUdxDlStaPdu *pStaPdu ) { - TRC3(PtUlUdxStaPduReq); return ROK; } @@ -197,7 +191,7 @@ RlcUdxDlStaPdu *pStaPdu * -# ROK **/ #ifdef ANSI -PRIVATE S16 PtUlUdxStaUpdReq +static S16 PtUlUdxStaUpdReq ( Pst* pst, SpId spId, @@ -205,7 +199,7 @@ CmLteRlcId *rlcId, RlcUdxStaPdu *pStaPdu ) #else -PRIVATE S16 PtUlUdxStaUpdReq(pst, rlcId, pStaPdu) +static S16 PtUlUdxStaUpdReq(pst, rlcId, pStaPdu) Pst* pst; SpId spId; CmLteRlcId *rlcId; @@ -213,8 +207,6 @@ RlcUdxDlStaPdu *pStaPdu; #endif { - TRC3(PtUlUdxStaUpdReq); - return ROK; } /* end of RlcUlmDlmStaUpd*/ @@ -232,20 +224,18 @@ RlcUdxDlStaPdu *pStaPdu; * -# ROK **/ #ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasReq +static S16 PtUlUdxL2MeasReq ( Pst* pst, RlcL2MeasReqEvt *measReqEvt ) #else -PRIVATE S16 PtUlUdxL2MeasReq(pst, measReqEvt ) +static S16 PtUlUdxL2MeasReq(pst, measReqEvt ) Pst* pst; RlcL2MeasReqEvt *measReqEvt; #endif { - TRC3(PtUlUdxL2MeasReq); - return ROK; } @@ -262,20 +252,18 @@ RlcL2MeasReqEvt *measReqEvt; * -# ROK **/ #ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasSendReq +static S16 PtUlUdxL2MeasSendReq ( -Pst* pst, -U8 status +Pst* pst, +uint8_t status ) #else -PRIVATE S16 PtUlUdxL2MeasSendReq(pst, status ) -Pst* pst; -U8 status +static S16 PtUlUdxL2MeasSendReq(pst, status ) +Pst* pst; +uint8_t status #endif { - TRC3(PtUlUdxL2MeasSendReq); - return ROK; } @@ -292,26 +280,24 @@ U8 status * -# ROK **/ #ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasStopReq +static S16 PtUlUdxL2MeasStopReq ( -Pst* pst, -U8 status +Pst* pst, +uint8_t status ) #else -PRIVATE S16 PtUlUdxL2MeasStopReq(pst, status ) -Pst* pst; -U8 status +static S16 PtUlUdxL2MeasStopReq(pst, status ) +Pst* pst; +uint8_t status #endif { - TRC3(PtUlUdxL2MeasStopReq); - return ROK; } #endif #endif -PRIVATE UdxBndReq rlcUlUdxBndReqMt[] = +static UdxBndReq rlcUlUdxBndReqMt[] = { #ifdef LCKWULUDX cmPkUdxBndReq, /* 0 - loosely coupled */ @@ -330,7 +316,7 @@ PRIVATE UdxBndReq rlcUlUdxBndReqMt[] = #endif /* KW */ }; -PRIVATE UdxUbndReq rlcUlUdxUbndReqMt[] = +static UdxUbndReq rlcUlUdxUbndReqMt[] = { #ifdef LCKWULUDX cmPkUdxUbndReq, /* 0 - loosely coupled */ @@ -350,7 +336,7 @@ PRIVATE UdxUbndReq rlcUlUdxUbndReqMt[] = }; -PRIVATE UdxCfgReq rlcUlUdxCfgReqMt[] = +static UdxCfgReq rlcUlUdxCfgReqMt[] = { #ifdef LCKWULUDX cmPkUdxCfgReq, /* 0 - loosely coupled */ @@ -369,7 +355,7 @@ PRIVATE UdxCfgReq rlcUlUdxCfgReqMt[] = #endif /* KW */ }; -PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = +static UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = { #ifdef LCKWULUDX cmPkUdxUeIdChgReq, /* 0 - loosely coupled */ @@ -389,7 +375,7 @@ PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = }; -PRIVATE CONSTANT UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] = +static const UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxStaUpdReq, /* 0 - loosely coupled */ @@ -408,7 +394,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 */ @@ -427,7 +413,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 */ @@ -446,7 +432,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 */ @@ -465,7 +451,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 */ @@ -518,8 +504,6 @@ SuId suId; /* Service User Id */ SpId spId; /* Status */ #endif { - TRC3(rlcUlUdxBndReq) - /* jump to specific primitive depending on configured selector */ (*rlcUlUdxBndReqMt[pst->selector])(pst, suId, spId); @@ -561,8 +545,6 @@ SpId spId; /* Service User Id */ Reason Reason; /* Status */ #endif { - TRC3(rlcUlUdxUbndReq) - /* jump to specific primitive depending on configured selector */ (*rlcUlUdxUbndReqMt[pst->selector])(pst, spId,reason ); @@ -584,7 +566,6 @@ SuId spId; /* Service User Id */ RlcCfgInfo *cfmInfo; /* Config Info */ #endif { - TRC3(rlcUlUdxCfgReq) /* jump to specific primitive depending on configured selector */ (*rlcUlUdxCfgReqMt[pst->selector])(pst, spId, cfmInfo); @@ -598,7 +579,7 @@ 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 */ ) @@ -606,12 +587,11 @@ CkwUeInfo *newUeInfo /* Config Info */ S16 rlcUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo) 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 */ #endif { - TRC3(rlcUlUdxUeIdChgReq) /* jump to specific primitive depending on configured selector */ (*rlcUlUdxUeIdChgReqMt[pst->selector])(pst, spId,transId,ueInfo,newUeInfo); @@ -670,8 +650,6 @@ RlcL2MeasReqEvt *measReqEvt; #endif { - TRC3(rlcUlUdxStaUpdReq); - return ((*rlcUlUdxL2MeasReqMt[pst->selector])(pst,measReqEvt)); } /* end of rlcUlUdxL2MeasReq*/ @@ -690,18 +668,16 @@ RlcL2MeasReqEvt *measReqEvt; #ifdef ANSI S16 rlcUlUdxL2MeasSendReq ( -Pst* pst, -U8 measType +Pst* pst, +uint8_t measType ) #else S16 rlcUlUdxL2MeasSendReq(pst,measReqEvt) -Pst* pst; -U8 measType; +Pst* pst; +uint8_t measType; #endif { - TRC3(rlcUlUdxStaUpdReq); - return ((*rlcUlUdxL2MeasSendReqMt[pst->selector])(pst,measType)); } /* end of rlcUlUdxMesReq*/ @@ -720,18 +696,16 @@ U8 measType; #ifdef ANSI S16 rlcUlUdxL2MeasStopReq ( -Pst* pst, -U8 measType +Pst* pst, +uint8_t measType ) #else S16 rlcUlUdxL2MeasStopReq(pst,measReqEvt) -Pst* pst; -U8 measType; +Pst* pst; +uint8_t measType; #endif { - TRC3(rlcUlUdxStaUpdReq); - return ((*rlcUlUdxL2MeasStopReqMt[pst->selector])(pst,measType)); } /* end of rlcUlUdxMesReq*/ #endif