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
JIRA ID: ODUHIGH-329 : Msg-1 Code changes
[o-du/l2.git]
/
src
/
cm
/
kwu.c
diff --git
a/src/cm/kwu.c
b/src/cm/kwu.c
index
54fd436
..
1784166
100755
(executable)
--- a/
src/cm/kwu.c
+++ b/
src/cm/kwu.c
@@
-55,25
+55,11
@@
/****************************************************************************
* Packing Functions
***************************************************************************/
/****************************************************************************
* 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;
{
S16 ret1;
Buffer *mBuf;
- TRC3(cmPkKwuBndReq)
-
mBuf = NULLP;
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
mBuf = NULLP;
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
@@
-95,24
+81,11
@@
SpId spId;
}
\f
}
\f
-#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;
{
S16 ret1;
Buffer *mBuf;
- TRC3(cmPkKwuBndCfm)
mBuf = NULLP;
mBuf = NULLP;
@@
-136,24
+109,11
@@
U8 status;
}
\f
}
\f
-#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;
{
S16 ret1;
Buffer *mBuf;
- TRC3(cmPkKwuUbndReq)
mBuf = NULLP;
mBuf = NULLP;
@@
-176,21
+136,8
@@
Reason reason;
return (SPstTsk(pst,mBuf));
} /* cmPkKwuUbndReq */
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)
{
{
-
- TRC3(cmPkKwuDatReqInfo);
-
#ifdef CCPU_OPT
switch(param->lcType) {
case CM_LTE_LCH_CCCH:
#ifdef CCPU_OPT
switch(param->lcType) {
case CM_LTE_LCH_CCCH:
@@
-216,22
+163,10
@@
Buffer *mBuf;
CMCHKPK(oduUnpackUInt32, param->sduId, mBuf);
CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf);
return ROK;
CMCHKPK(oduUnpackUInt32, param->sduId, mBuf);
CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf);
return ROK;
-} /* cmPk
Kwu
DatReqInfo */
+} /* cmPk
Rlc
DatReqInfo */
\f
\f
-#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)
{
#ifdef LCKWU
#if (ERRCLASS & ERRCLS_ADD_RES)
@@
-239,9
+174,8
@@
Buffer * mBuf;
#endif /* LCKWU */
S16 ret1 = ROK;
#ifndef SS_RBUF
#endif /* LCKWU */
S16 ret1 = ROK;
#ifndef SS_RBUF
-
Kwu
DatReqInfo* datReqInfo;
+
Rlc
DatReqInfo* datReqInfo;
#endif
#endif
- TRC3(cmPkKwuDatReq)
#ifndef SS_RBUF
switch(pst->selector)
{
#ifndef SS_RBUF
switch(pst->selector)
{
@@
-254,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,
* subsequent free would be done during the Unpack function of the
* primitive. */
if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datReqInfo,
- sizeof(
Kwu
DatReqInfo),SS_SHARABLE_MEMORY)) != ROK)
+ sizeof(
Rlc
DatReqInfo),SS_SHARABLE_MEMORY)) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
if(ret1 != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
if(ret1 != ROK)
@@
-266,7
+200,7
@@
Buffer * mBuf;
#endif /* ERRCLASS & ERRCLS_ADD_RES */
return (ret1);
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
return (ret1);
}
-
cmMemcpy((U8*)datReqInfo,(U8*)datReq,sizeof(Kwu
DatReqInfo));
+
memcpy(datReqInfo,datReq,sizeof(Rlc
DatReqInfo));
CMCHKPK(oduPackPointer,(PTR)datReqInfo, mBuf);
}
else
CMCHKPK(oduPackPointer,(PTR)datReqInfo, mBuf);
}
else
@@
-278,7
+212,7
@@
Buffer * mBuf;
case ODU_SELECTOR_LC:
{
#if (ERRCLASS & ERRCLS_ADD_RES)
case ODU_SELECTOR_LC:
{
#if (ERRCLASS & ERRCLS_ADD_RES)
- ret1 = cmPk
Kwu
DatReqInfo( (datReq), mBuf);
+ ret1 = cmPk
Rlc
DatReqInfo( (datReq), mBuf);
if(ret1 != ROK)
{
SPutMsg(mBuf);
if(ret1 != ROK)
{
SPutMsg(mBuf);
@@
-288,12
+222,12
@@
Buffer * mBuf;
return ( ret1 );
}
#else
return ( ret1 );
}
#else
- cmPk
Kwu
DatReqInfo( (datReq), mBuf);
+ cmPk
Rlc
DatReqInfo( (datReq), mBuf);
#endif /* ERRCLASS & ERRCLS_ADD_RES */
if(pst->srcEnt == ENTNH)
{
if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
#endif /* ERRCLASS & ERRCLS_ADD_RES */
if(pst->srcEnt == ENTNH)
{
if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
- sizeof(
Kwu
DatReqInfo),SS_SHARABLE_MEMORY) != ROK)
+ sizeof(
Rlc
DatReqInfo),SS_SHARABLE_MEMORY) != ROK)
{
SPutMsg(mBuf);
return RFAILED;
{
SPutMsg(mBuf);
return RFAILED;
@@
-356,7
+290,7
@@
Buffer * mBuf;
#ifdef LCKWU
case ODU_SELECTOR_LC:
{
#ifdef LCKWU
case ODU_SELECTOR_LC:
{
- ret1 = cmPk
Kwu
DatReqInfo( (datReq), mBuf);
+ ret1 = cmPk
Rlc
DatReqInfo( (datReq), mBuf);
#if (ERRCLASS & ERRCLS_ADD_RES)
if(ret1 != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
if(ret1 != ROK)
{
@@
-383,7
+317,7
@@
Buffer * mBuf;
if(pst->selector == ODU_SELECTOR_LC)
{
if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
if(pst->selector == ODU_SELECTOR_LC)
{
if (SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
- sizeof(
Kwu
DatReqInfo),SS_SHARABLE_MEMORY) != ROK)
+ sizeof(
Rlc
DatReqInfo),SS_SHARABLE_MEMORY) != ROK)
{
SPutMsg(mBuf);
return RFAILED;
{
SPutMsg(mBuf);
return RFAILED;
@@
-392,22
+326,11
@@
Buffer * mBuf;
}
return (ret1);
#endif
}
return (ret1);
#endif
-} /* cmPk
Kwu
DatReq */
+} /* cmPk
Rlc
DatReq */
\f
\f
-#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)
{
{
- TRC3(cmPkKwuDatIndInfo);
CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf);
#ifdef CCPU_OPT
CMCHKPK(oduUnpackUInt8, param->isOutOfSeq, mBuf);
#ifdef CCPU_OPT
@@
-418,19
+341,7
@@
Buffer *mBuf;
}
\f
}
\f
-#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;
{
#ifdef LCKWU
S16 ret1 = ROK;
@@
-442,7
+353,6
@@
Buffer * mBuf;
#endif
KwuDatIndInfo *datIndInfo = NULLP;
#endif
KwuDatIndInfo *datIndInfo = NULLP;
- TRC3(cmPkKwuDatInd)
#ifdef TENB_SPLIT_ARCH
/* SSI_CHANGES: */
#ifdef TENB_SPLIT_ARCH
/* SSI_CHANGES: */
@@
-474,7
+384,7
@@
Buffer * mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemcpy((U8*)datIndInfo,(U8*)
datInd,sizeof(KwuDatIndInfo));
+
memcpy(datIndInfo,
datInd,sizeof(KwuDatIndInfo));
CMCHKPK(oduPackPointer,(PTR)datIndInfo, mBuf);
}
break;
CMCHKPK(oduPackPointer,(PTR)datIndInfo, mBuf);
}
break;
@@
-511,21
+421,10
@@
Buffer * mBuf;
} /* cmPkKwuDatInd */
\f
} /* cmPkKwuDatInd */
\f
-#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;
- TRC3(cmPkKwuDatCfmInfo);
for(iter = 0; iter < param->numSduIds; iter++)
{
CMCHKPK(oduUnpackUInt32, param->sduIds[iter], mBuf);
for(iter = 0; iter < param->numSduIds; iter++)
{
CMCHKPK(oduUnpackUInt32, param->sduIds[iter], mBuf);
@@
-536,26
+435,13
@@
Buffer *mBuf;
} /* cmPkKwuDatCfmInfo */
\f
} /* cmPkKwuDatCfmInfo */
\f
-#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;
#endif
Buffer *mBuf;
{
#if (ERRCLASS & ERRCLS_ADD_RES)
S16 ret1= ROK;
#endif
Buffer *mBuf;
- TRC3(cmPkKwuDatCfm)
mBuf = NULLP;
mBuf = NULLP;
@@
-610,19
+496,7
@@
KwuDatCfmInfo* datCfm;
} /* cmPkKwuDatCfm */
\f
} /* cmPkKwuDatCfm */
\f
-#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;
{
#ifdef LCKWU
S16 ret1;
@@
-630,7
+504,6
@@
KwuDiscSduInfo* discSdu;
Buffer *mBuf;
KwuDiscSduInfo* discSduInfo = NULLP;
Buffer *mBuf;
KwuDiscSduInfo* discSduInfo = NULLP;
- TRC3(cmPkKwuDiscSduReq)
mBuf = NULLP;
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
mBuf = NULLP;
if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
@@
-659,7
+532,7
@@
KwuDiscSduInfo* discSdu;
return (ret1);
}
return (ret1);
}
-
cmMemcpy((U8*)discSduInfo,(U8*)
discSdu,sizeof(KwuDiscSduInfo));
+
memcpy(discSduInfo,
discSdu,sizeof(KwuDiscSduInfo));
CMCHKPK(oduPackPointer,(PTR)discSduInfo, mBuf);
}
break;
CMCHKPK(oduPackPointer,(PTR)discSduInfo, mBuf);
}
break;
@@
-689,44
+562,22
@@
KwuDiscSduInfo* discSdu;
} /* cmPkKwuDiscSduReq */
\f
} /* cmPkKwuDiscSduReq */
\f
-#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;
{
S16 i;
- TRC3(cmPkKwuStaIndInfo);
for (i = (param->numSdu - 1); i >= 0; 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;
}
}
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)
{
{
- TRC3(cmPkKwuFlowCntrlIndInfo);
CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf);
CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf);
CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf);
CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf);
@@
-734,19
+585,8
@@
Buffer *mBuf;
return ROK;
} /* cmPkKwuFlowCntrlIndInfo */
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)
{
{
- TRC3(cmUnpkKwuFlowCntrlIndInfo);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->pktAdmitCnt, mBuf);
@@
-755,19
+595,7
@@
Buffer *mBuf;
} /* cmUnpkKwuFlowCntrlIndInfo */
\f
} /* cmUnpkKwuFlowCntrlIndInfo */
\f
-#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)
{
#ifdef LCKWU
#if (ERRCLASS & ERRCLS_ADD_RES)
@@
-776,7
+604,6
@@
KwuStaIndInfo* staInd;
#endif /* LCKWU */
Buffer *mBuf;
#endif /* LCKWU */
Buffer *mBuf;
- TRC3(cmPkKwuStaInd)
mBuf = NULLP;
mBuf = NULLP;
@@
-831,19
+658,7
@@
KwuStaIndInfo* staInd;
} /* cmPkKwuStaInd */
\f
} /* cmPkKwuStaInd */
\f
-#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)
{
#ifdef LCKWU
#if (ERRCLASS & ERRCLS_ADD_RES)
@@
-852,7
+667,6
@@
CmLteRlcId rlcId;
#endif /* LCKWU */
Buffer *mBuf;
#endif /* LCKWU */
Buffer *mBuf;
- TRC3(cmPkKwuReEstCmpInd)
mBuf = NULLP;
mBuf = NULLP;
@@
-890,26
+704,13
@@
CmLteRlcId rlcId;
} /* cmPkKwuReEstCmpInd */
/* kwu_c_001.main_3 added support for L2 Measurement */
} /* 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;
#endif
Buffer *mBuf;
{
#if (ERRCLASS & ERRCLS_ADD_RES)
S16 ret1 = ROK;
#endif
Buffer *mBuf;
- TRC3(cmPkKwuDiscSduCfm)
mBuf = NULLP;
mBuf = NULLP;
@@
-963,23
+764,10
@@
KwuDiscSduInfo *discCfmSdu;
return (SPstTsk(pst,mBuf));
} /* cmPkKwuDiscSduCfm */
\f
return (SPstTsk(pst,mBuf));
} /* cmPkKwuDiscSduCfm */
\f
-#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;
{
Buffer *mBuf;
- TRC3(cmPkKwuFlowCntrlInd)
mBuf = NULLP;
mBuf = NULLP;
@@
-1024,44
+812,20
@@
KwuFlowCntrlIndInfo *flowCntrlIndInfo;
} /* cmPkKwuFlowCntrlInd */
#ifdef LTE_L2_MEAS
} /* 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)
{
{
- TRC3(cmPkKwuDatAckIndInfo);
CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf);
CMCHKPK(oduUnpackUInt32, param->sduId, mBuf);
return ROK;
}
CMCHKPK(cmPkLteRlcId, ¶m->rlcId, mBuf);
CMCHKPK(oduUnpackUInt32, param->sduId, 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;
Buffer *mBuf;
{
S16 ret1;
Buffer *mBuf;
- TRC3(cmPkKwuDatAckInd);
mBuf = NULLP;
mBuf = NULLP;
@@
-1095,25
+859,11
@@
KwuDatAckInfo* datInd;
#endif /* LTE_L2_MEAS */
\f
#endif /* LTE_L2_MEAS */
\f
-#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;
{
SuId suId = 0;
SpId spId = 0;
- TRC3(cmUnpkKwuBndReq)
-
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU020, pst);
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU021, pst);
SPutMsg(mBuf);
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU020, pst);
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU021, pst);
SPutMsg(mBuf);
@@
-1122,24
+872,11
@@
Buffer *mBuf;
}
\f
}
\f
-#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;
{
SuId suId = 0;
-
U8
status = 0;
+
uint8_t
status = 0;
- TRC3(cmUnpkKwuBndCfm)
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU022, pst);
CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EKWU023, pst);
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, EKWU022, pst);
CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, EKWU023, pst);
@@
-1149,24
+886,11
@@
Buffer *mBuf;
}
\f
}
\f
-#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;
{
SpId spId = 0;
Reason reason = 0;
- TRC3(cmUnpkKwuUbndReq)
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU024, pst);
CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EKWU025, pst);
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, EKWU024, pst);
CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, EKWU025, pst);
@@
-1176,20
+900,9
@@
Buffer *mBuf;
} /* cmUnpkKwuUbndReq */
\f
} /* cmUnpkKwuUbndReq */
\f
-#ifdef ANSI
-S16 cmUnpkKwuDatReqInfo
-(
-KwuDatReqInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDatReqInfo(param, mBuf)
-KwuDatReqInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkRlcDatReqInfo(RlcDatReqInfo *param,Buffer *mBuf)
{
{
- TRC3(cmUnpkKwuDatReqInfo);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf);
@@
-1220,28
+933,15
@@
Buffer *mBuf;
}
\f
}
\f
-#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;
{
#if(ERRCLASS & ERRCLS_DEBUG)
S16 ret1 = ROK;
#endif
S16 retVal;
-
Kwu
DatReqInfo *datReq = NULLP;
-
Kwu
DatReqInfo datReqTmp;
+
Rlc
DatReqInfo *datReq = NULLP;
+
Rlc
DatReqInfo datReqTmp;
- TRC3(cmUnpkKwuDatReq)
switch(pst->selector)
{
switch(pst->selector)
{
@@
-1255,9
+955,9
@@
Buffer *mBuf;
/* Allocate the memory statically as there is no free
* in RLC */
datReq = &datReqTmp;
/* Allocate the memory statically as there is no free
* in RLC */
datReq = &datReqTmp;
-
cmMemset((U8 *)datReq, 0, sizeof(Kwu
DatReqInfo));
+
memset(datReq, 0, sizeof(Rlc
DatReqInfo));
#if(ERRCLASS & ERRCLS_DEBUG)
#if(ERRCLASS & ERRCLS_DEBUG)
- ret1 = cmUnpk
Kwu
DatReqInfo( (datReq), mBuf);
+ ret1 = cmUnpk
Rlc
DatReqInfo( (datReq), mBuf);
if(ret1 != ROK)
{
SPutMsg(mBuf);
if(ret1 != ROK)
{
SPutMsg(mBuf);
@@
-1267,7
+967,7
@@
Buffer *mBuf;
return ( ret1 );
}
#else
return ( ret1 );
}
#else
- cmUnpk
Kwu
DatReqInfo( (datReq), mBuf);
+ cmUnpk
Rlc
DatReqInfo( (datReq), mBuf);
#endif /* ERRCLASS & ERRCLS_DEBUG */
}
break;
#endif /* ERRCLASS & ERRCLS_DEBUG */
}
break;
@@
-1287,25
+987,14
@@
Buffer *mBuf;
if(pst->selector == ODU_SELECTOR_LWLC)
{
retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
if(pst->selector == ODU_SELECTOR_LWLC)
{
retVal = SPutStaticBuffer(pst->region, pst->pool, (Data *)datReq,
- sizeof(
Kwu
DatReqInfo),SS_SHARABLE_MEMORY);
+ sizeof(
Rlc
DatReqInfo),SS_SHARABLE_MEMORY);
}
return (retVal);
} /* cmUnpkKwuDatReq */
\f
}
return (retVal);
} /* cmUnpkKwuDatReq */
\f
-#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)
{
{
- TRC3(cmUnpkKwuDatIndInfo);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
@@
-1317,25
+1006,12
@@
Buffer *mBuf;
}
\f
}
\f
-#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;
KwuDatIndInfo datIndTmp;
{
S16 ret1 = ROK, retVal;
KwuDatIndInfo *datInd = NULLP;
KwuDatIndInfo datIndTmp;
- TRC3(cmUnpkKwuDatInd)
switch(pst->selector)
{
switch(pst->selector)
{
@@
-1401,20
+1077,9
@@
Buffer *mBuf;
} /* cmUnpkKwuDatInd */
\f
} /* cmUnpkKwuDatInd */
\f
-#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;
{
register S32 iter;
- TRC3(cmUnpkKwuDatCfmInfo);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->numSduIds, mBuf);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->numSduIds, mBuf);
@@
-1430,25
+1095,12
@@
Buffer *mBuf;
return ROK;
}
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;
KwuDatCfmInfo *datCfm = NULLP;
{
S16 ret1 = ROK;
SuId suId = 0;
KwuDatCfmInfo *datCfm = NULLP;
- TRC3(cmUnpkKwuDatCfm)
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
@@
-1475,7
+1127,7
@@
Buffer *mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemset((U8 *)
datCfm, 0, sizeof(KwuDatCfmInfo));
+
memset(
datCfm, 0, sizeof(KwuDatCfmInfo));
ret1 = cmUnpkKwuDatCfmInfo( (datCfm), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
if(ret1 != ROK)
ret1 = cmUnpkKwuDatCfmInfo( (datCfm), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
if(ret1 != ROK)
@@
-1505,19
+1157,7
@@
Buffer *mBuf;
} /* cmUnpkKwuDatCfm */
\f
} /* cmUnpkKwuDatCfm */
\f
-#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;
{
S16 ret1 = ROK;
SpId spId = 0;
@@
-1547,7
+1187,7
@@
Buffer *mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemset((U8 *)
discSdu, 0, sizeof(KwuDiscSduInfo));
+
memset(
discSdu, 0, sizeof(KwuDiscSduInfo));
ret1 = cmUnpkKwuDiscSduInfo( (discSdu), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
if(ret1 != ROK)
ret1 = cmUnpkKwuDiscSduInfo( (discSdu), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
if(ret1 != ROK)
@@
-1576,21
+1216,9
@@
Buffer *mBuf;
} /* cmUnpkKwuDiscSduReq */
\f
} /* cmUnpkKwuDiscSduReq */
\f
-#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;
-
- TRC3(cmUnpkKwuStaIndInfo);
+ uint32_t i;
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->numSdu, mBuf);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->numSdu, mBuf);
@@
-1603,25
+1231,12
@@
Buffer *mBuf;
} /* cmUnpkKwuStaIndInfo */
\f
} /* cmUnpkKwuStaIndInfo */
\f
-#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;
KwuStaIndInfo *staInd = NULLP;
{
S16 ret1 = ROK;
SuId suId = 0;
KwuStaIndInfo *staInd = NULLP;
- TRC3(cmUnpkKwuStaInd)
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
@@
-1648,7
+1263,7
@@
Buffer *mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemset((U8 *)
staInd, 0, sizeof(KwuStaIndInfo));
+
memset(
staInd, 0, sizeof(KwuStaIndInfo));
ret1 = cmUnpkKwuStaIndInfo( (staInd), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
ret1 = cmUnpkKwuStaIndInfo( (staInd), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
@@
-1678,19
+1293,7
@@
Buffer *mBuf;
} /* cmUnpkKwuStaInd */
\f
} /* cmUnpkKwuStaInd */
\f
-#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;
{
#if(ERRCLASS & ERRCLS_DEBUG)
S16 ret1;
@@
-1698,10
+1301,7
@@
Buffer *mBuf;
SuId suId = 0;
CmLteRlcId rlcId;
SuId suId = 0;
CmLteRlcId rlcId;
- TRC3(cmUnpkKwuReEstCmpInd)
-
- cmMemset((U8 *)&rlcId, 0, sizeof(CmLteRlcId));
-
+ memset(&rlcId, 0, sizeof(CmLteRlcId));
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
switch(pst->selector)
{
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
switch(pst->selector)
{
@@
-1731,25
+1331,12
@@
Buffer *mBuf;
} /* cmUnpkKwuReEstCmpInd */
/* kwu_c_001.main_3 added support for L2 Measurement */
} /* 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;
{
S16 ret1 = ROK;
- SpId
spId = 0;
+ SpId spId = 0;
KwuDiscSduInfo *discSdu = NULLP;
KwuDiscSduInfo *discSdu = NULLP;
- TRC3(cmUnpkKwuDiscSduCfm);
CMCHKUNPK(SUnpkS16, &(spId), mBuf);
CMCHKUNPK(SUnpkS16, &(spId), mBuf);
@@
-1775,7
+1362,7
@@
Buffer *mBuf;
#endif /* ERRCLASS & ERRCLS_ADD_RES */
return (ret1);
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
return (ret1);
}
-
cmMemset((U8 *)
discSdu, 0, sizeof(KwuDiscSduInfo));
+
memset(
discSdu, 0, sizeof(KwuDiscSduInfo));
ret1 = cmUnpkKwuDiscSduInfo( (discSdu), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
ret1 = cmUnpkKwuDiscSduInfo( (discSdu), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
@@
-1802,24
+1389,10
@@
Buffer *mBuf;
return ((*func)(pst, spId, discSdu));
} /* cmUnpkKwuDiscSduCfm */
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;
{
SuId suId;
KwuFlowCntrlIndInfo *flowCntrlInfo = NULLP;
-
- TRC3(cmUnpkKwuFlowCntrlInd);
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
switch(pst->selector)
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
switch(pst->selector)
@@
-1854,19
+1427,8
@@
Buffer *mBuf;
} /* cmUnpkKwuFlowCntrlInd */
#ifdef LTE_L2_MEAS
\f
} /* cmUnpkKwuFlowCntrlInd */
#ifdef LTE_L2_MEAS
\f
-#ifdef ANSI
-S16 cmUnpkKwuDatAckInfo
-(
-KwuDatAckInfo *param,
-Buffer *mBuf
-)
-#else
-S16 cmUnpkKwuDatAckInfo(param, mBuf)
-KwuDatAckInfo *param;
-Buffer *mBuf;
-#endif
+S16 cmUnpkKwuDatAckInfo(KwuDatAckInfo *param,Buffer *mBuf)
{
{
- TRC3(cmUnpkKwuDatAckInfo);
CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
CMCHKUNPK(oduPackUInt32, ¶m->sduId, mBuf);
CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf);
@@
-1875,25
+1437,12
@@
Buffer *mBuf;
}
\f
}
\f
-#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;
KwuDatAckInfo *datInd = NULLP;
{
S16 ret1;
SuId suId = 0;
KwuDatAckInfo *datInd = NULLP;
- TRC3(cmUnpkKwuDatAckInd);
if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datInd,\
sizeof(KwuDatAckInfo),SS_SHARABLE_MEMORY)) != ROK)
if((ret1 = SGetStaticBuffer(pst->region, pst->pool, (Data **)&datInd,\
sizeof(KwuDatAckInfo),SS_SHARABLE_MEMORY)) != ROK)
@@
-1909,7
+1458,7
@@
Buffer *mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemset((U8 *)
datInd, 0, sizeof(KwuDatAckInfo));
+
memset(
datInd, 0, sizeof(KwuDatAckInfo));
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
ret1 = cmUnpkKwuDatAckInfo( (datInd), mBuf);
CMCHKUNPK(SUnpkS16, &(suId), mBuf);
ret1 = cmUnpkKwuDatAckInfo( (datInd), mBuf);