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
[Epic-ID: ODUHIGH-464][Task-ID: ODUHIGH-478] WG8 Alignment | The First
[o-du/l2.git]
/
src
/
cm
/
ckw.c
diff --git
a/src/cm/ckw.c
b/src/cm/ckw.c
index
4bbcf4f
..
d4afe91
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,19
+54,12
@@
EXTERN "C" {
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkCkwBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
S16 cmPkCkwBndReq
(
Pst *pst,
SuId suId,
SpId spId
)
-#else
-S16 cmPkCkwBndReq(pst, suId, spId)
-Pst *pst;
-SuId suId;
-SpId spId;
-#endif
{
S16 ret1;
Buffer *mBuf;
{
S16 ret1;
Buffer *mBuf;
@@
-104,19
+97,12
@@
SpId spId;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkCkwUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
S16 cmPkCkwUbndReq
(
Pst *pst,
SpId spId,
Reason reason
)
-#else
-S16 cmPkCkwUbndReq(pst, spId, reason)
-Pst *pst;
-SpId spId;
-Reason reason;
-#endif
{
S16 ret1;
Buffer *mBuf;
{
S16 ret1;
Buffer *mBuf;
@@
-154,19
+140,12
@@
Reason reason;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkCkwBndCfm
(
Pst *pst,
SuId suId,
S16 cmPkCkwBndCfm
(
Pst *pst,
SuId suId,
-
U8
status
+
uint8_t
status
)
)
-#else
-S16 cmPkCkwBndCfm(pst, suId, status)
-Pst *pst;
-SuId suId;
-U8 status;
-#endif
{
S16 ret1;
Buffer *mBuf;
{
S16 ret1;
Buffer *mBuf;
@@
-206,17
+185,11
@@
U8 status;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkRlcTmInfo
(
RlcTmInfo *param,
Buffer *mBuf
)
S16 cmPkRlcTmInfo
(
RlcTmInfo *param,
Buffer *mBuf
)
-#else
-S16 cmPkRlcTmInfo(param, mBuf)
-RlcTmInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf);
{
CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf);
@@
-238,17
+211,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkRlcUmInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
S16 cmPkRlcUmInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
-#else
-S16 cmPkRlcUmInfo(param, mBuf)
-RlcEntCfgInfo *param;
-Buffer *mBuf;
-#endif
{
switch(param->dir)
{
switch(param->dir)
@@
-260,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;
}
@@
-268,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;
}
@@
-291,21
+258,15
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkRlcAmInfo
(
RlcAmInfo *param,
Buffer *mBuf
)
S16 cmPkRlcAmInfo
(
RlcAmInfo *param,
Buffer *mBuf
)
-#else
-S16 cmPkRlcAmInfo(param, mBuf)
-RlcAmInfo *param;
-Buffer *mBuf;
-#endif
{
/* 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);
@@
-333,17
+294,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkCkwLChInfo
(
CkwLChInfo *param,
Buffer *mBuf
)
S16 cmPkCkwLChInfo
(
CkwLChInfo *param,
Buffer *mBuf
)
-#else
-S16 cmPkCkwLChInfo(param, mBuf)
-CkwLChInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKPK(oduUnpackUInt8, param->type, mBuf);
{
CMCHKPK(oduUnpackUInt8, param->type, mBuf);
@@
-366,17
+321,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkRlcEntCfgInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
S16 cmPkRlcEntCfgInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
-#else
-S16 cmPkRlcEntCfgInfo(param, mBuf)
-RlcEntCfgInfo *param;
-Buffer *mBuf;
-#endif
{
switch(param->entMode)
{
switch(param->entMode)
@@
-444,23
+393,15
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkRlcCfgInfo
(
RlcCfgInfo *param,
Pst *pst,
Buffer *mBuf
)
S16 cmPkRlcCfgInfo
(
RlcCfgInfo *param,
Pst *pst,
Buffer *mBuf
)
-#else
-S16 cmPkRlcCfgInfo(param, pst, mBuf)
-RlcCfgInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
S16 idx;
{
S16 idx;
-
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);
@@
-488,17
+429,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkRlcEntCfgCfmInfo
(
RlcEntCfgCfmInfo *param,
Buffer *mBuf
)
S16 cmPkRlcEntCfgCfmInfo
(
RlcEntCfgCfmInfo *param,
Buffer *mBuf
)
-#else
-S16 cmPkRlcEntCfgCfmInfo(param, mBuf)
-RlcEntCfgCfmInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKPK(cmPkCmStatus, &(param->status), mBuf);
{
CMCHKPK(cmPkCmStatus, &(param->status), mBuf);
@@
-522,26
+457,18
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkRlcCfgCfmInfo
(
RlcCfgCfmInfo *param,
Pst *pst,
Buffer *mBuf
)
S16 cmPkRlcCfgCfmInfo
(
RlcCfgCfmInfo *param,
Pst *pst,
Buffer *mBuf
)
-#else
-S16 cmPkRlcCfgCfmInfo(param, pst, mBuf)
-RlcCfgCfmInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
S16 idx;
{
S16 idx;
-
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);
@@
-566,19
+493,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkRlcCfgCfm
(
Pst *pst,
SuId suId,
RlcCfgCfmInfo *cfgCfmInfo
)
S16 cmPkRlcCfgCfm
(
Pst *pst,
SuId suId,
RlcCfgCfmInfo *cfgCfmInfo
)
-#else
-S16 cmPkRlcCfgCfm(pst, suId, cfgCfmInfo)
-Pst *pst;
-SuId suId;
-RlcCfgCfmInfo *cfgCfmInfo;
-#endif
{
S16 ret1;
Buffer *mBuf;
{
S16 ret1;
Buffer *mBuf;
@@
-613,7
+533,7
@@
RlcCfgCfmInfo *cfgCfmInfo;
return ( ret1 );
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
return ( ret1 );
}
#endif /* ERRCLASS & ERRCLS_ADD_RES */
- if (SPutSBuf
(
pst->region, pst->pool, (Data *)cfgCfmInfo,
+ if (SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
pst->region, pst->pool, (Data *)cfgCfmInfo,
sizeof(RlcCfgCfmInfo)) != ROK)
{
SPutMsg(mBuf);
sizeof(RlcCfgCfmInfo)) != ROK)
{
SPutMsg(mBuf);
@@
-644,17
+564,11
@@
RlcCfgCfmInfo *cfgCfmInfo;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmPkCkwUeInfo
(
CkwUeInfo *param,
Buffer *mBuf
)
S16 cmPkCkwUeInfo
(
CkwUeInfo *param,
Buffer *mBuf
)
-#else
-S16 cmPkCkwUeInfo(param, mBuf)
-CkwUeInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
{
CMCHKPK(cmPkLteCellId, param->cellId, mBuf);
@@
-676,23
+590,14
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
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
-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;
@@
-713,14
+618,14
@@
CkwUeInfo *newUeInfo;
}
CMCHKPK(cmPkCkwUeInfo, newUeInfo, mBuf);
}
CMCHKPK(cmPkCkwUeInfo, newUeInfo, mBuf);
- if (SPutSBuf
(
pst->region, pst->pool, (Data *)newUeInfo,
+ if (SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
pst->region, pst->pool, (Data *)newUeInfo,
sizeof(CkwUeInfo)) != ROK)
{
SPutMsg(mBuf);
return RFAILED;
}
CMCHKPK(cmPkCkwUeInfo, ueInfo, mBuf);
sizeof(CkwUeInfo)) != ROK)
{
SPutMsg(mBuf);
return RFAILED;
}
CMCHKPK(cmPkCkwUeInfo, ueInfo, mBuf);
- if (SPutSBuf
(
pst->region, pst->pool, (Data *)ueInfo,
+ if (SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
pst->region, pst->pool, (Data *)ueInfo,
sizeof(CkwUeInfo)) != ROK)
{
SPutMsg(mBuf);
sizeof(CkwUeInfo)) != ROK)
{
SPutMsg(mBuf);
@@
-747,23
+652,14
@@
CkwUeInfo *newUeInfo;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
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
-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;
@@
-785,7
+681,7
@@
CmStatus status;
CMCHKPK(cmPkCmStatus, &status, mBuf);
CMCHKPK(cmPkCkwUeInfo, ueInfo, mBuf);
CMCHKPK(cmPkCmStatus, &status, mBuf);
CMCHKPK(cmPkCkwUeInfo, ueInfo, mBuf);
- if (SPutSBuf
(
pst->region, pst->pool, (Data *)ueInfo,
+ if (SPutSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
pst->region, pst->pool, (Data *)ueInfo,
sizeof(CkwUeInfo)) != ROK)
{
SPutMsg(mBuf);
sizeof(CkwUeInfo)) != ROK)
{
SPutMsg(mBuf);
@@
-817,19
+713,12
@@
CmStatus status;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkCkwBndReq
(
CkwBndReq func,
Pst *pst,
Buffer *mBuf
)
S16 cmUnpkCkwBndReq
(
CkwBndReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-S16 cmUnpkCkwBndReq(func, pst, mBuf)
-CkwBndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SuId suId = 0;
SpId spId = 0;
{
SuId suId = 0;
SpId spId = 0;
@@
-855,19
+744,12
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkCkwUbndReq
(
CkwUbndReq func,
Pst *pst,
Buffer *mBuf
)
S16 cmUnpkCkwUbndReq
(
CkwUbndReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-S16 cmUnpkCkwUbndReq(func, pst, mBuf)
-CkwUbndReq func;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
SpId spId = 0;
Reason reason = 0;
{
SpId spId = 0;
Reason reason = 0;
@@
-892,22
+774,15
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkCkwBndCfm
(
CkwBndCfm func,
Pst *pst,
Buffer *mBuf
)
S16 cmUnpkCkwBndCfm
(
CkwBndCfm func,
Pst *pst,
Buffer *mBuf
)
-#else
-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;
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst);
CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst);
@@
-931,17
+806,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkRlcTmInfo
(
RlcTmInfo *param,
Buffer *mBuf
)
S16 cmUnpkRlcTmInfo
(
RlcTmInfo *param,
Buffer *mBuf
)
-#else
-S16 cmUnpkRlcTmInfo(param, mBuf)
-RlcTmInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf);
{
CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf);
@@
-963,17
+832,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkRlcUmInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
S16 cmUnpkRlcUmInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
-#else
-S16 cmUnpkRlcUmInfo(param, mBuf)
-RlcEntCfgInfo *param;
-Buffer *mBuf;
-#endif
{
switch(param->dir)
{
switch(param->dir)
@@
-986,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;
}
@@
-1016,17
+879,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkRlcAmInfo
(
RlcAmInfo *param,
Buffer *mBuf
)
S16 cmUnpkRlcAmInfo
(
RlcAmInfo *param,
Buffer *mBuf
)
-#else
-S16 cmUnpkRlcAmInfo(param, mBuf)
-RlcAmInfo *param;
-Buffer *mBuf;
-#endif
{
/* DOWN LINK */
{
/* DOWN LINK */
@@
-1039,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 */
@@
-1058,17
+915,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkCkwLChInfo
(
CkwLChInfo *param,
Buffer *mBuf
)
S16 cmUnpkCkwLChInfo
(
CkwLChInfo *param,
Buffer *mBuf
)
-#else
-S16 cmUnpkCkwLChInfo(param, mBuf)
-CkwLChInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf);
{
CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf);
@@
-1091,17
+942,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkRlcEntCfgCfmInfo
(
RlcEntCfgCfmInfo *param,
Buffer *mBuf
)
S16 cmUnpkRlcEntCfgCfmInfo
(
RlcEntCfgCfmInfo *param,
Buffer *mBuf
)
-#else
-S16 cmUnpkRlcEntCfgCfmInfo(param, mBuf)
-RlcEntCfgCfmInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
{
CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf);
@@
-1125,22
+970,14
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkRlcCfgCfmInfo
(
RlcCfgCfmInfo *param,
Pst *pst,
Buffer *mBuf
)
S16 cmUnpkRlcCfgCfmInfo
(
RlcCfgCfmInfo *param,
Pst *pst,
Buffer *mBuf
)
-#else
-S16 cmUnpkRlcCfgCfmInfo(param, pst, mBuf)
-RlcCfgCfmInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
{
- U8 idx;
-
+ 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);
@@
-1169,17
+1006,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkRlcEntCfgInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
S16 cmUnpkRlcEntCfgInfo
(
RlcEntCfgInfo *param,
Buffer *mBuf
)
-#else
-S16 cmUnpkRlcEntCfgInfo(param, mBuf)
-RlcEntCfgInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf);
{
CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf);
@@
-1248,22
+1079,14
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkRlcCfgInfo
(
RlcCfgInfo *param,
Pst *pst,
Buffer *mBuf
)
S16 cmUnpkRlcCfgInfo
(
RlcCfgInfo *param,
Pst *pst,
Buffer *mBuf
)
-#else
-S16 cmUnpkRlcCfgInfo(param, pst, mBuf)
-RlcCfgInfo *param;
-Pst *pst;
-Buffer *mBuf;
-#endif
{
{
- U8 idx;
-
+ 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);
@@
-1292,26
+1115,19
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkRlcCfgCfm
(
RlcCfgCfm func,
Pst *pst,
Buffer *mBuf
)
S16 cmUnpkRlcCfgCfm
(
RlcCfgCfm func,
Pst *pst,
Buffer *mBuf
)
-#else
-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;
- if((ret1 = SGetSBuf
(
pst->region, pst->pool, (Data **)&cfgCfmInfo,\
+ if((ret1 = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
pst->region, pst->pool, (Data **)&cfgCfmInfo,\
sizeof(RlcCfgCfmInfo))) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
sizeof(RlcCfgCfmInfo))) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
@@
-1367,17
+1183,11
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkCkwUeInfo
(
CkwUeInfo *param,
Buffer *mBuf
)
S16 cmUnpkCkwUeInfo
(
CkwUeInfo *param,
Buffer *mBuf
)
-#else
-S16 cmUnpkCkwUeInfo(param, mBuf)
-CkwUeInfo *param;
-Buffer *mBuf;
-#endif
{
CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
{
CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf);
@@
-1399,23
+1209,16
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkCkwUeIdChgReq
(
CkwUeIdChgReq func,
Pst *pst,
Buffer *mBuf
)
S16 cmUnpkCkwUeIdChgReq
(
CkwUeIdChgReq func,
Pst *pst,
Buffer *mBuf
)
-#else
-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;
@@
-1424,7
+1227,7
@@
Buffer *mBuf;
CMCHKUNPK(SUnpkS16, &(spId), mBuf);
CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW037, pst);
CMCHKUNPK(SUnpkS16, &(spId), mBuf);
CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW037, pst);
- if((ret1 = SGetSBuf
(
pst->region, pst->pool, (Data **)&ueInfo,\
+ if((ret1 = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
pst->region, pst->pool, (Data **)&ueInfo,\
sizeof(CkwUeInfo))) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
sizeof(CkwUeInfo))) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
@@
-1451,7
+1254,7
@@
Buffer *mBuf;
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
}
#endif /* ERRCLASS & ERRCLS_DEBUG */
- if((ret1 = SGetSBuf
(
pst->region, pst->pool, (Data **)&newUeInfo,\
+ if((ret1 = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
pst->region, pst->pool, (Data **)&newUeInfo,\
sizeof(CkwUeInfo))) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
sizeof(CkwUeInfo))) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
@@
-1497,23
+1300,16
@@
Buffer *mBuf;
* File: ckw.c
*
*/
* File: ckw.c
*
*/
-#ifdef ANSI
S16 cmUnpkCkwUeIdChgCfm
(
CkwUeIdChgCfm func,
Pst *pst,
Buffer *mBuf
)
S16 cmUnpkCkwUeIdChgCfm
(
CkwUeIdChgCfm func,
Pst *pst,
Buffer *mBuf
)
-#else
-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;
@@
-1523,7
+1319,7
@@
Buffer *mBuf;
CMCHKUNPK(SUnpkS16, &suId, mBuf);
CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst);
CMCHKUNPK(SUnpkS16, &suId, mBuf);
CMCHKUNPKLOG(oduPackUInt32, &transId, mBuf, ECKW042, pst);
- if((ret1 = SGetSBuf
(
pst->region, pst->pool, (Data **)&ueInfo,\
+ if((ret1 = SGetSBuf
NewForDebug(__FILE__,__FUNCTION__,__LINE__,
pst->region, pst->pool, (Data **)&ueInfo,\
sizeof(CkwUeInfo))) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)
sizeof(CkwUeInfo))) != ROK)
{
#if (ERRCLASS & ERRCLS_ADD_RES)