X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrrlc%2Fkw_ptmi.c;h=269626801d4dbb4dcb03454f7ca3b6dc6d92c2be;hb=0d27c8e566e052ad84ea994266a0c7a8c34ce096;hp=e97151b12b21f42e392abf75a7624012448f59c7;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/kw_ptmi.c b/src/5gnrrlc/kw_ptmi.c index e97151b12..269626801 100755 --- a/src/5gnrrlc/kw_ptmi.c +++ b/src/5gnrrlc/kw_ptmi.c @@ -63,7 +63,7 @@ ********************************************************************/ /* Configuration confirmation primitive */ -PRIVATE RlcConfigCfm rlcMiRlcConfigCfmMt[MAXKWMI] = +static RlcConfigCfm rlcMiRlcConfigCfmMt[MAXKWMI] = { #ifdef LCKWMILKW packRlcConfigCfm, /* 0 - loosely coupled - fc */ @@ -75,7 +75,7 @@ PRIVATE RlcConfigCfm rlcMiRlcConfigCfmMt[MAXKWMI] = /* control confirmation primitives */ -PRIVATE LkwCntrlCfm kwMiLkwCntrlCfmMt[MAXKWMI] = +static LkwCntrlCfm kwMiLkwCntrlCfmMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwCntrlCfm, /* 0 - loosely coupled - fc */ @@ -87,7 +87,7 @@ PRIVATE LkwCntrlCfm kwMiLkwCntrlCfmMt[MAXKWMI] = /* Status Indication primitive */ -PRIVATE LkwStaInd kwMiLkwStaIndMt[MAXKWMI] = +static LkwStaInd kwMiLkwStaIndMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwStaInd, /* 0 - loosely coupled */ @@ -99,7 +99,7 @@ PRIVATE LkwStaInd kwMiLkwStaIndMt[MAXKWMI] = /* Status confirm primitive */ -PRIVATE LkwStaCfm kwMiLkwStaCfmMt[MAXKWMI] = +static LkwStaCfm kwMiLkwStaCfmMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwStaCfm, /* 0 - loosely coupled */ @@ -111,7 +111,7 @@ PRIVATE LkwStaCfm kwMiLkwStaCfmMt[MAXKWMI] = /* Statistics confirm primitive */ -PRIVATE LkwStsCfm kwMiLkwStsCfmMt[MAXKWMI] = +static LkwStsCfm kwMiLkwStsCfmMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwStsCfm, /* 0 - loosely coupled */ @@ -123,7 +123,7 @@ PRIVATE LkwStsCfm kwMiLkwStsCfmMt[MAXKWMI] = /* Trace indication primitive */ -PRIVATE LkwTrcInd kwMiLkwTrcIndMt[MAXKWMI] = +static LkwTrcInd kwMiLkwTrcIndMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwTrcInd, /* 0 - loosely coupled */ @@ -135,7 +135,7 @@ PRIVATE LkwTrcInd kwMiLkwTrcIndMt[MAXKWMI] = /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS -PRIVATE CONSTANT LkwL2MeasCfm rlcMiLkwL2MeasCfmMt[] = +static const LkwL2MeasCfm rlcMiLkwL2MeasCfmMt[] = { #ifdef LCKWMILKW cmPkLkwL2MeasCfm, @@ -144,7 +144,7 @@ PRIVATE CONSTANT LkwL2MeasCfm rlcMiLkwL2MeasCfmMt[] = SmMiLkwL2MeasCfm, #endif }; -PRIVATE CONSTANT LkwL2MeasStopCfm RlcMiLkwL2MeasStopCfmMt[] = +static const LkwL2MeasStopCfm RlcMiLkwL2MeasStopCfmMt[] = { #ifdef LCKWMILKW cmPkLkwL2MeasStopCfm, @@ -174,17 +174,11 @@ PRIVATE CONSTANT LkwL2MeasStopCfm RlcMiLkwL2MeasStopCfmMt[] = the layer manager API provided. */ -#ifdef ANSI S16 RlcMiRlcConfigCfm ( Pst *pst, /* post structure */ RlcMngmt *cfm /* Layer Management structure */ ) -#else -S16 RlcMiRlcConfigCfm(pst, cfm) -Pst *pst; /* post structure */ -RlcMngmt *cfm; /* Layer Management structure */ -#endif { /* jump to specific primitive depending on configured selector */ @@ -207,17 +201,11 @@ RlcMngmt *cfm; /* Layer Management structure */ layer manager API provided. */ -#ifdef ANSI S16 RlcMiLkwCntrlCfm ( Pst *pst, /* post structure */ RlcMngmt *cfm /* configure */ ) -#else -S16 RlcMiLkwCntrlCfm(pst, cfm) -Pst *pst; /* post structure */ -RlcMngmt *cfm; /* confirm */ -#endif { /* jump to specific primitive depending on configured selector */ @@ -245,17 +233,11 @@ RlcMngmt *cfm; /* confirm */ - For a tightly coupled interface, the actual function called depends on the layer manager API provided. */ -#ifdef ANSI S16 RlcMiLkwStaInd ( Pst *pst, /* post structure */ RlcMngmt *usta /* unsolicited status */ ) -#else -S16 RlcMiLkwStaInd(pst, usta) -Pst *pst; /* post structure */ -RlcMngmt *usta; /* unsolicited status */ -#endif { /* jump to specific primitive depending on configured selector */ (*kwMiLkwStaIndMt[pst->selector])(pst, usta); @@ -281,17 +263,11 @@ RlcMngmt *usta; /* unsolicited status */ on the layer manager API provided. */ -#ifdef ANSI S16 RlcMiLkwStaCfm ( Pst *pst, /* post structure */ RlcMngmt *cfm /* solicited status confirmation */ ) -#else -S16 RlcMiLkwStaCfm(pst, cfm) -Pst *pst; /* post structure */ -RlcMngmt *cfm; /* solicited status confirmation */ -#endif { /* jump to specific primitive depending on configured selector */ @@ -319,19 +295,12 @@ RlcMngmt *cfm; /* solicited status confirmation */ on the layer manager API provided. */ -#ifdef ANSI S16 RlcMiLkwStsCfm ( Pst *pst, /* post structure */ Action action, /* action */ RlcMngmt *cfm /* statistics confirmation */ ) -#else -S16 RlcMiLkwStsCfm(pst, action, cfm) -Pst *pst; /* post structure */ -Action action; /* action */ -RlcMngmt *cfm; /* statistics confirmation */ -#endif { /* jump to specific primitive depending on configured selector */ (*kwMiLkwStsCfmMt[pst->selector])(pst, action, cfm); @@ -357,19 +326,12 @@ RlcMngmt *cfm; /* statistics confirmation */ the layer manager API provided. */ -#ifdef ANSI S16 RlcMiLkwTrcInd ( Pst *pst, /* post structure */ RlcMngmt *trc, /* trace indication */ Buffer *mBuf /* message buffer */ ) -#else -S16 RlcMiLkwTrcInd(pst, trc, mBuf) -Pst *pst; /* post structure */ -RlcMngmt *trc; /* trace indication */ -Buffer *mBuf; /* message buffer */ -#endif { /* jump to specific primitive depending on configured selector */ (*kwMiLkwTrcIndMt[pst->selector])(pst, trc, mBuf); @@ -381,17 +343,7 @@ Buffer *mBuf; /* message buffer */ /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS -#ifdef ANSI -S16 RlcMiLkwL2MeasCfm -( -Pst * pst, -RlcL2MeasCfmEvt *measEvt -) -#else -S16 RlcMiLkwL2MeasCfm(pst, measEvt) -Pst * pst; -RlcL2MeasCfmEvt *measEvt; -#endif +S16 RlcMiLkwL2MeasCfm(Pst * pst,RlcL2MeasCfmEvt *measEvt) { (*rlcMiLkwL2MeasCfmMt[pst->selector])(pst, measEvt); @@ -399,19 +351,7 @@ RlcL2MeasCfmEvt *measEvt; return ROK; } -#ifdef ANSI -S16 RlcMiLkwL2MeasStopCfm -( -Pst *pst, -U8 measType, -U8 status -) -#else -S16 RlcMiLkwL2MeasStopCfm(pst, measType,status) -Pst *pst; -U8 measType; -U8 status; -#endif +S16 RlcMiLkwL2MeasStopCfm(Pst *pst,uint8_t measType,uint8_t status) { (*RlcMiLkwL2MeasStopCfmMt[pst->selector])(pst, measType,status);