X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fkwu.c;h=1784166cf119c88ee7c9546e4e80924c86bd346d;hb=093afd2e854d73d697233396fb9c74ed67bdd615;hp=60cb06d8353323c8741c4b20c9a1db75b8589eb9;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git diff --git a/src/cm/kwu.c b/src/cm/kwu.c index 60cb06d83..1784166cf 100755 --- a/src/cm/kwu.c +++ b/src/cm/kwu.c @@ -55,24 +55,11 @@ /**************************************************************************** * Packing Functions ***************************************************************************/ -#ifdef ANSI -S16 cmPkKwuBndReq -( -Pst * pst, -SuId suId, -SpId spId -) -#else -S16 cmPkKwuBndReq(pst, suId, spId) -Pst * pst; -SuId suId; -SpId spId; -#endif +S16 cmPkKwuBndReq(Pst * pst,SuId suId,SpId spId) { S16 ret1; Buffer *mBuf; - mBuf = NULLP; if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK) @@ -94,19 +81,7 @@ SpId spId; } -#ifdef ANSI -S16 cmPkKwuBndCfm -( -Pst * pst, -SuId suId, -U8 status -) -#else -S16 cmPkKwuBndCfm(pst, suId, status) -Pst * pst; -SuId suId; -U8 status; -#endif +S16 cmPkKwuBndCfm(Pst * pst,SuId suId,uint8_t status) { S16 ret1; Buffer *mBuf; @@ -134,19 +109,7 @@ U8 status; } -#ifdef ANSI -S16 cmPkKwuUbndReq -( -Pst * pst, -SuId suId, -Reason reason -) -#else -S16 cmPkKwuUbndReq(pst, suId, reason) -Pst * pst; -SuId suId; -Reason reason; -#endif +S16 cmPkKwuUbndReq(Pst * pst,SuId suId,Reason reason) { S16 ret1; Buffer *mBuf; @@ -173,20 +136,8 @@ Reason reason; return (SPstTsk(pst,mBuf)); } /* cmPkKwuUbndReq */ -#ifdef ANSI -uint8_t cmPkKwuDatReqInfo -( -KwuDatReqInfo *param, -Buffer *mBuf -) -#else -uint8_t cmPkKwuDatReqInfo(param, mBuf) -KwuDatReqInfo *param; -Buffer *mBuf; -#endif +uint8_t cmPkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf) { - - #ifdef CCPU_OPT switch(param->lcType) { case CM_LTE_LCH_CCCH: @@ -212,22 +163,10 @@ Buffer *mBuf; CMCHKPK(oduUnpackUInt32, param->sduId, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); return ROK; -} /* cmPkKwuDatReqInfo */ +} /* cmPkRlcDatReqInfo */ -#ifdef ANSI -uint8_t cmPkKwuDatReq -( -Pst * pst, -KwuDatReqInfo* datReq, -Buffer * mBuf -) -#else -uint8_t cmPkKwuDatReq(pst, datReq, mBuf) -Pst * pst; -KwuDatReqInfo* datReq; -Buffer * mBuf; -#endif +uint8_t cmPkRlcDatReq(Pst * pst,RlcDatReqInfo* datReq,Buffer * mBuf) { #ifdef LCKWU #if (ERRCLASS & ERRCLS_ADD_RES) @@ -235,7 +174,7 @@ Buffer * mBuf; #endif /* LCKWU */ S16 ret1 = ROK; #ifndef SS_RBUF - KwuDatReqInfo* datReqInfo; + RlcDatReqInfo* datReqInfo; #endif #ifndef SS_RBUF switch(pst->selector) @@ -249,7 +188,7 @@ Buffer * mBuf; * subsequent free would be done during the Unpack function of the * primitive. */ if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datReqInfo, - sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY)) != ROK) + sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) if(ret1 != ROK) @@ -261,7 +200,7 @@ Buffer * mBuf; #endif /* ERRCLASS & ERRCLS_ADD_RES */ return (ret1); } - memcpy(datReqInfo,datReq,sizeof(KwuDatReqInfo)); + memcpy(datReqInfo,datReq,sizeof(RlcDatReqInfo)); CMCHKPK(oduPackPointer,(PTR)datReqInfo, mBuf); } else @@ -273,7 +212,7 @@ Buffer * mBuf; case ODU_SELECTOR_LC: { #if (ERRCLASS & ERRCLS_ADD_RES) - ret1 = cmPkKwuDatReqInfo( (datReq), mBuf); + ret1 = cmPkRlcDatReqInfo( (datReq), mBuf); if(ret1 != ROK) { SPutMsg(mBuf); @@ -283,12 +222,12 @@ Buffer * mBuf; return ( ret1 ); } #else - cmPkKwuDatReqInfo( (datReq), mBuf); + cmPkRlcDatReqInfo( (datReq), mBuf); #endif /* ERRCLASS & ERRCLS_ADD_RES */ if(pst->srcEnt == ENTNH) { if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq, - sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY) != ROK) + sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); return RFAILED; @@ -351,7 +290,7 @@ Buffer * mBuf; #ifdef LCKWU case ODU_SELECTOR_LC: { - ret1 = cmPkKwuDatReqInfo( (datReq), mBuf); + ret1 = cmPkRlcDatReqInfo( (datReq), mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) if(ret1 != ROK) { @@ -378,7 +317,7 @@ Buffer * mBuf; if(pst->selector == ODU_SELECTOR_LC) { if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq, - sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY) != ROK) + sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY) != ROK) { SPutMsg(mBuf); return RFAILED; @@ -387,20 +326,10 @@ Buffer * mBuf; } return (ret1); #endif -} /* cmPkKwuDatReq */ +} /* cmPkRlcDatReq */ -#ifdef ANSI -uint8_t cmPkKwuDatIndInfo -( -KwuDatIndInfo *param, -Buffer *mBuf -) -#else -uint8_t cmPkKwuDatIndInfo(param, mBuf) -KwuDatIndInfo *param; -Buffer *mBuf; -#endif +uint8_t cmPkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf) { CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf); @@ -412,19 +341,7 @@ Buffer *mBuf; } -#ifdef ANSI -uint8_t cmPkKwuDatInd -( -Pst * pst, -KwuDatIndInfo* datInd, -Buffer * mBuf -) -#else -uint8_t cmPkKwuDatInd(pst, datInd, mBuf) -Pst * pst; -KwuDatIndInfo* datInd; -Buffer * mBuf; -#endif +uint8_t cmPkKwuDatInd(Pst * pst,KwuDatIndInfo* datInd,Buffer * mBuf) { #ifdef LCKWU S16 ret1 = ROK; @@ -504,19 +421,9 @@ Buffer * mBuf; } /* cmPkKwuDatInd */ -#ifdef ANSI -S16 cmPkKwuDatCfmInfo -( -KwuDatCfmInfo *param, -Buffer *mBuf -) -#else -S16 cmPkKwuDatCfmInfo(param, mBuf) -KwuDatCfmInfo *param; -Buffer *mBuf; -#endif +S16 cmPkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf) { - register U32 iter; + register uint32_t iter; for(iter = 0; iter < param->numSduIds; iter++) { @@ -528,19 +435,7 @@ Buffer *mBuf; } /* cmPkKwuDatCfmInfo */ -#ifdef ANSI -S16 cmPkKwuDatCfm -( -Pst * pst, -SuId suId, -KwuDatCfmInfo* datCfm -) -#else -S16 cmPkKwuDatCfm(pst, suId, datCfm) -Pst * pst; -SuId suId; -KwuDatCfmInfo* datCfm; -#endif +S16 cmPkKwuDatCfm(Pst * pst,SuId suId,KwuDatCfmInfo* datCfm) { #if (ERRCLASS & ERRCLS_ADD_RES) S16 ret1= ROK; @@ -601,19 +496,7 @@ KwuDatCfmInfo* datCfm; } /* cmPkKwuDatCfm */ -#ifdef ANSI -S16 cmPkKwuDiscSduReq -( -Pst * pst, -SpId spId, -KwuDiscSduInfo* discSdu -) -#else -S16 cmPkKwuDiscSduReq(pst, spId, discSdu) -Pst * pst; -SpId spId; -KwuDiscSduInfo* discSdu; -#endif +S16 cmPkKwuDiscSduReq(Pst * pst,SpId spId,KwuDiscSduInfo* discSdu) { #ifdef LCKWU S16 ret1; @@ -679,41 +562,21 @@ KwuDiscSduInfo* discSdu; } /* cmPkKwuDiscSduReq */ -#ifdef ANSI -S16 cmPkKwuStaIndInfo -( -KwuStaIndInfo *param, -Buffer *mBuf -) -#else -S16 cmPkKwuStaIndInfo(param, mBuf) -KwuStaIndInfo *param; -Buffer *mBuf; -#endif +S16 cmPkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf) { S16 i; for (i = (param->numSdu - 1); i >= 0; i--) { - CMCHKPK(oduUnpackUInt32, param->sduId[(U16)i], mBuf); + CMCHKPK(oduUnpackUInt32, param->sduId[(uint16_t)i], mBuf); } CMCHKPK(oduUnpackUInt32, param->numSdu, mBuf); CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); return ROK; } -#ifdef ANSI -S16 cmPkKwuFlowCntrlIndInfo -( -KwuFlowCntrlIndInfo *param, -Buffer *mBuf -) -#else -S16 cmPkKwuFlowCntrlIndInfo(param, mBuf) -KwuFlowCntrlIndInfo *param; -Buffer *mBuf; -#endif +S16 cmPkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf) { CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf); @@ -722,17 +585,7 @@ Buffer *mBuf; return ROK; } /* cmPkKwuFlowCntrlIndInfo */ -#ifdef ANSI -S16 cmUnpkKwuFlowCntrlIndInfo -( -KwuFlowCntrlIndInfo *param, -Buffer *mBuf -) -#else -S16 cmUnpkKwuFlowCntrlIndInfo(param, mBuf) -KwuFlowCntrlIndInfo *param; -Buffer *mBuf; -#endif +S16 cmUnpkKwuFlowCntrlIndInfo(KwuFlowCntrlIndInfo *param,Buffer *mBuf) { CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); @@ -742,19 +595,7 @@ Buffer *mBuf; } /* cmUnpkKwuFlowCntrlIndInfo */ -#ifdef ANSI -S16 cmPkKwuStaInd -( -Pst * pst, -SuId suId, -KwuStaIndInfo* staInd -) -#else -S16 cmPkKwuStaInd(pst, suId, staInd) -Pst * pst; -SuId suId; -KwuStaIndInfo* staInd; -#endif +S16 cmPkKwuStaInd(Pst * pst,SuId suId,KwuStaIndInfo* staInd) { #ifdef LCKWU #if (ERRCLASS & ERRCLS_ADD_RES) @@ -817,19 +658,7 @@ KwuStaIndInfo* staInd; } /* cmPkKwuStaInd */ -#ifdef ANSI -S16 cmPkKwuReEstCmpInd -( -Pst * pst, -SuId suId, -CmLteRlcId rlcId -) -#else -S16 cmPkKwuReEstCmpInd(pst, suId, rlcId) -Pst * pst; -SuId suId; -CmLteRlcId rlcId; -#endif +S16 cmPkKwuReEstCmpInd(Pst * pst,SuId suId,CmLteRlcId rlcId) { #ifdef LCKWU #if (ERRCLASS & ERRCLS_ADD_RES) @@ -875,19 +704,7 @@ CmLteRlcId rlcId; } /* cmPkKwuReEstCmpInd */ /* kwu_c_001.main_3 added support for L2 Measurement */ -#ifdef ANSI -S16 cmPkKwuDiscSduCfm -( -Pst *pst, -SpId spId, -KwuDiscSduInfo *discCfmSdu -) -#else -S16 cmPkKwuDiscSduCfm(pst, spId, discCfmSdu) -Pst *pst; -SpId spId; -KwuDiscSduInfo *discCfmSdu; -#endif +S16 cmPkKwuDiscSduCfm(Pst *pst,SpId spId,KwuDiscSduInfo *discCfmSdu) { #if (ERRCLASS & ERRCLS_ADD_RES) S16 ret1 = ROK; @@ -947,19 +764,7 @@ KwuDiscSduInfo *discCfmSdu; return (SPstTsk(pst,mBuf)); } /* cmPkKwuDiscSduCfm */ -#ifdef ANSI -S16 cmPkKwuFlowCntrlInd -( -Pst *pst, -SuId suId, -KwuFlowCntrlIndInfo *flowCntrlIndInfo -) -#else -S16 cmPkKwuFlowCntrlInd(pst, suId, flowCntrlIndInfo) -Pst *pst; -SuId suId; -KwuFlowCntrlIndInfo *flowCntrlIndInfo; -#endif +S16 cmPkKwuFlowCntrlInd(Pst *pst,SuId suId,KwuFlowCntrlIndInfo *flowCntrlIndInfo) { Buffer *mBuf; @@ -1007,17 +812,7 @@ KwuFlowCntrlIndInfo *flowCntrlIndInfo; } /* cmPkKwuFlowCntrlInd */ #ifdef LTE_L2_MEAS -#ifdef ANSI -S16 cmPkKwuDatAckInfo -( -KwuDatAckInfo *param, -Buffer *mBuf -) -#else -S16 cmPkKwuDatAckInfo(param, mBuf) -KwuDatAckInfo *param; -Buffer *mBuf; -#endif +S16 cmPkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf) { CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf); @@ -1025,19 +820,7 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI -S16 cmPkKwuDatAckInd -( -Pst * pst, -SuId suId, -KwuDatAckInfo* datInd -) -#else -S16 cmPkKwuDatAckInd(pst, suId, datInd) -Pst * pst; -SuId suId; -KwuDatAckInfo* datInd; -#endif +S16 cmPkKwuDatAckInd(Pst * pst,SuId suId,KwuDatAckInfo* datInd) { S16 ret1; @@ -1076,19 +859,7 @@ KwuDatAckInfo* datInd; #endif /* LTE_L2_MEAS */ -#ifdef ANSI -S16 cmUnpkKwuBndReq -( -KwuBndReq func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuBndReq(func, pst, mBuf) -KwuBndReq func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuBndReq(KwuBndReq func,Pst *pst,Buffer *mBuf) { SuId suId = 0; SpId spId = 0; @@ -1101,22 +872,10 @@ Buffer *mBuf; } -#ifdef ANSI -S16 cmUnpkKwuBndCfm -( -KwuBndCfm func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuBndCfm(func, pst, mBuf) -KwuBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuBndCfm(KwuBndCfm func,Pst *pst,Buffer *mBuf) { SuId suId = 0; - U8 status = 0; + uint8_t status = 0; CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU022, pst); @@ -1127,19 +886,7 @@ Buffer *mBuf; } -#ifdef ANSI -S16 cmUnpkKwuUbndReq -( -KwuUbndReq func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuUbndReq(func, pst, mBuf) -KwuUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuUbndReq(KwuUbndReq func,Pst *pst,Buffer *mBuf) { SpId spId = 0; Reason reason = 0; @@ -1153,17 +900,7 @@ Buffer *mBuf; } /* cmUnpkKwuUbndReq */ -#ifdef ANSI -S16 cmUnpkKwuDatReqInfo -( -KwuDatReqInfo *param, -Buffer *mBuf -) -#else -S16 cmUnpkKwuDatReqInfo(param, mBuf) -KwuDatReqInfo *param; -Buffer *mBuf; -#endif +S16 cmUnpkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf) { @@ -1196,26 +933,14 @@ Buffer *mBuf; } -#ifdef ANSI -S16 cmUnpkKwuDatReq -( -KwuDatReq func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuDatReq(func, pst, mBuf) -KwuDatReq func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuDatReq(KwuDatReq func,Pst *pst,Buffer *mBuf) { #if(ERRCLASS & ERRCLS_DEBUG) S16 ret1 = ROK; #endif S16 retVal; - KwuDatReqInfo *datReq = NULLP; - KwuDatReqInfo datReqTmp; + RlcDatReqInfo *datReq = NULLP; + RlcDatReqInfo datReqTmp; switch(pst->selector) @@ -1230,9 +955,9 @@ Buffer *mBuf; /* Allocate the memory statically as there is no free * in RLC */ datReq = &datReqTmp; - memset(datReq, 0, sizeof(KwuDatReqInfo)); + memset(datReq, 0, sizeof(RlcDatReqInfo)); #if(ERRCLASS & ERRCLS_DEBUG) - ret1 = cmUnpkKwuDatReqInfo( (datReq), mBuf); + ret1 = cmUnpkRlcDatReqInfo( (datReq), mBuf); if(ret1 != ROK) { SPutMsg(mBuf); @@ -1242,7 +967,7 @@ Buffer *mBuf; return ( ret1 ); } #else - cmUnpkKwuDatReqInfo( (datReq), mBuf); + cmUnpkRlcDatReqInfo( (datReq), mBuf); #endif /* ERRCLASS & ERRCLS_DEBUG */ } break; @@ -1262,23 +987,13 @@ Buffer *mBuf; if(pst->selector == ODU_SELECTOR_LWLC) { retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq, - sizeof(KwuDatReqInfo),SS_SHARABLE_MEMORY); + sizeof(RlcDatReqInfo),SS_SHARABLE_MEMORY); } return (retVal); } /* cmUnpkKwuDatReq */ -#ifdef ANSI -uint8_t cmUnpkKwuDatIndInfo -( -KwuDatIndInfo *param, -Buffer *mBuf -) -#else -uint8_t cmUnpkKwuDatIndInfo(param, mBuf) -KwuDatIndInfo *param; -Buffer *mBuf; -#endif +uint8_t cmUnpkKwuDatIndInfo(KwuDatIndInfo *param,Buffer *mBuf) { CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); @@ -1291,19 +1006,7 @@ Buffer *mBuf; } -#ifdef ANSI -uint8_t cmUnpkKwuDatInd -( -KwuDatInd func, -Pst *pst, -Buffer *mBuf -) -#else -uint8_t cmUnpkKwuDatInd(func, pst, mBuf) -KwuDatInd func; -Pst *pst; -Buffer *mBuf; -#endif +uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst,Buffer *mBuf) { S16 ret1 = ROK, retVal; KwuDatIndInfo *datInd = NULLP; @@ -1374,17 +1077,7 @@ Buffer *mBuf; } /* cmUnpkKwuDatInd */ -#ifdef ANSI -S16 cmUnpkKwuDatCfmInfo -( -KwuDatCfmInfo *param, -Buffer *mBuf -) -#else -S16 cmUnpkKwuDatCfmInfo(param, mBuf) -KwuDatCfmInfo *param; -Buffer *mBuf; -#endif +S16 cmUnpkKwuDatCfmInfo(KwuDatCfmInfo *param,Buffer *mBuf) { register S32 iter; @@ -1402,19 +1095,7 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI -S16 cmUnpkKwuDatCfm -( -KwuDatCfm func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuDatCfm(func, pst, mBuf) -KwuDatCfm func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuDatCfm(KwuDatCfm func,Pst *pst,Buffer *mBuf) { S16 ret1 = ROK; SuId suId = 0; @@ -1476,19 +1157,7 @@ Buffer *mBuf; } /* cmUnpkKwuDatCfm */ -#ifdef ANSI -S16 cmUnpkKwuDiscSduReq -( -KwuDiscSduReq func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuDiscSduReq(func, pst, mBuf) -KwuDiscSduReq func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuDiscSduReq(KwuDiscSduReq func,Pst *pst,Buffer *mBuf) { S16 ret1 = ROK; SpId spId = 0; @@ -1547,20 +1216,9 @@ Buffer *mBuf; } /* cmUnpkKwuDiscSduReq */ -#ifdef ANSI -S16 cmUnpkKwuStaIndInfo -( -KwuStaIndInfo *param, -Buffer *mBuf -) -#else -S16 cmUnpkKwuStaIndInfo(param, mBuf) -KwuStaIndInfo *param; -Buffer *mBuf; -#endif +S16 cmUnpkKwuStaIndInfo(KwuStaIndInfo *param,Buffer *mBuf) { - U32 i; - + uint32_t i; CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numSdu, mBuf); @@ -1573,19 +1231,7 @@ Buffer *mBuf; } /* cmUnpkKwuStaIndInfo */ -#ifdef ANSI -S16 cmUnpkKwuStaInd -( -KwuStaInd func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuStaInd(func, pst, mBuf) -KwuStaInd func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuStaInd(KwuStaInd func,Pst *pst,Buffer *mBuf) { S16 ret1 = ROK; SuId suId = 0; @@ -1647,19 +1293,7 @@ Buffer *mBuf; } /* cmUnpkKwuStaInd */ -#ifdef ANSI -S16 cmUnpkKwuReEstCmpInd -( -KwuReEstCmpInd func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuReEstCmpInd(func, pst, mBuf) -KwuReEstCmpInd func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuReEstCmpInd(KwuReEstCmpInd func,Pst *pst,Buffer *mBuf) { #if(ERRCLASS & ERRCLS_DEBUG) S16 ret1; @@ -1667,9 +1301,7 @@ Buffer *mBuf; SuId suId = 0; CmLteRlcId rlcId; - memset(&rlcId, 0, sizeof(CmLteRlcId)); - CMCHKUNPK(SUnpkS16, &(suId), mBuf); switch(pst->selector) { @@ -1699,22 +1331,10 @@ Buffer *mBuf; } /* cmUnpkKwuReEstCmpInd */ /* kwu_c_001.main_3 added support for L2 Measurement */ -#ifdef ANSI -S16 cmUnpkKwuDiscSduCfm -( -KwuDiscSduCfm func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuDiscSduCfm(func, pst, mBuf) -KwuDiscSduCfm func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuDiscSduCfm(KwuDiscSduCfm func,Pst *pst,Buffer *mBuf) { S16 ret1 = ROK; - SpId spId = 0; + SpId spId = 0; KwuDiscSduInfo *discSdu = NULLP; @@ -1769,23 +1389,10 @@ Buffer *mBuf; return ((*func)(pst, spId, discSdu)); } /* cmUnpkKwuDiscSduCfm */ -#ifdef ANSI -S16 cmUnpkKwuFlowCntrlInd -( -KwuFlowCntrlInd func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuFlowCntrlInd(func, pst, mBuf) -KwuFlowCntrlInd func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuFlowCntrlInd(KwuFlowCntrlInd func,Pst *pst,Buffer *mBuf) { SuId suId; KwuFlowCntrlIndInfo *flowCntrlInfo = NULLP; - CMCHKUNPK(SUnpkS16, &(suId), mBuf); switch(pst->selector) @@ -1820,17 +1427,7 @@ Buffer *mBuf; } /* cmUnpkKwuFlowCntrlInd */ #ifdef LTE_L2_MEAS -#ifdef ANSI -S16 cmUnpkKwuDatAckInfo -( -KwuDatAckInfo *param, -Buffer *mBuf -) -#else -S16 cmUnpkKwuDatAckInfo(param, mBuf) -KwuDatAckInfo *param; -Buffer *mBuf; -#endif +S16 cmUnpkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf) { CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf); @@ -1840,19 +1437,7 @@ Buffer *mBuf; } -#ifdef ANSI -S16 cmUnpkKwuDatAckInd -( -KwuDatAckInd func, -Pst *pst, -Buffer *mBuf -) -#else -S16 cmUnpkKwuDatAckInd(func, pst, mBuf) -KwuDatAckInd func; -Pst *pst; -Buffer *mBuf; -#endif +S16 cmUnpkKwuDatAckInd(KwuDatAckInd func,Pst *pst,Buffer *mBuf) { S16 ret1; SuId suId = 0;