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
Merge "schGetSlotSymbFrmt fixes for TDD"
[o-du/l2.git]
/
src
/
cm
/
ckw.c
diff --git
a/src/cm/ckw.c
b/src/cm/ckw.c
index
e3aaffa
..
8c2a930
100755
(executable)
--- a/
src/cm/ckw.c
+++ b/
src/cm/ckw.c
@@
-37,7
+37,7
@@
\f
#ifdef __cplusplus
\f
#ifdef __cplusplus
-
EXTERN
"C" {
+
extern
"C" {
#endif /*for extern "C"*/
#ifdef LCCKW
#endif /*for extern "C"*/
#ifdef LCCKW
@@
-54,24
+54,16
@@
EXTERN "C" {
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkCkwBndReq
+S16 cmPkCkwBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
(
Pst *pst,
SuId suId,
SpId spId
)
-#else
-PUBLIC S16 cmPkCkwBndReq(pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkCkwBndReq)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
@@
-105,24
+97,16
@@
SpId spId;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkCkwUbndReq
+S16 cmPkCkwUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
(
Pst *pst,
SpId spId,
Reason reason
)
-#else
-PUBLIC S16 cmPkCkwUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkCkwUbndReq)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
@@
-156,24
+140,16
@@
Reason reason;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkCkwBndCfm
+S16 cmPkCkwBndCfm
(
Pst *pst,
SuId suId,
(
Pst *pst,
SuId suId,
-
U8
status
+
uint8_t
status
)
)
-#else
-PUBLIC S16 cmPkCkwBndCfm(pst, suId, status)
-Pst *pst;
-SuId suId;
-U8 status;
-#endif
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkCkwBndCfm)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
@@
-209,19
+185,12
@@
U8 status;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkRlcTmInfo
+S16 cmPkRlcTmInfo
(
RlcTmInfo *param,
Buffer *mBuf
)
(
RlcTmInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRlcTmInfo(param, mBuf)
-RlcTmInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmPkRlcTmInfo)
CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf);
CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf);
@@
-242,19
+211,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkRlcUmInfo
+S16 cmPkRlcUmInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRlcUmInfo(param, mBuf)
-RlcEntCfgInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmPkRlcUmInfo)
switch(param->dir)
{
switch(param->dir)
{
@@
-265,7
+227,7
@@
Buffer *mBuf;
}
case CKW_CFG_DIR_UL:
{
}
case CKW_CFG_DIR_UL:
{
- CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.re
Ord
Tmr, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.re
Asmbl
Tmr, mBuf);
CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
break;
}
CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
break;
}
@@
-273,7
+235,7
@@
Buffer *mBuf;
case CKW_CFG_DIR_BOTH:
{
CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf);
case CKW_CFG_DIR_BOTH:
{
CMCHKPK(oduUnpackUInt8, param->m.umInfo.dl.snLen, mBuf);
- CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.re
Ord
Tmr, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.re
Asmbl
Tmr, mBuf);
CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
break;
}
CMCHKPK(oduUnpackUInt8, param->m.umInfo.ul.snLen, mBuf);
break;
}
@@
-296,22
+258,15
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkRlcAmInfo
+S16 cmPkRlcAmInfo
(
RlcAmInfo *param,
Buffer *mBuf
)
(
RlcAmInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRlcAmInfo(param, mBuf)
-RlcAmInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmPkRlcAmInfo)
/* UP LINK */
/* UP LINK */
- CMCHKPK(oduUnpackUInt8, param->ul.re
Ord
Tmr, mBuf);
+ CMCHKPK(oduUnpackUInt8, param->ul.re
Asmbl
Tmr, mBuf);
CMCHKPK(oduUnpackUInt16, param->ul.staProhTmr, mBuf);
CMCHKPK(oduUnpackUInt8, param->ul.snLen, mBuf);
CMCHKPK(oduUnpackUInt16, param->ul.staProhTmr, mBuf);
CMCHKPK(oduUnpackUInt8, param->ul.snLen, mBuf);
@@
-339,19
+294,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkCkwLChInfo
+S16 cmPkCkwLChInfo
(
CkwLChInfo *param,
Buffer *mBuf
)
(
CkwLChInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkCkwLChInfo(param, mBuf)
-CkwLChInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmPkCkwLChInfo)
CMCHKPK(oduUnpackUInt8, param->type, mBuf);
CMCHKPK(oduUnpackUInt8, param->lChId, mBuf);
CMCHKPK(oduUnpackUInt8, param->type, mBuf);
CMCHKPK(oduUnpackUInt8, param->lChId, mBuf);
@@
-373,19
+321,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkRlcEntCfgInfo
+S16 cmPkRlcEntCfgInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRlcEntCfgInfo(param, mBuf)
-RlcEntCfgInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmPkRlcEntCfgInfo)
switch(param->entMode)
{
switch(param->entMode)
{
@@
-452,24
+393,15
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkRlcCfgInfo
+S16 cmPkRlcCfgInfo
(
RlcCfgInfo *param,
Pst *pst,
Buffer *mBuf
)
(
RlcCfgInfo *param,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRlcCfgInfo(param, pst, mBuf)
-RlcCfgInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
S16 idx;
{
S16 idx;
- TRC3(cmPkRlcCfgInfo)
-
for (idx = param->numEnt-1; idx >= 0; idx--)
{
CMCHKPK(cmPkRlcEntCfgInfo, &(param->entCfg[idx]), mBuf);
for (idx = param->numEnt-1; idx >= 0; idx--)
{
CMCHKPK(cmPkRlcEntCfgInfo, &(param->entCfg[idx]), mBuf);
@@
-497,19
+429,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkRlcEntCfgCfmInfo
+S16 cmPkRlcEntCfgCfmInfo
(
RlcEntCfgCfmInfo *param,
Buffer *mBuf
)
(
RlcEntCfgCfmInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRlcEntCfgCfmInfo(param, mBuf)
-RlcEntCfgCfmInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmPkRlcEntCfgCfmInfo)
CMCHKPK(cmPkCmStatus, &(param->status), mBuf);
CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
CMCHKPK(cmPkCmStatus, &(param->status), mBuf);
CMCHKPK(oduUnpackUInt8, param->rbType, mBuf);
@@
-532,27
+457,18
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkRlcCfgCfmInfo
+S16 cmPkRlcCfgCfmInfo
(
RlcCfgCfmInfo *param,
Pst *pst,
Buffer *mBuf
)
(
RlcCfgCfmInfo *param,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkRlcCfgCfmInfo(param, pst, mBuf)
-RlcCfgCfmInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
S16 idx;
{
S16 idx;
- TRC3(cmPkRlcCfgCfmInfo)
-
for (idx = param->numEnt-1; idx >= 0; idx--)
{
for (idx = param->numEnt-1; idx >= 0; idx--)
{
- CMCHKPK(cmPkRlcEntCfgCfmInfo, &(param->entCfgCfm[(
U8
)idx]), mBuf);
+ CMCHKPK(cmPkRlcEntCfgCfmInfo, &(param->entCfgCfm[(
uint8_t
)idx]), mBuf);
}
CMCHKPK(oduUnpackUInt8, param->numEnt, mBuf);
}
CMCHKPK(oduUnpackUInt8, param->numEnt, mBuf);
@@
-568,7
+484,7
@@
Buffer *mBuf;
*
* Fun: cmPkRlcCfgCfm
*
*
* Fun: cmPkRlcCfgCfm
*
-* Desc: pack the primitive
Kw
UiRlcCfgCfm
+* Desc: pack the primitive
Rlc
UiRlcCfgCfm
*
* Ret: ROK -ok
*
*
* Ret: ROK -ok
*
@@
-577,24
+493,16
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkRlcCfgCfm
+S16 cmPkRlcCfgCfm
(
Pst *pst,
SuId suId,
RlcCfgCfmInfo *cfgCfmInfo
)
(
Pst *pst,
SuId suId,
RlcCfgCfmInfo *cfgCfmInfo
)
-#else
-PUBLIC S16 cmPkRlcCfgCfm(pst, suId, cfgCfmInfo)
-Pst *pst;
-SuId suId;
-RlcCfgCfmInfo *cfgCfmInfo;
-#endif
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
{
S16 ret1;
Buffer *mBuf;
mBuf = NULLP;
- TRC3(cmPkRlcCfgCfm)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
@@
-656,19
+564,12
@@
RlcCfgCfmInfo *cfgCfmInfo;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkCkwUeInfo
+S16 cmPkCkwUeInfo
(
CkwUeInfo *param,
Buffer *mBuf
)
(
CkwUeInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmPkCkwUeInfo(param, mBuf)
-CkwUeInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC2(cmPkCkwUeInfo)
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
CMCHKPK(cmPkLteRnti, param->ueId, mBuf);
@@
-680,7
+581,7
@@
Buffer *mBuf;
*
* Fun: cmPkCkwUeIdChgReq
*
*
* Fun: cmPkCkwUeIdChgReq
*
-* Desc: pack the primitive
Kw
UiCkwUeIdChgReq
+* Desc: pack the primitive
Rlc
UiCkwUeIdChgReq
*
* Ret: ROK -ok
*
*
* Ret: ROK -ok
*
@@
-689,28
+590,18
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkCkwUeIdChgReq
+S16 cmPkCkwUeIdChgReq
(
(
-Pst
*pst,
-SpId
spId,
-
U32
transId,
-CkwUeInfo
*ueInfo,
-CkwUeInfo
*newUeInfo
+Pst *pst,
+SpId spId,
+
uint32_t
transId,
+CkwUeInfo *ueInfo,
+CkwUeInfo *newUeInfo
)
)
-#else
-PUBLIC S16 cmPkCkwUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst *pst;
-SpId spId;
-U32 transId;
-CkwUeInfo *ueInfo;
-CkwUeInfo *newUeInfo;
-#endif
{
S16 ret1;
Buffer *mBuf = NULLP;
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkCkwUeIdChgReq)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
@@
-752,7
+643,7
@@
CkwUeInfo *newUeInfo;
*
* Fun: cmPkCkwUeIdChgCfm
*
*
* Fun: cmPkCkwUeIdChgCfm
*
-* Desc: pack the primitive
Kw
UiCkwUeIdChgCfm
+* Desc: pack the primitive
Rlc
UiCkwUeIdChgCfm
*
* Ret: ROK -ok
*
*
* Ret: ROK -ok
*
@@
-761,28
+652,18
@@
CkwUeInfo *newUeInfo;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmPkCkwUeIdChgCfm
+S16 cmPkCkwUeIdChgCfm
(
(
-Pst
*pst,
-SuId
suId,
-
U32
transId,
-CkwUeInfo
*ueInfo,
-CmStatus
status
+Pst *pst,
+SuId suId,
+
uint32_t
transId,
+CkwUeInfo *ueInfo,
+CmStatus status
)
)
-#else
-PUBLIC S16 cmPkCkwUeIdChgCfm(pst, suId, transId, ueInfo, status)
-Pst *pst;
-SuId suId;
-U32 transId;
-CkwUeInfo *ueInfo;
-CmStatus status;
-#endif
{
S16 ret1;
Buffer *mBuf = NULLP;
{
S16 ret1;
Buffer *mBuf = NULLP;
- TRC3(cmPkCkwUeIdChgCfm)
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
if((ret1 = SGetMsg(pst->region, pst->pool, &mBuf)) != ROK)
{
@@
-832,24
+713,16
@@
CmStatus status;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCkwBndReq
+S16 cmUnpkCkwBndReq
(
CkwBndReq func,
Pst *pst,
Buffer *mBuf
)
(
CkwBndReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkCkwBndReq(func, pst, mBuf)
-CkwBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SuId suId = 0;
SpId spId = 0;
{
SuId suId = 0;
SpId spId = 0;
- TRC3(cmUnpkCkwBndReq)
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW024, pst);
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW025, pst);
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW024, pst);
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW025, pst);
@@
-871,24
+744,16
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCkwUbndReq
+S16 cmUnpkCkwUbndReq
(
CkwUbndReq func,
Pst *pst,
Buffer *mBuf
)
(
CkwUbndReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkCkwUbndReq(func, pst, mBuf)
-CkwUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SpId spId = 0;
Reason reason = 0;
{
SpId spId = 0;
Reason reason = 0;
- TRC3(cmUnpkCkwUbndReq)
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW026, pst);
CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, ECKW027, pst);
CMCHKUNPKLOG(SUnpkS16, &spId, mBuf, ECKW026, pst);
CMCHKUNPKLOG(SUnpkS16, &reason, mBuf, ECKW027, pst);
@@
-909,24
+774,16
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCkwBndCfm
+S16 cmUnpkCkwBndCfm
(
CkwBndCfm func,
Pst *pst,
Buffer *mBuf
)
(
CkwBndCfm func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkCkwBndCfm(func, pst, mBuf)
-CkwBndCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
{
- SuId
suId = 0;
-
U8
status = 0;
+ SuId suId = 0;
+
uint8_t
status = 0;
- TRC3(cmUnpkCkwBndCfm)
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst);
CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, ECKW029, pst);
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst);
CMCHKUNPKLOG(oduPackUInt8, &status, mBuf, ECKW029, pst);
@@
-949,19
+806,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRlcTmInfo
+S16 cmUnpkRlcTmInfo
(
RlcTmInfo *param,
Buffer *mBuf
)
(
RlcTmInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRlcTmInfo(param, mBuf)
-RlcTmInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmUnpkRlcTmInfo)
CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf);
CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf);
@@
-982,19
+832,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRlcUmInfo
+S16 cmUnpkRlcUmInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRlcUmInfo(param, mBuf)
-RlcEntCfgInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmUnpkRlcUmInfo)
switch(param->dir)
{
switch(param->dir)
{
@@
-1006,14
+849,14
@@
Buffer *mBuf;
case CKW_CFG_DIR_UL:
{
CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
case CKW_CFG_DIR_UL:
{
CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
- CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.re
Ord
Tmr), mBuf);
+ CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.re
Asmbl
Tmr), mBuf);
break;
}
/* Patch ckw_c_001.main_3 */
case CKW_CFG_DIR_BOTH:
{
CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
break;
}
/* Patch ckw_c_001.main_3 */
case CKW_CFG_DIR_BOTH:
{
CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.snLen), mBuf);
- CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.re
Ord
Tmr), mBuf);
+ CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.ul.re
Asmbl
Tmr), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
break;
}
CMCHKUNPK(oduPackUInt8, &(param->m.umInfo.dl.snLen), mBuf);
break;
}
@@
-1036,19
+879,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRlcAmInfo
+S16 cmUnpkRlcAmInfo
(
RlcAmInfo *param,
Buffer *mBuf
)
(
RlcAmInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRlcAmInfo(param, mBuf)
-RlcAmInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmUnpkRlcAmInfo)
/* DOWN LINK */
CMCHKUNPK(oduPackUInt8, &(param->dl.snLen), mBuf);
/* DOWN LINK */
CMCHKUNPK(oduPackUInt8, &(param->dl.snLen), mBuf);
@@
-1060,7
+896,7
@@
Buffer *mBuf;
/* UP LINK */
CMCHKUNPK(oduPackUInt8, &(param->ul.snLen), mBuf);
CMCHKUNPK(oduPackUInt16, &(param->ul.staProhTmr), mBuf);
/* UP LINK */
CMCHKUNPK(oduPackUInt8, &(param->ul.snLen), mBuf);
CMCHKUNPK(oduPackUInt16, &(param->ul.staProhTmr), mBuf);
- CMCHKUNPK(oduPackUInt8, &(param->ul.re
Ord
Tmr), mBuf);
+ CMCHKUNPK(oduPackUInt8, &(param->ul.re
Asmbl
Tmr), mBuf);
return ROK;
} /* cmUnpkRlcAmInfo */
return ROK;
} /* cmUnpkRlcAmInfo */
@@
-1079,19
+915,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCkwLChInfo
+S16 cmUnpkCkwLChInfo
(
CkwLChInfo *param,
Buffer *mBuf
)
(
CkwLChInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkCkwLChInfo(param, mBuf)
-CkwLChInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmUnpkCkwLChInfo)
CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->type), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->type), mBuf);
@@
-1113,19
+942,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRlcEntCfgCfmInfo
+S16 cmUnpkRlcEntCfgCfmInfo
(
RlcEntCfgCfmInfo *param,
Buffer *mBuf
)
(
RlcEntCfgCfmInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRlcEntCfgCfmInfo(param, mBuf)
-RlcEntCfgCfmInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmUnpkRlcEntCfgCfmInfo)
CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->rbType), mBuf);
@@
-1148,23
+970,14
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRlcCfgCfmInfo
+S16 cmUnpkRlcCfgCfmInfo
(
RlcCfgCfmInfo *param,
Pst *pst,
Buffer *mBuf
)
(
RlcCfgCfmInfo *param,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRlcCfgCfmInfo(param, pst, mBuf)
-RlcCfgCfmInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
{
- U8 idx;
-
- TRC3(cmUnpkRlcCfgCfmInfo)
+ uint8_t idx;
CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW030, pst);
CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW030, pst);
CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
@@
-1193,19
+1006,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRlcEntCfgInfo
+S16 cmUnpkRlcEntCfgInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRlcEntCfgInfo(param, mBuf)
-RlcEntCfgInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC3(cmUnpkRlcEntCfgInfo)
CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf);
CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
@@
-1273,23
+1079,14
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRlcCfgInfo
+S16 cmUnpkRlcCfgInfo
(
RlcCfgInfo *param,
Pst *pst,
Buffer *mBuf
)
(
RlcCfgInfo *param,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRlcCfgInfo(param, pst, mBuf)
-RlcCfgInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
{
- U8 idx;
-
- TRC3(cmUnpkRlcCfgInfo)
+ uint8_t idx;
CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW031, pst);
CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW031, pst);
CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
@@
-1309,7
+1106,7
@@
Buffer *mBuf;
*
* Fun: cmUnpkRlcCfgCfm
*
*
* Fun: cmUnpkRlcCfgCfm
*
-* Desc: unpack the primitive
Kw
UiRlcCfgCfm
+* Desc: unpack the primitive
Rlc
UiRlcCfgCfm
*
* Ret: ROK -ok
*
*
* Ret: ROK -ok
*
@@
-1318,25
+1115,17
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkRlcCfgCfm
+S16 cmUnpkRlcCfgCfm
(
RlcCfgCfm func,
Pst *pst,
Buffer *mBuf
)
(
RlcCfgCfm func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkRlcCfgCfm(func, pst, mBuf)
-RlcCfgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
S16 ret1;
{
S16 ret1;
- SuId
suId = 0;
- RlcCfgCfmInfo
*cfgCfmInfo = NULLP;
+ SuId suId = 0;
+ RlcCfgCfmInfo *cfgCfmInfo = NULLP;
- TRC3(cmUnpkRlcCfgCfm)
if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&cfgCfmInfo,\
sizeof(RlcCfgCfmInfo))) != ROK)
if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&cfgCfmInfo,\
sizeof(RlcCfgCfmInfo))) != ROK)
@@
-1352,7
+1141,7
@@
Buffer *mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemset((U8 *)
cfgCfmInfo, 0, sizeof(RlcCfgCfmInfo));
+
memset(
cfgCfmInfo, 0, sizeof(RlcCfgCfmInfo));
CMCHKUNPK(SUnpkS16, &suId, mBuf);
CMCHKUNPK(SUnpkS16, &suId, mBuf);
@@
-1394,19
+1183,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCkwUeInfo
+S16 cmUnpkCkwUeInfo
(
CkwUeInfo *param,
Buffer *mBuf
)
(
CkwUeInfo *param,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkCkwUeInfo(param, mBuf)
-CkwUeInfo *param;
-Buffer *mBuf;
-#endif
{
{
- TRC2(cmUnpkCkwUeInfo)
CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf);
CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf);
@@
-1418,7
+1200,7
@@
Buffer *mBuf;
*
* Fun: cmUnpkCkwUeIdChgReq
*
*
* Fun: cmUnpkCkwUeIdChgReq
*
-* Desc: unpack the primitive
Kw
UiCkwUeIdChgReq
+* Desc: unpack the primitive
Rlc
UiCkwUeIdChgReq
*
* Ret: ROK -ok
*
*
* Ret: ROK -ok
*
@@
-1427,27
+1209,19
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCkwUeIdChgReq
+S16 cmUnpkCkwUeIdChgReq
(
CkwUeIdChgReq func,
Pst *pst,
Buffer *mBuf
)
(
CkwUeIdChgReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkCkwUeIdChgReq(func, pst, mBuf)
-CkwUeIdChgReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
S16 ret1;
SpId spId = 0;
{
S16 ret1;
SpId spId = 0;
-
U32
transId = 0;
+
uint32_t
transId = 0;
CkwUeInfo *ueInfo = NULLP;
CkwUeInfo *newUeInfo = NULLP;
CkwUeInfo *ueInfo = NULLP;
CkwUeInfo *newUeInfo = NULLP;
- TRC3(cmUnpkCkwUeIdChgReq)
CMCHKUNPK(SUnpkS16, &(spId), mBuf);
CMCHKUNPK(SUnpkS16, &(spId), mBuf);
@@
-1466,7
+1240,7
@@
Buffer *mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemset((U8 *)
ueInfo, 0, sizeof(CkwUeInfo));
+
memset(
ueInfo, 0, sizeof(CkwUeInfo));
ret1 = cmUnpkCkwUeInfo((ueInfo), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
ret1 = cmUnpkCkwUeInfo((ueInfo), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
@@
-1493,7
+1267,7
@@
Buffer *mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemset((U8 *)
newUeInfo, 0, sizeof(CkwUeInfo));
+
memset(
newUeInfo, 0, sizeof(CkwUeInfo));
ret1 = cmUnpkCkwUeInfo((newUeInfo), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
ret1 = cmUnpkCkwUeInfo((newUeInfo), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
@@
-1517,7
+1291,7
@@
Buffer *mBuf;
*
* Fun: cmUnpkCkwUeIdChgCfm
*
*
* Fun: cmUnpkCkwUeIdChgCfm
*
-* Desc: unpack the primitive
Kw
UiCkwUeIdChgCfm
+* Desc: unpack the primitive
Rlc
UiCkwUeIdChgCfm
*
* Ret: ROK -ok
*
*
* Ret: ROK -ok
*
@@
-1526,29
+1300,21
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
-PUBLIC S16 cmUnpkCkwUeIdChgCfm
+S16 cmUnpkCkwUeIdChgCfm
(
CkwUeIdChgCfm func,
Pst *pst,
Buffer *mBuf
)
(
CkwUeIdChgCfm func,
Pst *pst,
Buffer *mBuf
)
-#else
-PUBLIC S16 cmUnpkCkwUeIdChgCfm(func, pst, mBuf)
-CkwUeIdChgCfm func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
S16 ret1;
SuId suId = 0;
{
S16 ret1;
SuId suId = 0;
-
U32
transId = 0;
+
uint32_t
transId = 0;
CkwUeInfo *ueInfo = NULLP;
CmStatus status;
CkwUeInfo *ueInfo = NULLP;
CmStatus status;
- TRC3(cmUnpkCkwUeIdChgCfm)
-
cmMemset((U8 *)&status, (U8)0, (PTR)
sizeof(CmStatus));
+
memset(&status, 0,
sizeof(CmStatus));
CMCHKUNPK(SUnpkS16, &suId, mBuf);
CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst);
CMCHKUNPK(SUnpkS16, &suId, mBuf);
CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst);
@@
-1567,7
+1333,7
@@
Buffer *mBuf;
return (ret1);
}
return (ret1);
}
-
cmMemset((U8 *)
ueInfo, 0, sizeof(CkwUeInfo));
+
memset(
ueInfo, 0, sizeof(CkwUeInfo));
ret1 = cmUnpkCkwUeInfo((ueInfo), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)
ret1 = cmUnpkCkwUeInfo((ueInfo), mBuf);
#if(ERRCLASS & ERRCLS_DEBUG)