From 073b67b21b11eefdaa84a30029f374435c3e0fd0 Mon Sep 17 00:00:00 2001 From: sphoorthi Date: Tue, 17 Nov 2020 14:03:29 +0530 Subject: [PATCH] removed ANSI part -2 JIRA ID - ODUHIGH-249 Change-Id: I422a61d6974c703b0462f1b7ee3b80eacdb37186 Signed-off-by: sphoorthi --- src/cm/ckw.c | 238 +------ src/cm/cm_bdy5.c | 50 +- src/cm/cm_gen.c | 468 -------------- src/cm/cm_hash.c | 268 ++------ src/cm/cm_inet.c | 601 ++---------------- src/cm/cm_lib.c | 72 +-- src/cm/cm_llist.c | 47 +- src/cm/cm_lte.c | 126 +--- src/cm/cm_math.c | 52 +- src/cm/cm_mblk.c | 55 -- src/cm/cm_mem.c | 861 ++++--------------------- src/cm/cm_mem_wl.c | 634 ++----------------- src/cm/cm_tenb_stats.c | 140 +--- src/cm/cm_tkns.c | 124 ---- src/cm/cm_tpt.c | 428 +++---------- src/cm/crg.c | 302 --------- src/cm/ctf.c | 1007 +---------------------------- src/cm/kwu.c | 487 ++------------ src/cm/lkw.c | 403 +----------- src/cm/lrg.c | 786 +++-------------------- src/cm/rgm.c | 232 +------ src/cm/rgr.c | 1651 +----------------------------------------------- src/cm/rgu.c | 305 +-------- 23 files changed, 605 insertions(+), 8732 deletions(-) diff --git a/src/cm/ckw.c b/src/cm/ckw.c index 9a8ff4138..83a637247 100755 --- a/src/cm/ckw.c +++ b/src/cm/ckw.c @@ -54,19 +54,12 @@ extern "C" { * File: ckw.c * */ -#ifdef ANSI 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; @@ -104,19 +97,12 @@ SpId spId; * File: ckw.c * */ -#ifdef ANSI 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; @@ -154,19 +140,12 @@ Reason reason; * File: ckw.c * */ -#ifdef ANSI S16 cmPkCkwBndCfm ( Pst *pst, SuId suId, uint8_t status ) -#else -S16 cmPkCkwBndCfm(pst, suId, status) -Pst *pst; -SuId suId; -uint8_t status; -#endif { S16 ret1; Buffer *mBuf; @@ -206,17 +185,11 @@ uint8_t status; * File: ckw.c * */ -#ifdef ANSI S16 cmPkRlcTmInfo ( RlcTmInfo *param, Buffer *mBuf ) -#else -S16 cmPkRlcTmInfo(param, mBuf) -RlcTmInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt32, param->dl.buffSize, mBuf); @@ -238,17 +211,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmPkRlcUmInfo ( RlcEntCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkRlcUmInfo(param, mBuf) -RlcEntCfgInfo *param; -Buffer *mBuf; -#endif { switch(param->dir) @@ -291,17 +258,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmPkRlcAmInfo ( RlcAmInfo *param, Buffer *mBuf ) -#else -S16 cmPkRlcAmInfo(param, mBuf) -RlcAmInfo *param; -Buffer *mBuf; -#endif { /* UP LINK */ @@ -333,17 +294,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmPkCkwLChInfo ( CkwLChInfo *param, Buffer *mBuf ) -#else -S16 cmPkCkwLChInfo(param, mBuf) -CkwLChInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->type, mBuf); @@ -366,17 +321,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmPkRlcEntCfgInfo ( RlcEntCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkRlcEntCfgInfo(param, mBuf) -RlcEntCfgInfo *param; -Buffer *mBuf; -#endif { switch(param->entMode) @@ -444,23 +393,15 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmPkRlcCfgInfo ( RlcCfgInfo *param, Pst *pst, Buffer *mBuf ) -#else -S16 cmPkRlcCfgInfo(param, pst, mBuf) -RlcCfgInfo *param; -Pst *pst; -Buffer *mBuf; -#endif { S16 idx; - for (idx = param->numEnt-1; idx >= 0; idx--) { CMCHKPK(cmPkRlcEntCfgInfo, &(param->entCfg[idx]), mBuf); @@ -488,17 +429,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmPkRlcEntCfgCfmInfo ( RlcEntCfgCfmInfo *param, Buffer *mBuf ) -#else -S16 cmPkRlcEntCfgCfmInfo(param, mBuf) -RlcEntCfgCfmInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkCmStatus, &(param->status), mBuf); @@ -522,23 +457,15 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmPkRlcCfgCfmInfo ( RlcCfgCfmInfo *param, Pst *pst, Buffer *mBuf ) -#else -S16 cmPkRlcCfgCfmInfo(param, pst, mBuf) -RlcCfgCfmInfo *param; -Pst *pst; -Buffer *mBuf; -#endif { S16 idx; - for (idx = param->numEnt-1; idx >= 0; idx--) { CMCHKPK(cmPkRlcEntCfgCfmInfo, &(param->entCfgCfm[(uint8_t)idx]), mBuf); @@ -566,19 +493,12 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI 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; @@ -644,17 +564,11 @@ RlcCfgCfmInfo *cfgCfmInfo; * File: ckw.c * */ -#ifdef ANSI S16 cmPkCkwUeInfo ( CkwUeInfo *param, Buffer *mBuf ) -#else -S16 cmPkCkwUeInfo(param, mBuf) -CkwUeInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -676,23 +590,14 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmPkCkwUeIdChgReq ( -Pst *pst, -SpId spId, -uint32_t 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; -uint32_t transId; -CkwUeInfo *ueInfo; -CkwUeInfo *newUeInfo; -#endif { S16 ret1; Buffer *mBuf = NULLP; @@ -747,23 +652,14 @@ CkwUeInfo *newUeInfo; * File: ckw.c * */ -#ifdef ANSI S16 cmPkCkwUeIdChgCfm ( -Pst *pst, -SuId suId, -uint32_t 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; -uint32_t transId; -CkwUeInfo *ueInfo; -CmStatus status; -#endif { S16 ret1; Buffer *mBuf = NULLP; @@ -817,19 +713,12 @@ CmStatus status; * File: ckw.c * */ -#ifdef ANSI 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; @@ -855,19 +744,12 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI 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; @@ -892,22 +774,15 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkCkwBndCfm ( CkwBndCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCkwBndCfm(func, pst, mBuf) -CkwBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { - SuId suId = 0; - uint8_t status = 0; + SuId suId = 0; + uint8_t status = 0; CMCHKUNPKLOG(SUnpkS16, &suId, mBuf, ECKW028, pst); @@ -931,17 +806,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkRlcTmInfo ( RlcTmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRlcTmInfo(param, mBuf) -RlcTmInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt32, &(param->dl.buffSize), mBuf); @@ -963,17 +832,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkRlcUmInfo ( RlcEntCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRlcUmInfo(param, mBuf) -RlcEntCfgInfo *param; -Buffer *mBuf; -#endif { switch(param->dir) @@ -1016,17 +879,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkRlcAmInfo ( RlcAmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRlcAmInfo(param, mBuf) -RlcAmInfo *param; -Buffer *mBuf; -#endif { /* DOWN LINK */ @@ -1058,17 +915,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkCkwLChInfo ( CkwLChInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCkwLChInfo(param, mBuf) -CkwLChInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, &(param->lChId), mBuf); @@ -1091,17 +942,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkRlcEntCfgCfmInfo ( RlcEntCfgCfmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRlcEntCfgCfmInfo(param, mBuf) -RlcEntCfgCfmInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, &(param->rbId), mBuf); @@ -1125,23 +970,15 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkRlcCfgCfmInfo ( RlcCfgCfmInfo *param, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRlcCfgCfmInfo(param, pst, mBuf) -RlcCfgCfmInfo *param; -Pst *pst; -Buffer *mBuf; -#endif { uint8_t idx; - CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW030, pst); CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); CMCHKUNPK(cmUnpkLteCellId, &(param->cellId), mBuf); @@ -1169,17 +1006,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkRlcEntCfgInfo ( RlcEntCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRlcEntCfgInfo(param, mBuf) -RlcEntCfgInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, &(param->cfgType), mBuf); @@ -1248,22 +1079,14 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkRlcCfgInfo ( RlcCfgInfo *param, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRlcCfgInfo(param, pst, mBuf) -RlcCfgInfo *param; -Pst *pst; -Buffer *mBuf; -#endif { - uint8_t idx; - + uint8_t idx; CMCHKUNPKLOG(oduPackUInt32, &(param->transId), mBuf, ECKW031, pst); CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); @@ -1292,23 +1115,16 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkRlcCfgCfm ( RlcCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRlcCfgCfm(func, pst, mBuf) -RlcCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { S16 ret1; - SuId suId = 0; - RlcCfgCfmInfo *cfgCfmInfo = NULLP; + SuId suId = 0; + RlcCfgCfmInfo *cfgCfmInfo = NULLP; if((ret1 = SGetSBuf(pst->region, pst->pool, (Data **)&cfgCfmInfo,\ @@ -1367,17 +1183,11 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI S16 cmUnpkCkwUeInfo ( CkwUeInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCkwUeInfo(param, mBuf) -CkwUeInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkLteRnti, &(param->ueId), mBuf); @@ -1399,23 +1209,16 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI 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; - uint32_t transId = 0; + uint32_t transId = 0; CkwUeInfo *ueInfo = NULLP; CkwUeInfo *newUeInfo = NULLP; @@ -1497,23 +1300,16 @@ Buffer *mBuf; * File: ckw.c * */ -#ifdef ANSI 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; - uint32_t transId = 0; + uint32_t transId = 0; CkwUeInfo *ueInfo = NULLP; CmStatus status; diff --git a/src/cm/cm_bdy5.c b/src/cm/cm_bdy5.c index 59ade357b..f9e153a19 100644 --- a/src/cm/cm_bdy5.c +++ b/src/cm/cm_bdy5.c @@ -95,19 +95,12 @@ */ #ifdef SS_FAP -#ifdef ANSI Void cmPrcTmr ( CmTqCp *tqCp, /* timing que control point */ CmTqType *tq, /* timing queue */ PFV func /* function */ ) -#else -Void cmPrcTmr(tqCp, tq, func) -CmTqCp *tqCp; /* connection control block */ -CmTqType *tq; /* message buffer */ -PFV func; /* function */ -#endif { /**/ uint32_t expire; @@ -164,19 +157,12 @@ PFV func; /* function */ #else /* not defined SS_FAP */ -#ifdef ANSI Void cmPrcTmr ( CmTqCp *tqCp, /* timing que control point */ CmTqType *tq, /* timing queue */ PFV func /* function */ ) -#else -Void cmPrcTmr(tqCp, tq, func) -CmTqCp *tqCp; /* connection control block */ -CmTqType *tq; /* message buffer */ -PFV func; /* function */ -#endif { /**/ uint32_t expire; @@ -266,17 +252,11 @@ PFV func; /* function */ * File: cm_bdy5.c * */ -#ifdef ANSI Void cmInitTimers ( CmTimer *timers, /* timer list */ uint8_t max /* maximum tmrs */ ) -#else -Void cmInitTimers(timers, max) -CmTimer *timers; /* timer list */ -uint8_t max; /* maximum tmrs */ -#endif { CmTimer *tPtr; REG1 uint8_t i; @@ -308,15 +288,7 @@ uint8_t max; /* maximum tmrs */ * */ -#ifdef ANSI -Void cmPlcCbTq -( -CmTmrArg *arg -) -#else -Void cmPlcCbTq(arg) -CmTmrArg *arg; -#endif +Void cmPlcCbTq(CmTmrArg *arg) { /*added FAP modifications*/ #ifdef SS_FAP @@ -396,15 +368,7 @@ CmTmrArg *arg; * */ -#ifdef ANSI -Void cmRstCbTq -( -CmTmrArg *arg -) -#else -Void cmRstCbTq(arg) -CmTmrArg *arg; -#endif +Void cmRstCbTq(CmTmrArg *arg) { arg->timers[arg->tNum].tqExpire = arg->tqCp->nxtEnt + arg->wait; @@ -427,15 +391,7 @@ CmTmrArg *arg; * */ -#ifdef ANSI -Void cmRmvCbTq -( -CmTmrArg *arg -) -#else -Void cmRmvCbTq(arg) -CmTmrArg *arg; -#endif +Void cmRmvCbTq(CmTmrArg *arg) { /*Added FAP modifications*/ #ifdef SS_FAP diff --git a/src/cm/cm_gen.c b/src/cm/cm_gen.c index fc9864d98..cb7c0697b 100644 --- a/src/cm/cm_gen.c +++ b/src/cm/cm_gen.c @@ -97,17 +97,11 @@ uint16_t gTransId = 0; * */ -#ifdef ANSI S16 cmPkDateTime ( DateTime *dateTime, /* date and time */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkDateTime(dateTime, mBuf) -DateTime *dateTime; /* date and time */ -Buffer *mBuf; /* message buffer */ -#endif { /*-- cm_gen_c_001.main_36 - added for micro seconds --*/ @@ -140,17 +134,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkDuration ( Duration *duration, /* duration */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkDuration(duration, mBuf) -Duration *duration; /* duration */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(oduUnpackUInt8, duration->tenths, mBuf); @@ -176,17 +164,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduPackPointer ( PTR ptr, /* pointer */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduPackPointer(ptr, mBuf) -PTR ptr; /* pointer */ -Buffer *mBuf; /* message buffer */ -#endif { Data pkArray[PTRSIZE]; /* array for packing */ S16 ret; /* return code */ @@ -289,17 +271,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkEntityId ( EntityId *entityId, /* entity id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkEntityId(entityId, mBuf) -EntityId *entityId; /* entity id */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkInst, entityId->inst, mBuf); @@ -323,17 +299,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkElmntId ( ElmntId *elmntId, /* element id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkElmntId(elmntId, mBuf) -ElmntId *elmntId; /* element id */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkElmntInst3, elmntId->elmntInst3, mBuf); @@ -359,17 +329,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkMemoryId ( MemoryId *memoryId, /* memoryId */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkMemoryId(memoryId, mBuf) -MemoryId *memoryId; /* memoryId */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkPool, memoryId->pool, mBuf); @@ -393,17 +357,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkSystemId ( SystemId *systemId, /* system id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkSystemId(systemId, mBuf) -SystemId *systemId; /* system id */ -Buffer *mBuf; /* message buffer */ -#endif { Txt *p; /* part number string */ @@ -441,17 +399,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkProtAddr ( ProtAddr *pAddr, /* protocol address */ Buffer *mBuf /* buffer */ ) -#else -S16 cmPkProtAddr(pAddr, mBuf) -ProtAddr *pAddr; /* protocol address */ -Buffer *mBuf; /* buffer */ -#endif { uint8_t j; /* Index */ @@ -489,17 +441,11 @@ Buffer *mBuf; /* buffer */ * */ -#ifdef ANSI S16 cmPkProtAddrTbl ( ProtAddrTbl *protAddr, /* protocol address table */ Buffer *mBuf /* buffer */ ) -#else -S16 cmPkProtAddrTbl(protAddr, mBuf) -ProtAddrTbl *protAddr; /* protocol address table */ -Buffer *mBuf; /* buffer */ -#endif { uint8_t i; /* index */ uint8_t j; /* Index */ @@ -547,17 +493,11 @@ Buffer *mBuf; /* buffer */ * */ -#ifdef ANSI S16 cmPkAddrs ( Addrs *addrs, /* address */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkAddrs(addrs, mBuf) -Addrs *addrs; /* address */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t i; /* loop counter */ @@ -591,17 +531,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkShrtAddrs ( ShrtAddrs *addrs, /* address */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkShrtAddrs(addrs, mBuf) -ShrtAddrs *addrs; /* address */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t i; /* loop counter */ @@ -634,17 +568,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkAddrMask ( uint8_t *mask, /* pointer to address mask array */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkAddrMask(mask, mBuf) -uint8_t *mask; /* pointer to address mask array */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; /* counter */ @@ -673,17 +601,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkBndCfg ( BndCfg *bndCfg, /* bndCfg */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkBndCfg(bndCfg, mBuf) -BndCfg *bndCfg; /* bndCfg */ -Buffer *mBuf; /* message buffer */ -#endif { Txt *p; /* temporary */ @@ -721,17 +643,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_gen.c * */ -#ifdef ANSI S16 cmPkPst ( Pst *pst, Buffer *mBuf ) -#else -S16 cmPkPst(pst, mBuf) -Pst *pst; -Buffer *mBuf; -#endif { CMCHKPK(cmPkEvent, pst->event, mBuf); @@ -767,17 +683,11 @@ Buffer *mBuf; * */ -#ifdef ANSI S16 cmPkElmtHdr ( ElmtHdr *m, /* element header */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkElmtHdr(m, mBuf) -ElmtHdr *m; /* element header */ -Buffer *mBuf; /* message buffer */ -#endif { #if (LCAMT || ATM_BISUP) @@ -813,17 +723,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknUInt8 ( TknUInt8 *tknUInt8, /* token uint8_t */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknUInt8(tknUInt8, mBuf) -TknUInt8 *tknUInt8; /* token uint8_t */ -Buffer *mBuf; /* message buffer */ -#endif { if (tknUInt8->pres) @@ -853,17 +757,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknS8 ( TknS8 *tknS8, /* token S8 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknS8(tknS8, mBuf) -TknS8 *tknS8; /* token S8 */ -Buffer *mBuf; /* message buffer */ -#endif { if (tknS8->pres) @@ -893,17 +791,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknUInt16 ( TknUInt16 *tknUInt16, /* token uint16_t */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknUInt16(tknUInt16, mBuf) -TknUInt16 *tknUInt16; /* token uint16_t */ -Buffer *mBuf; /* message buffer */ -#endif { if (tknUInt16->pres) @@ -933,17 +825,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknUInt32 ( TknUInt32 *tknUInt32, /* token uint32_t */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknUInt32(tknUInt32, mBuf) -TknUInt32 *tknUInt32; /* token uint32_t */ -Buffer *mBuf; /* message buffer */ -#endif { if (tknUInt32->pres) @@ -973,17 +859,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr ( TknStr *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr(tknStr, mBuf) -TknStr *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -1021,17 +901,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrM ( TknStrM *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrM(tknStr, mBuf) -TknStrM *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -1069,17 +943,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrS ( TknStrS *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrS(tknStr, mBuf) -TknStrS *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -1117,17 +985,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrE ( TknStrE *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrE(tknStr, mBuf) -TknStrE *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -1167,17 +1029,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkPnNodeId ( PnNodeId *src, /* source PNNI Node Id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkPnNodeId (src, mBuf) -PnNodeId *src; /* source PNNI Node Id */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; @@ -1207,17 +1063,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr4 ( TknStr4 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr4(tknStr, mBuf) -TknStr4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1242,17 +1092,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr12 ( TknStr12 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr12(tknStr, mBuf) -TknStr12 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1276,17 +1120,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr32 ( TknStr32 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr32(tknStr, mBuf) -TknStr32 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1310,17 +1148,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr64 ( TknStr64 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr64(tknStr, mBuf) -TknStr64 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1344,17 +1176,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr132 ( TknStr132 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr132(tknStr, mBuf) -TknStr132 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1378,17 +1204,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr256 ( TknStr256 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr256(tknStr, mBuf) -TknStr256 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1412,17 +1232,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknOid ( TknOid *tknOid, /* Object Identifier token */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknOid(tknOid, mBuf) -TknOid *tknOid; /* Object Identifier token */ -Buffer *mBuf; /* message buffer */ -#endif { uint16_t i; @@ -1464,17 +1278,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknS32 ( TknS32 *tknS32, /* token S32 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknS32(tknS32, mBuf) -TknS32 *tknS32; /* token S32 */ -Buffer *mBuf; /* message buffer */ -#endif { if (tknS32->pres) @@ -1504,17 +1312,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkHeader ( Header *header, /* header */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkHeader(header, mBuf) -Header *header; /* header */ -Buffer *mBuf; /* message buffer */ -#endif { #ifdef LMINT3 @@ -1549,17 +1351,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkCmStatus ( CmStatus *sta, /* status structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmStatus(sta, mBuf) -CmStatus *sta; /* status structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(oduUnpackUInt16, sta->reason, mBuf); @@ -1583,17 +1379,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkCmAlarm ( CmAlarm *alarm, /* alarm structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmAlarm(alarm, mBuf) -CmAlarm *alarm; /* alarm structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(oduUnpackUInt16, alarm->cause, mBuf); @@ -1619,17 +1409,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkSmCfg ( SmCfg *smCfg, /* stack manager */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkSmCfg(smCfg, mBuf) -SmCfg *smCfg; /* stack manager */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkSelector, smCfg->selector, mBuf); @@ -1658,17 +1442,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTmrCfg ( TmrCfg *tmrCfg, /* timer configuration */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTmrCfg(tmrCfg, mBuf) -TmrCfg *tmrCfg; /* timer configuration */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(oduUnpackUInt16, tmrCfg->val, mBuf); @@ -1692,17 +1470,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknBuf ( TknBuf *tknBuf, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknBuf(tknBuf, mBuf) -TknBuf *tknBuf; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { if(tknBuf->pres) @@ -1739,17 +1511,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkIntf ( CmIntf *intf, /* interface info */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkIntf(intf, mBuf) -CmIntf *intf; /* interface info */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkIntfId, intf->intfId, mBuf); @@ -1779,17 +1545,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkDateTime ( DateTime *dateTime, /* date/time structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkDateTime(dateTime, mBuf) -DateTime *dateTime; /* date/time structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt8, &dateTime->month, mBuf); @@ -1823,17 +1583,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkDuration ( Duration *duration, /* duration structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkDuration(duration, mBuf) -Duration *duration; /* duration structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt8, &duration->days, mBuf); @@ -1859,17 +1613,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduUnpackPointer ( PTR *ptr, /* duration structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduUnpackPointer(ptr, mBuf) -PTR *ptr; /* duration structure */ -Buffer *mBuf; /* message buffer */ -#endif { uint16_t tmp16; /* temporary value */ uint32_t tmp32; /* temporary value */ @@ -1990,17 +1738,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkEntityId ( EntityId *entityId, /* entity id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkEntityId(entityId, mBuf) -EntityId *entityId; /* entity id */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkEnt, &entityId->ent, mBuf); @@ -2024,17 +1766,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkElmntId ( ElmntId *elmntId, /* element id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkElmntId(elmntId, mBuf) -ElmntId *elmntId; /* element id */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkElmnt, &elmntId->elmnt, mBuf); @@ -2060,17 +1796,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkMemoryId ( MemoryId *memoryId, /* memoryId */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkMemoryId(memoryId, mBuf) -MemoryId *memoryId; /* memoryId */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkRegion, &memoryId->region, mBuf); @@ -2094,17 +1824,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkSystemId ( SystemId *systemId, /* system id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkSystemId(systemId, mBuf) -SystemId *systemId; /* system id */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; /* loop counter */ MsgLen len; @@ -2142,17 +1866,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkProtAddr ( ProtAddr *pAddr, /* protocol address */ Buffer *mBuf /* buffer */ ) -#else -S16 cmUnpkProtAddr(pAddr, mBuf) -ProtAddr *pAddr; /* protocol address table */ -Buffer *mBuf; /* buffer */ -#endif { uint8_t j; /* Index */ @@ -2188,17 +1906,11 @@ Buffer *mBuf; /* buffer */ * */ -#ifdef ANSI S16 cmUnpkProtAddrTbl ( ProtAddrTbl *protAddr, /* protocol address table */ Buffer *mBuf /* buffer */ ) -#else -S16 cmUnpkProtAddrTbl(protAddr, mBuf) -ProtAddrTbl *protAddr; /* protocol address table */ -Buffer *mBuf; /* buffer */ -#endif { uint8_t i; /* index */ uint8_t j; /* Index */ @@ -2241,17 +1953,11 @@ Buffer *mBuf; /* buffer */ * */ -#ifdef ANSI S16 cmUnpkAddrs ( Addrs *addrs, /* address */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkAddrs(addrs, mBuf) -Addrs *addrs; /* address */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t i; /* loop counter */ @@ -2283,17 +1989,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkShrtAddrs ( ShrtAddrs *addrs, /* address */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkShrtAddrs(addrs, mBuf) -ShrtAddrs *addrs; /* address */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t i; /* loop counter */ @@ -2325,17 +2025,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkAddrMask ( uint8_t *mask, /* pointer to address mask */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkAddrMask(mask, mBuf) -uint8_t *mask; /* pointer to address mask */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; /* counter */ @@ -2363,17 +2057,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkBndCfg ( BndCfg *bndCfg, /* bndCfg */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkBndCfg(bndCfg, mBuf) -BndCfg *bndCfg; /* bndCfg */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; /* loop counter */ @@ -2410,17 +2098,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_gen.c * */ -#ifdef ANSI S16 cmUnpkPst ( Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkPst(pst, mBuf) -Pst *pst; -Buffer *mBuf; -#endif { #ifdef TDS_ROLL_UPGRADE_SUPPORT @@ -2456,17 +2138,11 @@ Buffer *mBuf; * */ -#ifdef ANSI S16 cmUnpkElmtHdr ( ElmtHdr *m, /* element header */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkElmtHdr(m, mBuf) -ElmtHdr *m; /* element header */ -Buffer *mBuf; /* message buffer */ -#endif { /* Present */ @@ -2502,17 +2178,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknUInt8 ( TknUInt8 *tknUInt8, /* token uint8_t */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknUInt8(tknUInt8, mBuf) -TknUInt8 *tknUInt8; /* token uint8_t */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ @@ -2542,17 +2212,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknS8 ( TknS8 *tknS8, /* token S8 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknS8(tknS8, mBuf) -TknS8 *tknS8; /* token S8 */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ @@ -2582,17 +2246,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknUInt16 ( TknUInt16 *tknUInt16, /* token uint16_t */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknUInt16(tknUInt16, mBuf) -TknUInt16 *tknUInt16; /* token uint16_t */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ @@ -2622,17 +2280,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknUInt32 ( TknUInt32 *tknUInt32, /* token uint32_t */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknUInt32(tknUInt32, mBuf) -TknUInt32 *tknUInt32; /* token uint32_t */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ @@ -2661,17 +2313,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr ( TknStr *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr(tknStr, mBuf) -TknStr *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -2710,17 +2356,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrM ( TknStrM *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrM(tknStr, mBuf) -TknStrM *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -2760,17 +2400,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrS ( TknStrS *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrS(tknStr, mBuf) -TknStrS *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -2810,17 +2444,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrE ( TknStrE *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrE(tknStr, mBuf) -TknStrE *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -2862,17 +2490,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkPnNodeId ( PnNodeId *dst, /* source PNNI Node Id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkPnNodeId (dst, mBuf) -PnNodeId *dst; /* source PNNI Node Id */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; @@ -2902,17 +2524,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr4 ( TknStr4 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr4(tknStr, mBuf) -TknStr4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -2937,17 +2553,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr12 ( TknStr12 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr12(tknStr, mBuf) -TknStr12 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -2971,17 +2581,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr32 ( TknStr32 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr32(tknStr, mBuf) -TknStr32 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -3005,17 +2609,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr64 ( TknStr64 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr64(tknStr, mBuf) -TknStr64 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -3039,17 +2637,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr132 ( TknStr132 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr132(tknStr, mBuf) -TknStr132 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -3073,17 +2665,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr256 ( TknStr256 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr256(tknStr, mBuf) -TknStr256 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -3107,17 +2693,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknOid ( TknOid *tknOid, /* Object Identifier token */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknOid(tknOid, mBuf) -TknOid *tknOid; /* Object Identifier token */ -Buffer *mBuf; /* message buffer */ -#endif { uint16_t i; @@ -3161,17 +2741,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknS32 ( TknS32 *tknS32, /* token S32 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknS32(tknS32, mBuf) -TknS32 *tknS32; /* token S32 */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ @@ -3201,17 +2775,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkHeader ( Header *header, /* header structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkHeader(header, mBuf) -Header *header; /* header structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt16, &header->msgLen, mBuf); @@ -3246,17 +2814,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkCmStatus ( CmStatus *sta, /* status structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmStatus(sta, mBuf) -CmStatus *sta; /* status structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt16, &sta->status, mBuf); @@ -3280,17 +2842,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkCmAlarm ( CmAlarm *alarm, /* alarm structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmAlarm(alarm, mBuf) -CmAlarm *alarm; /* alarm structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkDateTime, &alarm->dt, mBuf); @@ -3316,17 +2872,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkSmCfg ( SmCfg *smCfg, /* stack manager */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkSmCfg(smCfg, mBuf) -SmCfg *smCfg; /* stack manager */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkEnt, &smCfg->ent, mBuf); @@ -3355,17 +2905,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTmrCfg ( TmrCfg *tmrCfg, /* timer configuration */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTmrCfg(tmrCfg, mBuf) -TmrCfg *tmrCfg; /* timer configuration */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduUnpackBool, &tmrCfg->enb, mBuf); @@ -3388,17 +2932,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknBuf ( TknBuf *tknBuf, /* token string */ Buffer **tBuf /* message buffer */ ) -#else -S16 cmUnpkTknBuf(tknBuf, tBuf) -TknBuf *tknBuf; /* token string */ -Buffer **tBuf; /* message buffer */ -#endif { Buffer *mBuf; @@ -3456,17 +2994,11 @@ Buffer **tBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkIntf ( CmIntf *intf, /* interface info */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkIntf(intf, mBuf) -CmIntf *intf; /* interface info */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkIntfVer, &intf->intfVer, mBuf); diff --git a/src/cm/cm_hash.c b/src/cm/cm_hash.c index 5793bc3f8..61074e517 100644 --- a/src/cm/cm_hash.c +++ b/src/cm/cm_hash.c @@ -171,26 +171,18 @@ static S16 cmHashFuncDirIdx ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16 * */ -#ifdef ANSI static S16 cmHashFuncAnyKey ( -CmHashListCp *hashListCp, /* hash list control point */ -uint8_t *key, /* key string */ -uint16_t keyLen, /* length of key string */ -uint16_t *idx /* idx to return */ +CmHashListCp *hashListCp, /* hash list control point */ +uint8_t *key, /* key string */ +uint16_t keyLen, /* length of key string */ +uint16_t *idx /* idx to return */ ) -#else -static S16 cmHashFuncAnyKey (hashListCp, key, keyLen, idx) -CmHashListCp *hashListCp; /* hash list control point */ -uint8_t *key; /* key string */ -uint16_t keyLen; /* length of key string */ -uint16_t *idx; /* idx to return */ -#endif { - uint32_t a; /* hash variables */ - uint32_t b; /* hash variables */ - uint32_t c; /* hash variables */ - uint32_t len; /* length */ + uint32_t a; /* hash variables */ + uint32_t b; /* hash variables */ + uint32_t c; /* hash variables */ + uint32_t len; /* length */ /*cm_hash_c_001.main_23 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ /* Set up the internal state */ @@ -257,23 +249,15 @@ uint16_t *idx; /* idx to return */ * */ -#ifdef ANSI static S16 cmHashFuncU32Mod ( -CmHashListCp *hashListCp, /* hash list control point */ -uint8_t *key, /* key string */ -uint16_t keyLen, /* length of key string */ -uint16_t *idx /* idx to return */ +CmHashListCp *hashListCp, /* hash list control point */ +uint8_t *key, /* key string */ +uint16_t keyLen, /* length of key string */ +uint16_t *idx /* idx to return */ ) -#else -static S16 cmHashFuncU32Mod (hashListCp, key, keyLen, idx) -CmHashListCp *hashListCp; /* hash list control point */ -uint8_t *key; /* key string */ -uint16_t keyLen; /* length of key string */ -uint16_t *idx; /* idx to return */ -#endif { - uint32_t sum; /* Sum of octets for hash function */ + uint32_t sum; /* Sum of octets for hash function */ /* keyLen is marked Unused to remove compilation @@ -317,26 +301,18 @@ uint16_t *idx; /* idx to return */ * */ -#ifdef ANSI static S16 cmHashFuncBCD8 ( CmHashListCp *hashListCp, /* hash list control point */ -uint8_t *key, /* key string */ -uint16_t keyLen, /* length of key string */ -uint16_t *idx /* idx to return */ +uint8_t *key, /* key string */ +uint16_t keyLen, /* length of key string */ +uint16_t *idx /* idx to return */ ) -#else -static S16 cmHashFuncBCD8 (hashListCp, key, keyLen, idx) -CmHashListCp *hashListCp; /* hash list control point */ -uint8_t *key; /* key string */ -uint16_t keyLen; /* length of key string */ -uint16_t *idx; /* idx to return */ -#endif { - uint16_t tmp16 = 0; - uint32_t firstUInt32 = 0; /* First uint32_t prepared for lower 4 octets */ - uint32_t secondUInt32 = 0; /* Second uint32_t prepared for higher 4 octets */ - uint32_t sum; /* Sum of the above 2 octets to get the index */ + uint16_t tmp16 = 0; + uint32_t firstUInt32 = 0; /* First uint32_t prepared for lower 4 octets */ + uint32_t secondUInt32 = 0; /* Second uint32_t prepared for higher 4 octets */ + uint32_t sum; /* Sum of the above 2 octets to get the index */ /* keyLen is marked Unused to remove compilation @@ -391,24 +367,16 @@ uint16_t *idx; /* idx to return */ * */ -#ifdef ANSI static S16 cmHashFuncString ( -CmHashListCp *hashListCp, /* hash list control point */ -uint8_t *key, /* key string */ -uint16_t keyLen, /* length of key string */ -uint16_t *idx /* idx to return */ +CmHashListCp *hashListCp, /* hash list control point */ +uint8_t *key, /* key string */ +uint16_t keyLen, /* length of key string */ +uint16_t *idx /* idx to return */ ) -#else -static S16 cmHashFuncString (hashListCp, key, keyLen, idx) -CmHashListCp *hashListCp; /* hash list control point */ -uint8_t *key; /* key string */ -uint16_t keyLen; /* length of key string */ -uint16_t *idx; /* idx to return */ -#endif { - uint16_t cntr; /* Index */ - uint32_t sum; /* Sum of octets for hash function */ + uint16_t cntr; /* Index */ + uint32_t sum; /* Sum of octets for hash function */ sum = 0; @@ -448,23 +416,15 @@ uint16_t *idx; /* idx to return */ * */ -#ifdef ANSI static S16 cmHashFuncDefault ( -CmHashListCp *hashListCp, /* hash list control point */ -uint8_t *key, /* key string */ -uint16_t keyLen, /* length of key string */ -uint16_t *idx /* index to return */ +CmHashListCp *hashListCp, /* hash list control point */ +uint8_t *key, /* key string */ +uint16_t keyLen, /* length of key string */ +uint16_t *idx /* index to return */ ) -#else -static S16 cmHashFuncDefault(hashListCp, key, keyLen, idx) -CmHashListCp *hashListCp; /* hash list control point */ -uint8_t *key; /* key string */ -uint16_t keyLen; /* length of key string */ -uint16_t *idx; /* index to return */ -#endif { - uint32_t sum; /* sum of key string octets */ + uint32_t sum; /* sum of key string octets */ /* add all bytes of the key */ @@ -516,24 +476,16 @@ uint16_t *idx; /* index to return */ * */ -#ifdef ANSI static S16 cmHashFuncMult24 ( -CmHashListCp *hashListCp, /* hash list control point */ -uint8_t *key, /* key string */ -uint16_t keyLen, /* length of key string */ -uint16_t *idx /* index to return */ +CmHashListCp *hashListCp, /* hash list control point */ +uint8_t *key, /* key string */ +uint16_t keyLen, /* length of key string */ +uint16_t *idx /* index to return */ ) -#else -static S16 cmHashFuncMult24(hashListCp, key, keyLen, idx) -CmHashListCp *hashListCp; /* hash list control point */ -uint8_t *key; /* key string */ -uint16_t keyLen; /* length of key string */ -uint16_t *idx; /* index to return */ -#endif { - uint32_t prod; /* (constant multiplier * key) */ - uint8_t shift; /* Bits to be shifted to get index */ + uint32_t prod; /* (constant multiplier * key) */ + uint8_t shift; /* Bits to be shifted to get index */ UNUSED(keyLen); @@ -578,21 +530,13 @@ uint16_t *idx; /* index to return */ * */ -#ifdef ANSI static S16 cmHashFuncConId ( -CmHashListCp *hashListCp, /* hash list control point */ -uint8_t *key, /* key string */ -uint16_t keyLen, /* length of key string */ -uint16_t *idx /* index to return */ +CmHashListCp *hashListCp, /* hash list control point */ +uint8_t *key, /* key string */ +uint16_t keyLen, /* length of key string */ +uint16_t *idx /* index to return */ ) -#else -static S16 cmHashFuncConId(hashListCp, key, keyLen, idx) -CmHashListCp *hashListCp; /* hash list control point */ -uint8_t *key; /* key string */ -uint16_t keyLen; /* length of key string */ -uint16_t *idx; /* index to return */ -#endif { @@ -646,21 +590,13 @@ uint16_t *idx; /* index to return */ * */ -#ifdef ANSI static S16 cmHashFuncDirIdx ( -CmHashListCp *hashListCp, /* hash list control point */ -uint8_t *key, /* key string */ -uint16_t keyLen, /* length of key string */ -uint16_t *idx /* index to return */ +CmHashListCp *hashListCp, /* hash list control point */ +uint8_t *key, /* key string */ +uint16_t keyLen, /* length of key string */ +uint16_t *idx /* index to return */ ) -#else -static S16 cmHashFuncDirIdx(hashListCp, key, keyLen, idx) -CmHashListCp *hashListCp; /* hash list control point */ -uint8_t *key; /* key string */ -uint16_t keyLen; /* length of key string */ -uint16_t *idx; /* index to return */ -#endif { UNUSED(hashListCp); @@ -687,7 +623,6 @@ uint16_t *idx; /* index to return */ * */ -#ifdef ANSI static S16 cmHashMatchKey ( uint8_t *key1, /* first key string */ @@ -695,13 +630,6 @@ uint16_t keyLen1, /* length of first key string */ uint8_t *key2, /* second key string */ uint16_t keyLen2 /* length of second key string */ ) -#else -static S16 cmHashMatchKey(key1, keyLen1, key2, keyLen2) -uint8_t *key1; /* first key string */ -uint16_t keyLen1; /* length of first key string */ -uint8_t *key2; /* second key string */ -uint16_t keyLen2; /* length of second key string */ -#endif { /* compare key lengths */ @@ -727,17 +655,11 @@ uint16_t keyLen2; /* length of second key string */ * */ -#ifdef ANSI static S16 cmListInsert ( CmListEnt *oldEntry, /* add new entry after this entry */ CmListEnt *newEntry /* new entry to add */ ) -#else -static S16 cmListInsert(oldEntry, newEntry) -CmListEnt *oldEntry; /* add new entry after this entry */ -CmListEnt *newEntry; /* new entry to add */ -#endif { newEntry->next = oldEntry->next; @@ -763,15 +685,10 @@ CmListEnt *newEntry; /* new entry to add */ * */ -#ifdef ANSI static S16 cmListDelete ( CmListEnt *entry /* entry to delete */ ) -#else -static S16 cmListDelete(entry) -CmListEnt *entry; /* entry to delete */ -#endif { if (entry == NULLP) @@ -824,27 +741,16 @@ CmListEnt *entry; /* entry to delete */ * File: cm_hash.c * */ -#ifdef ANSI S16 cmHashListInit ( CmHashListCp *hashListCp, /* hash list to initialize */ -uint16_t nmbBins, /* number of hash list bins */ -uint16_t offset, /* offset of CmHashListEnt in entries */ +uint16_t nmbBins, /* number of hash list bins */ +uint16_t offset, /* offset of CmHashListEnt in entries */ Bool dupFlg, /* allow duplicate keys */ -uint16_t keyType, /* key type for selecting hash fn */ +uint16_t keyType, /* key type for selecting hash fn */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) -#else -S16 cmHashListInit(hashListCp, nmbBins, offset, dupFlg, keyType, region, pool) -CmHashListCp *hashListCp; /* hash list to initialize */ -uint16_t nmbBins; /* number of hash list bins */ -uint16_t offset; /* offset of CmHashListEnt in entries */ -Bool dupFlg; /* allow duplicate keys */ -uint16_t keyType; /* key type for selecting hash fn */ -Region region; /* memory region to allocate bins */ -Pool pool; /* memory pool to allocate bins */ -#endif { uint16_t i; #ifndef CM_MT_HASH_BIN @@ -982,15 +888,10 @@ Pool pool; /* memory pool to allocate bins */ * File: cm_hash.c * */ -#ifdef ANSI S16 cmHashListDeinit ( CmHashListCp *hashListCp /* hash list to deinitialize */ ) -#else -S16 cmHashListDeinit(hashListCp) -CmHashListCp *hashListCp; /* hash list to deinitialize */ -#endif { #if (ERRCLASS & ERRCLS_DEBUG) @@ -1050,21 +951,13 @@ CmHashListCp *hashListCp; /* hash list to deinitialize */ * */ -#ifdef ANSI S16 cmHashListInsert ( CmHashListCp *hashListCp, /* hash list to add to */ PTR entry, /* entry to add */ -uint8_t *key, /* pointer to key */ -uint16_t keyLen /* length of key */ +uint8_t *key, /* pointer to key */ +uint16_t keyLen /* length of key */ ) -#else -S16 cmHashListInsert(hashListCp, entry, key, keyLen) -CmHashListCp *hashListCp; /* hash list to add to */ -PTR entry; /* entry to add */ -uint8_t *key; /* pointer to key */ -uint16_t keyLen; /* length of key */ -#endif { CmHashListEnt *hashListEnt; /* pointer to hash list entry header */ PTR dupEntry; /* pointer to entry with duplicate key */ @@ -1133,17 +1026,11 @@ uint16_t keyLen; /* length of key */ * */ -#ifdef ANSI S16 cmHashListDelete ( CmHashListCp *hashListCp, /* hash list to delete from */ PTR entry /* entry to delete */ ) -#else -S16 cmHashListDelete(hashListCp, entry) -CmHashListCp *hashListCp; /* hash list to delete from */ -PTR entry; /* entry to delete */ -#endif { CmHashListEnt *hashListEnt; /* pointer to hash list entry header */ #ifdef CM_MT_HASH_BIN @@ -1216,23 +1103,14 @@ PTR entry; /* entry to delete */ * */ -#ifdef ANSI S16 cmHashListFind ( CmHashListCp *hashListCp, /* hash list to search */ -uint8_t *key, /* pointer to key */ -uint16_t keyLen, /* length of key */ -uint16_t seqNmb, /* used in case of duplicate keys */ +uint8_t *key, /* pointer to key */ +uint16_t keyLen, /* length of key */ +uint16_t seqNmb, /* used in case of duplicate keys */ PTR *entry /* entry to be returned */ ) -#else -S16 cmHashListFind(hashListCp, key, keyLen, seqNmb, entry) -CmHashListCp *hashListCp; /* hash list to search */ -uint8_t *key; /* pointer to key */ -uint16_t keyLen; /* length of key */ -uint16_t seqNmb; /* used in case of duplicate keys */ -PTR *entry; /* entry to be returned */ -#endif { CmHashListEnt *hashListEnt; /* pointer to hash list entry header */ #ifndef CM_MT_HASH_BIN @@ -1321,19 +1199,12 @@ PTR *entry; /* entry to be returned */ * File: cm_hash.c * */ -#ifdef ANSI S16 cmHashListGetNext ( CmHashListCp *hashListCp, /* hash list to get from */ PTR prevEnt, /* previous entry */ PTR *entry /* entry to be returned */ ) -#else -S16 cmHashListGetNext(hashListCp, prevEnt, entry) -CmHashListCp *hashListCp; /* hash list to get from */ -PTR prevEnt; /* previous entry */ -PTR *entry; /* entry to be returned */ -#endif { #ifndef CM_MT_HASH_BIN CmListEnt *hashListBin; /* temporary hash list bin pointer */ @@ -1438,21 +1309,13 @@ PTR *entry; /* entry to be returned */ * File: cm_hash.c * */ -#ifdef ANSI S16 cmHashListBinGetNextEntry ( CmHashListCp *hashListCp, /* hash list to get from */ -uint16_t binIdx, /* Bin Index to retreive the entry */ +uint16_t binIdx, /* Bin Index to retreive the entry */ PTR prevEnt, /* previous entry */ PTR *entry /* entry to be returned */ ) -#else -S16 cmHashListBinGetNextEntry(hashListCp, binIdx, prevEnt, entry) -CmHashListCp *hashListCp; /* hash list to get from */ -uint16_t binIdx; /* Bin Index to retreive the entry */ -PTR prevEnt; /* previous entry */ -PTR *entry; /* entry to be returned */ -#endif { CmListBinEnt *hashListBin; /* temporary hash list bin pointer */ CmHashListEnt *hashListEnt; /* temporary hash list entry pointer */ @@ -1528,19 +1391,12 @@ PTR *entry; /* entry to be returned */ * File: cm_hash.c * */ -#ifdef ANSI S16 cmHashListQuery ( CmHashListCp *hashListCp, /* hash list to query */ -uint8_t queryType, /* type of query */ -uint16_t *result /* result of query */ +uint8_t queryType, /* type of query */ +uint16_t *result /* result of query */ ) -#else -S16 cmHashListQuery(hashListCp, queryType, result) -CmHashListCp *hashListCp; /* hash list to query */ -uint8_t queryType; /* type of query */ -uint16_t *result; /* result of query */ -#endif { #ifdef CM_MT_HASH_BIN uint8_t i; @@ -1638,21 +1494,13 @@ uint16_t *result; /* result of query */ * */ -#ifdef ANSI S16 cmHashListOAInsert ( CmHashListCp *hashListCp, /* hash table to add to */ PTR entry, /* entry to add */ -uint8_t *key, /* pointer to key */ -uint16_t keyLen /* length of key */ +uint8_t *key, /* pointer to key */ +uint16_t keyLen /* length of key */ ) -#else -S16 cmHashListOAInsert(hashListCp, entry, key, keyLen) -CmHashListCp *hashListCp; /* hash table to add to */ -PTR entry; /* entry to add */ -uint8_t *key; /* pointer to key */ -uint16_t keyLen; /* length of key */ -#endif { /* cm_hash_c_001.main_21. Modify. Compilation Issue resolved. */ #ifndef CM_MT_HASH_BIN diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c index 8aead4b0e..78c764077 100644 --- a/src/cm/cm_inet.c +++ b/src/cm/cm_inet.c @@ -320,7 +320,6 @@ Txt prntBuf[CMINET_PRNT_BUF_SIZE]; * */ -#ifdef ANSI S16 cmInetPoll ( CmInetPollFd *pollFdArr, /* poll FD Array */ @@ -328,13 +327,6 @@ uint32_t numFds, /* Number of Fds to be monitored */ S16 *numRdyFds, /* number of ready descriptors */ uint32_t timeout /* timeout value for Poll */ ) -#else -S16 cmInetPoll(pollFdArr,numFds,numRdyFds,timeout) -CmInetPollFd *pollFdArr; /* poll FD Array */ -uint32_t numFds; /* Number of Fds to be monitored */ -S16 *numRdyFds; /* number of ready descriptors */ -uint32_t timeout; /* timeout value for Poll */ -#endif { S32 ret; @@ -413,7 +405,6 @@ uint32_t timeout; /* timeout value for Poll */ * */ -#ifdef ANSI S16 cmInetPollSetFd ( CmInetFd *sockFd, /* socket file descriptor */ @@ -421,13 +412,6 @@ CmInetPollFd *pollFdArr, /* poll FD Array */ S16 idx, /* poll Fd Array Index */ uint16_t eventMask /* Event Mask to be set */ ) -#else -S16 cmInetPollSetFd(sockFd,pollFdArr,idx,eventMask) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetPollFd *pollFdArr; /* poll FD Array */ -S16 idx; /* poll Fd Array Index */ -uint16_t eventMask; /* Event Mask to be set */ -#endif { @@ -509,19 +493,12 @@ uint16_t eventMask; /* Event Mask to be set */ * */ -#ifdef ANSI S16 cmInetPollFdIsSet ( CmInetPollFd *pollFdArr, /* poll FD Array */ S16 idx, /* poll Fd Array Index */ uint16_t eventMask /* Event Mask to be set */ ) -#else -S16 cmInetPollFdIsSet(pollFdArr,idx,eventMask) -CmInetPollFd *pollFdArr; /* poll FD Array */ -S16 idx; /* poll Fd Array Index */ -uint16_t eventMask; /* Event Mask to be set */ -#endif { S16 ret; @@ -568,19 +545,12 @@ uint16_t eventMask; /* Event Mask to be set */ * */ -#ifdef ANSI S16 cmInetPollClearFdREvent ( CmInetPollFd *pollFdArr, /* poll FD Array */ S16 idx, /* poll Fd Array Index */ uint16_t eventMask /* Event Mask to be set */ ) -#else -S16 cmInetPollClearFdREvent(sockFd,pollFdArr,eventMask) -CmInetPollFd *pollFdArr; /* poll FD Array */ -S16 idx; /* poll Fd Array Index */ -uint16_t eventMask; /* Event Mask to be set */ -#endif { @@ -659,19 +629,12 @@ uint16_t eventMask; /* Event Mask to be set */ * */ -#ifdef ANSI S16 cmInetPollClearFdEvent ( CmInetPollFd *pollFdArr, /* poll FD Array */ S16 idx, /* poll Fd Array Index */ uint16_t eventMask /* Event Mask to be set */ ) -#else -S16 cmInetPollClearFdEvent(sockFd,pollFdArr,eventMask) -CmInetPollFd *pollFdArr; /* poll FD Array */ -S16 idx; /* poll Fd Array Index */ -uint16_t eventMask; /* Event Mask to be set */ -#endif { @@ -757,19 +720,12 @@ uint16_t eventMask; /* Event Mask to be set */ * */ -#ifdef ANSI S16 cmInetPollDelFd ( CmInetPollFd *pollFdArr, /* poll FD Array */ S16 delIdx, /* poll Fd Array Index for which fd has to be deleted*/ S16 lastIdx /* Last index of poll Fd Array */ ) -#else -S16 cmInetPollDelFd(pollFdArr, delIdx, lastIdx) -CmInetPollFd *pollFdArr; /* poll FD Array */ -S16 delIdx; /* poll Fd Array Index for which fd has to be deleted*/ -S16 lastIdx; /* Last index of poll Fd Array */ -#endif { @@ -839,15 +795,10 @@ S16 lastIdx; /* Last index of poll Fd Array */ * */ -#ifdef ANSI S16 cmInetPollInitFdArr ( CmInetPollFd *pollFdArr /* poll FD Array */ ) -#else -S16 cmInetPollInitFdArr(pollFdArr) -CmInetPollFd *pollFdArr; /* poll FD Array */ -#endif { S16 idx; @@ -895,31 +846,20 @@ CmInetPollFd *pollFdArr; /* poll FD Array */ * */ -#ifdef ANSI static S16 buildRecvBuf ( CmInetMemInfo *info, /* buffer allocation info */ MsgLen len, /* message length */ CmInetIovec rxArr[], /* gather array */ Buffer *dBuf[], /* allocated dBufs */ -uint16_t maxSize, /* size of rxArr/dBuf array */ +uint16_t maxSize, /* size of rxArr/dBuf array */ struct msghdr *msg, /* message header for recvmsg() */ Bool isStrmMsg /* Is a TCP message */ ) -#else -static S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg) - CmInetMemInfo *info; /* buffer allocation info */ - MsgLen len; /* message length */ - CmInetIovec rxArr[]; /* gather array */ - Buffer *dBuf[]; /* allocated dBufs */ - uint16_t maxSize; /* size of rxArr/dBuf array */ - struct msghdr *msg; /* message header for recvmsg() */ - Bool isStrmMsg; /* Is a TCP message */ -#endif { S16 ret; /* temporary return value */ - uint16_t numBuf; /* number of dBufs */ - uint16_t i; /* dBuf index counter */ + uint16_t numBuf; /* number of dBufs */ + uint16_t i; /* dBuf index counter */ Data *dPtr; /* data pointer */ /* cm_inet_c_001.main_47: 102069 Changed from S32 to MsgLen for bufLen*/ MsgLen bufLen; /* entire receive buffer length, if S16 @@ -1058,7 +998,6 @@ cleanup: * */ -#ifdef ANSI static S16 buildRecvMsg ( CmInetMemInfo *info, /* buffer allocation info */ @@ -1068,15 +1007,6 @@ MsgLen msgLen, /* message length */ Buffer *dBufs[], /* dBufs */ Buffer **mPtr /* message built from dBufs */ ) -#else -static S16 buildRecvMsg(info, rxArr, numBuf, msgLen, dBufs, mPtr) -CmInetMemInfo *info; /* buffer allocation info */ -CmInetIovec rxArr[]; /* scatter array */ -S16 numBuf; /* number of allocated dBufs */ -MsgLen msgLen; /* length of one particular dBuf */ -Buffer *dBufs[]; /* dBufs */ -Buffer **mPtr; /* message built from dBufs */ -#endif { S16 ret; /* return value */ S16 i; /* dBuf index counter */ @@ -1157,7 +1087,6 @@ cleanup: * File: cm_inet.c * */ -#ifdef ANSI static S16 buildSendIovec ( Buffer *mBuf, /* Message buffer */ @@ -1165,20 +1094,9 @@ MsgLen msgLen, /* Length of mBuf */ CmInetIovec txArr[], /* transmit scatter vector array */ S16 numDBufs, /* Maximum number of dBufs to use */ S16 *numIovElems, /* Number of iov elements in array */ -uint32_t *strtEndDBufNum, /* dBuf number to start and end */ +uint32_t *strtEndDBufNum, /* dBuf number to start and end */ MsgLen *ioLen /* cm_inet_c_001.main_50 - Len of dbuf packed into IO-vector */ ) -#else -static S16 buildSendIovec(mBuf, msgLen, txArr, numDBufs, numIovElems, - strtEndDBufNum,ioLen) -Buffer *mBuf; /* Message buffer */ -MsgLen msgLen; /* Length of mBuf */ -CmInetIovec txArr[]; /* transmit scatter vector array */ -S16 numDBufs; /* Maximum number of dBufs to use */ -S16 *numIovElems; /* Number of iov elements in array */ -uint32_t *strtEndDBufNum; /* dBuf number to start and end */ -MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed into IO-vector */ -#endif { S16 ret; MsgLen dLen; @@ -1292,7 +1210,6 @@ MsgLen *ioLen; /* cm_inet_c_001.main_50 - Len of dbuf packed in * File: cm_inet.c * */ -#ifdef ANSI #ifdef CM_INET2 #ifdef IPV6_SUPPORTED S16 cmInetSocket @@ -1317,26 +1234,6 @@ uint8_t type, /* socket type */ CmInetFd *sockFd /* socket file descriptor */ ) #endif /* CM_INET2 */ -#else -#ifdef CM_INET2 -#ifdef IPV6_SUPPORTED -S16 cmInetSocket(type, sockFd, protocol, domain) -uint8_t type; /* socket type */ -CmInetFd *sockFd; /* socket file descriptor */ -uint8_t protocol; /* protocol value */ -uint8_t domain; /* domain */ -#else -S16 cmInetSocket(type, sockFd, protocol) -uint8_t type; /* socket type */ -CmInetFd *sockFd; /* socket file descriptor */ -uint8_t protocol; /* protocol value */ -#endif /* IPV6_SUPPORTED */ -#else /* CM_INET2 */ -S16 cmInetSocket(type, sockFd) -uint8_t type; /* socket type */ -CmInetFd *sockFd; /* socket file descriptor */ -#endif /* CM_INET2 */ -#endif /* ANSI */ { S32 ret; /* temporary return value */ @@ -1484,17 +1381,11 @@ CmInetFd *sockFd; /* socket file descriptor */ * */ -#ifdef ANSI S16 cmInetBind ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *myAddr /* locale Internet address/port */ ) -#else -S16 cmInetBind(sockFd, myAddr) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *myAddr; /* locale Internet address/port */ -#endif { S32 ret; /* temporary return value */ struct sockaddr_in srcAddr; /* local Internet address/port */ @@ -1609,19 +1500,12 @@ CmInetAddr *myAddr; /* locale Internet address/port */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetSctpBindx ( CmInetFd *sockFd, /* socket file descriptor */ CmInetNetAddrLst *addrLst, /* local Internet address list */ uint16_t port /* port number */ ) -#else -S16 cmInetSctpBindx(sockFd, addrLst, port) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetNetAddrLst *addrLst; /* locale Internet address list */ -uint16_t port; /* port number */ -#endif { S32 ret; /* temporary return value */ S32 idx; @@ -1888,21 +1772,13 @@ uint16_t port; /* port number */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetSctpConnectx ( CmInetFd *sockFd, /* socket file descriptor */ CmInetNetAddr *primAddr, /* primary destination Internet address */ CmInetNetAddrLst *addrLst, /* destination Internet address list */ -uint16_t port /* port number */ +uint16_t port /* port number */ ) -#else -S16 cmInetSctpConnectx(sockFd, primAddr, addrLst, port) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetNetAddr *primAddr; /* primary destination Internet address */ -CmInetNetAddrLst *addrLst; /* destination Internet address list */ -uint16_t port; /* port number */ -#endif { S32 ret; uint32_t cnt; @@ -2352,19 +2228,12 @@ uint16_t port; /* port number */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetSctpPeelOff ( CmInetFd *sockFd, /* socket file descriptor */ -uint32_t assocId, /* association id */ +uint32_t assocId, /* association id */ CmInetFdType *assocFd /* association fd */ ) -#else -S16 cmInetSctpPeelOff(sockFd, assocId, assocFd) -CmInetFd *sockFd; /* socket file descriptor */ -uint32_t assocId; /* association id */ -CmInetFdType *assocFd; /* association fd */ -#endif { S32 ret; @@ -2418,36 +2287,20 @@ CmInetFdType *assocFd; /* association fd */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetSctpSendMsg ( CmInetFd *sockFd, /* socket file descriptor */ CmInetNetAddr *dstAddr, /* destination Internet address/port */ -uint16_t port, /* destination port no. */ +uint16_t port, /* destination port no. */ CmInetMemInfo *info, /* buffer allocation info */ Buffer *mBuf, /* buffer structure to send */ MsgLen *len, /* number of actually sent octets */ -uint16_t strmId, /* sctp stream identifier */ -Bool unorderFlg, /* flag to enable the unordered delivery */ -uint16_t ttl, /* time to live */ -uint32_t ppId, /* opaque value passed along with the message */ -uint32_t context /* value to be passed back, if error occurs */ +uint16_t strmId, /* sctp stream identifier */ +Bool unorderFlg, /* flag to enable the unordered delivery */ +uint16_t ttl, /* time to live */ +uint32_t ppId, /* opaque value passed along with the message */ +uint32_t context /* value to be passed back, if error occurs */ ) -#else -S16 cmInetSctpSendMsg(sockFd, dstAddr, port, info, mBuf, len, strmId, - unorderFlg, ttl, ppId, context) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetNetAddr *dstAddr; /* destination Internet address/port */ -uint16_t port; /* destination port no. */ -CmInetMemInfo *info; /* buffer allocation info */ -Buffer *mBuf; /* buffer structure to send */ -MsgLen *len; /* number of actually sent octets */ -uint16_t strmId; /* sctp stream identifier */ -Bool unorderFlg; /* flag to enable the unordered delivery */ -uint16_t ttl; /* time to live */ -uint32_t ppId; /* opaque value passed along with the message */ -uint32_t context; /* value to be passed back, if error occurs */ -#endif { S32 ret; /* cm_inet_c_001.main_58 : Fix for klockwork issue */ @@ -2674,32 +2527,18 @@ uint32_t context; /* value to be passed back, if error occurs * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetSctpRecvMsg ( CmInetFd *sockFd, /* socket file descriptor */ CmInetNetAddr *srcAddr, /* source Internet address/port */ -uint16_t *port, /* source port no. */ +uint16_t *port, /* source port no. */ CmInetMemInfo *meminfo, /* buffer allocation info */ Buffer **mBuf, /* buffer structure received */ MsgLen *len, /* number of octets received */ CmInetSctpSndRcvInfo *sinfo, /* sctp send-receive info */ -uint32_t *flag, /* flags */ +uint32_t *flag, /* flags */ CmInetSctpNotification *ntfy /* notification parameters */ ) -#else -S16 cmInetSctpRecvMsg(sockFd, srcAddr, port, meminfo, mBuf, len, - sinfo, flag, ntfy) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetNetAddr *srcAddr; /* source Internet address/port */ -uint16_t *port; /* source port no. */ -CmInetMemInfo *meminfo; /* buffer allocation info */ -Buffer **mBuf; /* buffer structure received */ -MsgLen *len; /* number of octets received */ -CmInetSctpSndRcvInfo *sinfo; /* sctp send-receive info */ -uint32_t *flag; /* flags */ -CmInetSctpNotification *ntfy; /* notification parameters */ -#endif { S32 ret; S32 msgFlags; @@ -3044,19 +2883,12 @@ CmInetSctpNotification *ntfy; /* notification parameters */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetSctpGetPAddrs ( CmInetFd *sockFd, /* socket file descriptor */ -uint32_t assocId, /* association id */ +uint32_t assocId, /* association id */ CmInetNetAddrLst *addrlst /* peer address list */ ) -#else -S16 cmInetSctpGetPAddrs(sockFd, assocId, addrlst) -CmInetFd *sockFd; /* socket file descriptor */ -uint32_t assocId; /* association id */ -CmInetNetAddrLst *addrlst; /* peer address list */ -#endif { /* cm_inet_c_001.main_58 : Fix for Klockwork issue */ S32 cnt; @@ -3164,21 +2996,13 @@ CmInetNetAddrLst *addrlst; /* peer address list */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetGetOpt ( CmInetFd *sockFd, /* socket file descriptor */ -uint32_t level, /* option level */ -uint32_t type, /* option type */ -Ptr value /* option value */ +uint32_t level, /* option level */ +uint32_t type, /* option type */ +Ptr value /* option value */ ) -#else -S16 cmInetGetOpt(sockFd, level, type, value) -CmInetFd *sockFd; /* socket file descriptor */ -uint32_t level; /* option level */ -uint32_t type; /* option type */ -Ptr value; /* option value */ -#endif { socklen_t len; struct sctp_status status; @@ -3614,15 +3438,10 @@ Ptr value; /* option value */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetShutDownSctp ( - CmInetFd *sockFd /* socket file descriptor */ - ) -#else -S16 cmInetShutDownSctp(sockFd) - CmInetFd *sockFd; /* socket file descriptor */ -#endif +CmInetFd *sockFd /* socket file descriptor */ +) { /*cm_inet_c_001.main_58 : fix for klockwork issue */ S32 ret; @@ -3678,19 +3497,13 @@ S16 cmInetShutDownSctp(sockFd) * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetAbortSctpAssoc ( - CmInetFd *sockFd, /* socket file descriptor */ - UConnId assocId /* Association ID */ - ) -#else -S16 cmInetAbortSctpAssoc(sockFd, assocId) - CmInetFd *sockFd; /* socket file descriptor */ - UConnId assocId; /* Association ID */ -#endif +CmInetFd *sockFd, /* socket file descriptor */ +UConnId assocId /* Association ID */ +) { - S32 ret; + S32 ret; struct sctp_sndrcvinfo sndRcvInfo; @@ -3752,17 +3565,11 @@ S16 cmInetAbortSctpAssoc(sockFd, assocId) * */ -#ifdef ANSI S16 cmInetConnect ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *servAddr /* foreign Internet address/port */ ) -#else -S16 cmInetConnect(sockFd, servAddr) - CmInetFd *sockFd; /* socket file descriptor */ - CmInetAddr *servAddr; /* foreign Internet address/port */ -#endif { S32 ret; /* temporary return value */ struct sockaddr_in dstAddr; /* foreign Internet address/port */ @@ -3915,17 +3722,11 @@ S16 cmInetConnect(sockFd, servAddr) * */ -#ifdef ANSI S16 cmInetListen ( CmInetFd *sockFd, /* socket file descriptor */ S16 backLog /* max. number of outstandig connections 0..5 */ ) -#else -S16 cmInetListen(sockFd, backLog) -CmInetFd *sockFd; /* socket file descriptor */ -S16 backLog; /* max. number of outstandig connections 0..5 */ -#endif { S32 ret; /* temporary return value */ @@ -3982,19 +3783,12 @@ S16 backLog; /* max. number of outstandig connections 0..5 */ * */ -#ifdef ANSI S16 cmInetAccept ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *fromAddr, /* calling Internet address/port */ CmInetFd *newSockFd /* socket file descriptor for new connection*/ ) -#else -S16 cmInetAccept(sockFd, fromAddr, newSockFd) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *fromAddr; /* calling Internet address/port */ -CmInetFd *newSockFd; /* socket file descriptor for new connection*/ -#endif { S32 ret; /* temporary return value */ S32 addrLen; /* address structure length */ @@ -4139,19 +3933,12 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ * */ -#ifdef ANSI static S16 cmInet4FillTos ( uint8_t tos, /* tos value to be filled in ipheader */ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx /* idx in cmsgBuf where HBH/Dest ext hdr ends */ ) -#else -static S16 cmInet4FillTos(tos, cmsgBuf, curMsgIdx, protType) -uint8_t tos; /* tos value to be filled in ipheader */ -uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ -uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ -#endif /* ANSI */ { struct cmsghdr *tempHdr; uint8_t len; @@ -4210,7 +3997,6 @@ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ * */ -#ifdef ANSI S16 cmInetSendDscpMsg ( CmInetFd *sockFd, /* socket file descriptor */ @@ -4222,17 +4008,6 @@ MsgLen *len, /* number of actually sent octets */ CmInetIpHdrParm *ipHdrParams, /* IPv6 extensions headers */ S16 flags /* additional control flags, unused */ ) -#else -/* added for IPv6 ext hdr */ -S16 cmInetSendDscpMsg(sockFd, dstAddr, info, mBuf, len, ipHdrParams, flags) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *dstAddr; /* destination Internet address/port */ -CmInetMemInfo *info; /* buffer allocation info */ -Buffer *mBuf; /* buffer structure to send */ -MsgLen *len; /* number of actually sent octets */ -CmInetIpHdrParm *ipHdrParams; /* IPv6 extensions headers */ -S16 flags; /* additional control flags, unused */ -#endif /* ANSI */ { #if (defined(WIN32) || defined(CMINETFLATBUF)) S32 ret; /* temporary return value */ @@ -4708,7 +4483,6 @@ S16 flags; /* additional control flags, unused */ * */ -#ifdef ANSI S16 cmInetSendMsg ( CmInetFd *sockFd, /* socket file descriptor */ @@ -4722,27 +4496,6 @@ CmInetIpHdrParm *ipHdrParams, /* IPv6 extensions headers */ #endif /* IPV6_OPTS_SUPPORTED */ S16 flags /* additional control flags, unused */ ) -#else -/* added for IPv6 ext hdr */ -#ifdef IPV6_OPTS_SUPPORTED -S16 cmInetSendMsg(sockFd, dstAddr, info, mBuf, len, ipHdrParams, flags) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *dstAddr; /* destination Internet address/port */ -CmInetMemInfo *info; /* buffer allocation info */ -Buffer *mBuf; /* buffer structure to send */ -MsgLen *len; /* number of actually sent octets */ -CmInetIpHdrParm *ipHdrParams; /* IPv6 extensions headers */ -S16 flags; /* additional control flags, unused */ -#else -S16 cmInetSendMsg(sockFd, dstAddr, info, mBuf, len, flags) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *dstAddr; /* destination Internet address/port */ -CmInetMemInfo *info; /* buffer allocation info */ -Buffer *mBuf; /* buffer structure to send */ -MsgLen *len; /* number of actually sent octets */ -S16 flags; /* additional control flags, unused */ -#endif /* IPV6_OPTS_SUPPORTED */ -#endif /* ANSI */ { #if (defined(WIN32) || defined(CMINETFLATBUF)) S32 ret; /* temporary return value */ @@ -5203,7 +4956,6 @@ S16 flags; /* additional control flags, unused */ * */ -#ifdef ANSI static S16 cmInet6BuildSendPktinfo ( CmInetIpAddr6 *srcAddr, /* src ip addr to set on outgoing packet */ @@ -5211,13 +4963,6 @@ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx, /* idx in cmsgBuf where HBH/Dest ext hdr ends */ uint8_t protType /* whether IPv4/IPv6 socket */ ) -#else -static S16 cmInet6BuildSendPktinfo(srcAddr, cmsgBuf, curMsgIdx, protType) -CmInetIpAddr6 *srcAddr; /* src ip addr to set on outgoing packet */ -uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ -uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ -uint8_t protType; /* whether IPv4/IPv6 socket */ -#endif /* ANSI */ { struct cmsghdr *tempHdr; struct in6_pktinfo *ipv6Pktinfo; @@ -5320,19 +5065,12 @@ uint8_t protType; /* whether IPv4/IPv6 socket */ * */ -#ifdef ANSI static S16 cmInetBuildSendHoplimit ( uint32_t hoplimit, /* the hoplimit value to be set on outgoing packet */ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx /* idx in cmsgBuf where HBH/Dest ext hdr ends */ ) -#else -static S16 cmInetBuildSendHoplimit(hoplimit, cmsgBuf, curMsgIdx) -uint32_t hoplimit; /* the hoplimit value to be sent on outgoing packet */ -uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ -uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ -#endif /* ANSI */ { struct cmsghdr *tempHdr; uint8_t len; @@ -5390,7 +5128,6 @@ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ * */ -#ifdef ANSI static S16 cmInet6BuildSendHBHOpts ( CmInetIpv6HBHHdrArr *hbhOptsArr,/* IPv6 extensions headers HBH/Dest opts */ @@ -5398,13 +5135,6 @@ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx, /* idx in cmsgBuf where HBH/Dest ext hdr ends */ uint8_t hdrId /* 0: HBH hdr, 1:Dest Hdr */ ) -#else -static S16 cmInet6BuildSendHBHOpts(hbhOptsArr, cmsgBuf, curMsgIdx, hdrId) -CmInetIpv6HBHHdrArr *hbhOptsArr;/* IPv6 extensions headers HBH/Dest opts */ -uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ -uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ -uint8_t hdrId; /* 0: HBH hdr, 1:Dest Hdr */ -#endif { struct cmsghdr *tempHdr; uint8_t len; @@ -5512,19 +5242,12 @@ uint8_t hdrId; /* 0: HBH hdr, 1:Dest Hdr */ * */ -#ifdef ANSI static S16 cmInet6BuildSendRouteOpts ( CmInetIpv6RtHdr *rtOptsArr, /* IPv6 destination options array */ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx /* idx in cmsgBuf where to start building RT hdr */ ) -#else -static S16 cmInet6BuildSendRouteOpts(rtOptsArr, cmsgBuf, curMsgIdx) -CmInetIpv6RtHdr *rtOptsArr; /* IPv6 destination options array */ -uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ -uint32_t *curMsgIdx; /* idx in cmsgBuf where to start building RT hd */ -#endif /* ANSI */ { struct cmsghdr *tempHdr; CmInetIpv6RtHdr0 *tempRtHdr; @@ -5607,7 +5330,6 @@ uint32_t *curMsgIdx; /* idx in cmsgBuf where to start building RT h * */ -#ifdef ANSI static S16 cmInet6BuildRecvHopOptsArr ( uint8_t *cmsgData, /* flat buffer where to build ext hdrs */ @@ -5616,15 +5338,6 @@ CmInetIpv6HBHHdrArr *hbhOptsArr, /* IPv6 extensions headers */ uint8_t hdrId, /* 0: HBH, 1: DEST */ CmInetMemInfo *info /* Memory information */ ) -#else -static S16 cmInet6BuildRecvHopOptsArr(cmsgData, hbhDataLen, hbhOptsArr, hdrId, - info) -uint8_t *cmsgData; /* flat buffer where to build ext hdrs */ -uint32_t hbhDataLen; /* byte len of cmsghdr + hbh ancil data */ -CmInetIpv6HBHHdrArr *hbhOptsArr; /* IPv6 extensions headers */ -uint8_t hdrId; /* 0: HBH, 1: DEST */ -CmInetMemInfo *info; /* Memory information */ -#endif /* ANSI */ { uint32_t curDataIdx; /* to keep track where we are in the hbh Data */ uint8_t optsIdx; /* how many hbh opts present in data */ @@ -5821,7 +5534,6 @@ CmInetMemInfo *info; /* Memory information */ * */ -#ifdef ANSI static S16 cmInet6BuildRecvRtHdr ( uint8_t *cmsgData, /* flat buffer where to build Route hdr */ @@ -5830,14 +5542,6 @@ CmInetIpv6RtHdr0 *rtHdr0, /* rtHeader0 struct that precedes IPV6 addrss */ CmInetIpv6RtHdr *rtOptsArr,/* IPv6 extensions headers */ CmInetMemInfo *info /* Memory information */ ) -#else -static S16 cmInet6BuildRecvRtHdr(cmsgData, rtDataLen, rtHdr0, rtOptsArr, info) -uint8_t *cmsgData; /* flat buffer where to build Route hdr */ -uint32_t rtDataLen; /* byte len of cmsghdr struc+rtHdr ancil data */ -CmInetIpv6RtHdr0 *rtHdr0; /* rtHeader0 struct that precedes IPV6 addrss */ -CmInetIpv6RtHdr *rtOptsArr;/* IPv6 extensions headers */ -CmInetMemInfo *info; /* Memory information */ -#endif /* ANSI */ { uint32_t curDataIdx; /* to keep track where we are in hbh Data */ uint8_t i; /* loop counter */ @@ -5919,19 +5623,12 @@ CmInetMemInfo *info; /* Memory information */ * */ -#ifdef ANSI static S16 cmInet6GetHopLimitValue ( uint8_t *cmsgData, /* flat buffer where to build ext hdrs */ uint32_t hopLimitDataLen, /* byte len of cmsghdr + hbh ancil data */ CmInetIpv6HdrParm *ipv6HdrParam /* ipv6 header parameters */ ) -#else -static S16 cmInet6GetHopLimitValue(cmsgData, hopLimitDataLen, ipv6HdrParam) -uint8_t *cmsgData; /* flat buffer where to build ext hdrs */ -uint32_t hopLimitDataLen; /* byte len of cmsghdr + hbh ancil data */ -CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */ -#endif /* ANSI */ { uint16_t curDataIdx; /* to keep track where we are in the ancillary Data */ uint32_t *hopLimitValue; /* ttl/hoplimit value */ @@ -5985,7 +5682,6 @@ CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetRecvMsg ( CmInetFd *sockFd, /* socket file descriptor */ @@ -6002,51 +5698,6 @@ CmInetLocalInf *localIf, /* local interface on which pkt was recvd */ #endif /* LOCAL_INTF */ S32 flags /* additional control flags */ ) -#else -/* added for IPv6 */ -#ifdef IPV6_OPTS_SUPPORTED -#ifdef LOCAL_INTF -S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, - ipHdrParams, localIf, flags) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *fromAddr; /* sender Internet address/port */ -CmInetMemInfo *info; /* buffer allocation info */ -Buffer **mPtr; /* received buffer structure */ -MsgLen *len; /* number of octets to read */ -CmInetIpHdrParm *ipHdrParams; /* IPv6 extensions headers */ -CmInetLocalInf *localIf; /* local interface on which pkt was recvd */ -S32 flags; /* additional control flags */ -#else -S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, ipHdrParams, flags) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *fromAddr; /* sender Internet address/port */ -CmInetMemInfo *info; /* buffer allocation info */ -Buffer **mPtr; /* received buffer structure */ -MsgLen *len; /* number of octets to read */ -CmInetIpHdrParm *ipHdrParams; /* IPv6 extensions headers */ -S32 flags; /* additional control flags */ -#endif /* LOCAL_INTF */ -#else -#ifdef LOCAL_INTF -S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, localIf, flags) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *fromAddr; /* sender Internet address/port */ -CmInetMemInfo *info; /* buffer allocation info */ -Buffer **mPtr; /* received buffer structure */ -MsgLen *len; /* number of octets to read */ -CmInetLocalInf *localIf; /* local interface on which pkt was recvd */ -S32 flags; /* additional control flags */ -#else -S16 cmInetRecvMsg(sockFd, fromAddr, info, mPtr, len, flags) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *fromAddr; /* sender Internet address/port */ -CmInetMemInfo *info; /* buffer allocation info */ -Buffer **mPtr; /* received buffer structure */ -MsgLen *len; /* number of octets to read */ -S32 flags; /* additional control flags */ -#endif /* LOCAL_INTF */ -#endif /* IPV6_OPTS_SUPPORTED */ -#endif /* ANSI */ { #if (defined(WIN32) || defined(CMINETFLATBUF)) S32 ret; /* temporary return value */ @@ -7063,25 +6714,15 @@ S32 flags; /* additional control flags */ * File: cm_inet.c */ -#ifdef ANSI S16 cmInetPeekNew ( - CmInetFd *sockFd, /* socket file descriptor */ - CmInetAddr *fromAddr, /* sender Internet address/port */ - CmInetMemInfo *info, /* buffer allocation info */ - MsgLen dataPos, /* position of data */ - MsgLen dataLen, /* length of read data */ - Data *data /* read data */ - ) -#else -S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) - CmInetFd *sockFd; /* socket file descriptor */ - CmInetAddr *fromAddr; /* sender Internet address/port */ - CmInetMemInfo *info; /* buffer allocation info */ - MsgLen dataPos; /* position of data */ - MsgLen dataLen; /* length of read data */ - Data *data; /* read data */ -#endif +CmInetFd *sockFd, /* socket file descriptor */ +CmInetAddr *fromAddr, /* sender Internet address/port */ +CmInetMemInfo *info, /* buffer allocation info */ +MsgLen dataPos, /* position of data */ +MsgLen dataLen, /* length of read data */ +Data *data /* read data */ +) { /* cm_inet_c_001.main_57 - Fix for validation and compilation warning */ S32 recvLen; /* number of received octets */ @@ -7244,7 +6885,6 @@ S16 cmInetPeekNew(sockFd, fromAddr, info, dataPos, dataLen, data) * */ -#ifdef ANSI S16 cmInetPeek ( CmInetFd *sockFd, /* socket file descriptor */ @@ -7254,15 +6894,6 @@ MsgLen dataPos, /* position of data */ MsgLen dataLen, /* length of read data */ Data *data /* read data */ ) -#else -S16 cmInetPeek(sockFd, fromAddr, info, dataPos, dataLen, data) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *fromAddr; /* sender Internet address/port */ -CmInetMemInfo *info; /* buffer allocation info */ -MsgLen dataPos; /* position of data */ -MsgLen dataLen; /* length of read data */ -Data *data; /* read data */ -#endif { /* cm_inet_c_001.main_54: Fix for Klockworks issue */ Data *recvBuf = NULLP; /* plain receive buffer */ @@ -7534,15 +7165,10 @@ Data *data; /* read data */ * */ -#ifdef ANSI S16 cmInetClose ( CmInetFd *sockFd /* socket file descriptor */ ) -#else -S16 cmInetClose(sockFd) -CmInetFd *sockFd; /* socket file descriptor */ -#endif { S32 ret; /* temporary return value */ @@ -7607,17 +7233,11 @@ CmInetFd *sockFd; /* socket file descriptor */ * */ -#ifdef ANSI S16 cmInetShutdown ( CmInetFd *sockFd, /* socket file descriptor */ S32 howTo /* operation flag */ ) -#else -S16 cmInetShutdown(sockFd, howTo) -CmInetFd *sockFd; /* socket file descriptor */ -S32 howTo; /* operation flag */ -#endif { S32 ret; /* temporary return value */ @@ -7684,21 +7304,13 @@ S32 howTo; /* operation flag */ * */ -#ifdef ANSI S16 cmInetSelect ( CmInetFdSet *readFdS, /* read socket descriptor file set */ CmInetFdSet *writeFdS, /* write socket descriptor file set */ -uint32_t *mSecTimeout, /* timeout in msecs */ +uint32_t *mSecTimeout, /* timeout in msecs */ S16 *numFdS /* number of ready descriptors */ ) -#else -S16 cmInetSelect(readFdS, writeFdS, mSecTimeout, numFdS) -CmInetFdSet *readFdS; /* read socket descriptor file set */ -CmInetFdSet *writeFdS; /* write socket descriptor file set */ -uint32_t *mSecTimeout; /* timeout in msecs */ -S16 *numFdS; /* number of ready descriptors */ -#endif { S32 ret; /* temporary return value */ struct timeval timeout; /* timeout structure */ @@ -7936,21 +7548,13 @@ S16 *numFdS; /* number of ready descriptors */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetSetOpt ( CmInetFd *sockFd, /* socket file descriptor */ -uint32_t level, /* option level */ -uint32_t type, /* option type */ -Ptr value /* option value */ +uint32_t level, /* option level */ +uint32_t type, /* option type */ +Ptr value /* option value */ ) -#else -S16 cmInetSetOpt(sockFd, level, type, value) -CmInetFd *sockFd; /* socket file descriptor */ -uint32_t level; /* option level */ -uint32_t type; /* option type */ -Ptr value; /* option value */ -#endif { S32 ret = ROK; /* temporary return value */ uint32_t disable = 0; /* disable option */ @@ -8912,19 +8516,12 @@ Ptr value; /* option value */ * */ -#ifdef ANSI S16 cmInetGetNumRead ( CmInetFd *sockFd, /* socket file descriptor */ uint32_t *dataLen /* number of pending octets */ /* removed 3rd argument memInfo */ ) -#else -S16 cmInetGetNumRead(sockFd, dataLen) -CmInetFd *sockFd; /* socket file descriptor */ -uint32_t *dataLen; /* number of pending octets */ -/* removed 3rd argument memInfo */ -#endif { S32 ret; /* temporary return value */ @@ -9042,17 +8639,11 @@ uint32_t *dataLen; /* number of pending octets */ * */ -#ifdef ANSI S16 cmInetGetHostByName ( S8 *hostName, /* host name */ CmInetIpAddrTbl *addrTbl /* Address Table of IPV4 Addresses */ ) -#else -S16 cmInetGetHostByName (hostName, addrTbl) -S8 *hostName; /* host name */ -CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ -#endif { #ifndef SS_VW uint8_t numAddrs; /* Number of Addresses */ @@ -9200,17 +8791,11 @@ CmInetIpAddrTbl *addrTbl; /* Address Table of IPV4 Addresses */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetGetIpNodeByName ( S8 *hostName, /* host name */ CmInetIpAddrArr *addrArr /* Array of addressed filled in */ ) -#else -S16 cmInetGetIpNodeByName(hostName, addrArr) -S8 *hostName; /* host name */ -CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ -#endif { /* for return value from cmInetGetHostByName */ #ifndef IPV6_SUPPORTED @@ -9342,16 +8927,10 @@ CmInetIpAddrArr *addrArr; /* Array of addressed filled in */ * */ -#ifdef ANSI S16 cmInetAddr( S8 *asciiAddr, /* ascii address representation */ CmInetIpAddr *address /* 4 byte interent address */ ) -#else -S16 cmInetAddr(asciiAddr, address) -S8 *asciiAddr; /* ascii address representation */ -CmInetIpAddr *address; /* 4 byte interent address */ -#endif { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -9392,16 +8971,10 @@ CmInetIpAddr *address; /* 4 byte interent address */ * */ -#ifdef ANSI S16 cmInetNtoa( CmInetIpAddr address, /* 4 byte interent address */ S8 **asciiAddr /* ascii address representation */ ) -#else -S16 cmInetNtoa(address, asciiAddr) -CmInetIpAddr address; /* 4 byte interent address */ -S8 **asciiAddr; /* ascii address representation */ -#endif { struct in_addr inetAddr; /* internet address structure */ @@ -9442,20 +9015,12 @@ S8 **asciiAddr; /* ascii address representation */ * */ -#ifdef ANSI S16 cmInetNtop( uint8_t type, /* ip address type */ Void *address, /* 4/16 byte interent address */ S8 *asciiAddr, /* ascii adress representation */ uint32_t len ) -#else -S16 cmInetNtop(type,address, asciiAddr,len) -uint8_t type; /* ip address type */ -Void *address; /* 4/16 byte interent address */ -S8 *asciiAddr; /* ascii adress representation */ -uint32_t len; -#endif { S32 domain = 0; @@ -9508,16 +9073,10 @@ uint32_t len; * */ -#ifdef ANSI S16 cmInetPton( CmInetIpAddr *address, /* 4 byte interent address */ S8 *asciiAddr /* ascii address representation */ ) -#else -S16 cmInetPton(address, asciiAddr) -CmInetIpAddr *address; /* 4 byte interent address */ -S8 *asciiAddr; /* ascii address representation */ -#endif { S16 ret; @@ -9558,16 +9117,10 @@ S8 *asciiAddr; /* ascii address representation */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetPton6( CmInetIpAddr6 *address6, /* 16 byte interent address */ S8 *asciiAddr /* ascii address representation */ ) -#else -S16 cmInetPton6(address6, asciiAddr) -CmInetIpAddr6 *address6; /* 16 byte interent address */ -S8 *asciiAddr; /* ascii address representation */ -#endif { S16 ret; @@ -9618,14 +9171,9 @@ S8 *asciiAddr; /* ascii address representation */ * */ -#ifdef ANSI S16 cmInetGetMemSize( S32 *size /* max used memory size */ ) -#else -S16 cmInetGetMemSize(size) -S32 *size; /* max used memory size */ -#endif { #ifdef WIN32 /* max static memory size depends on max flat buffer size */ @@ -9654,13 +9202,7 @@ S32 *size; /* max used memory size */ * */ -#ifdef ANSI -S16 cmInetInit( -Void -) -#else S16 cmInetInit(Void) -#endif { #ifdef WIN32 uint16_t version; @@ -9696,13 +9238,7 @@ S16 cmInetInit(Void) * */ -#ifdef ANSI -S16 cmInetDeInit( -Void -) -#else S16 cmInetDeInit(Void) -#endif { #ifdef WIN32 S32 err; @@ -9737,17 +9273,11 @@ S16 cmInetDeInit(Void) * */ -#ifdef ANSI S16 cmInetGetSockName ( CmInetFd *sockFd, /* socket file descriptor */ CmInetAddr *locAddr ) -#else -S16 cmInetGetSockName(sockFd, locAddr) -CmInetFd *sockFd; /* socket file descriptor */ -CmInetAddr *locAddr; -#endif { struct sockaddr_in *sockAddr; #ifdef IPV6_SUPPORTED @@ -9868,15 +9398,10 @@ CmInetAddr *locAddr; * */ -#ifdef ANSI S16 cmInetFdSetInfoInit ( CmInetFdSetInfo *fdSetInfo ) -#else -S16 cmInetFdSetInfoInit(fdSetInfo) -CmInetFdSetInfo *fdSetInfo; -#endif { #if (defined(SUNOS) || defined(SS_LINUX) || defined(SS_VW) || defined(HPOS)) uint16_t arIdx; @@ -9963,19 +9488,12 @@ CmInetFdSetInfo *fdSetInfo; * */ -#ifdef ANSI S16 cmInetGetFd ( CmInetFdSetInfo *fdSetInfo, CmInetFdSet *fdSet, CmInetFdType *sockFd ) -#else -S16 cmInetGetFd(fdSetInfo, fdSet, sockFd) -CmInetFdSetInfo *fdSetInfo; -CmInetFdSet *fdSet; -CmInetFdType *sockFd; -#endif { /*cm_inet_c_001.main_58 : Fix for klockwork issue */ #if (!defined (WIN32)) @@ -10100,19 +9618,12 @@ CmInetFdType *sockFd; * */ -#ifdef ANSI S16 cmInetConvertStrToIpAddr ( uint16_t len, /* Length of IP address */ uint8_t *val, /* Domain Name String */ CmInetNetAddr *address /* IP Address */ ) -#else -S16 cmInetConvertStrToIpAddr(len, val, address) -uint16_t len; /* Length of IP address */ -uint8_t *val; /* Domain Name String */ -CmInetNetAddr *address; /* IP Address */ -#endif { uint8_t idx; /* Index for string*/ uint8_t ipv4[CM_INET_IPV4ADDR_SIZE]; /* IPV4 Address bytes */ @@ -10322,24 +9833,16 @@ CmInetNetAddr *address; /* IP Address */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetAsciiToIpv4 ( -uint8_t numBytes, /* number of Byte to convert */ -uint8_t *ipv4Addr, /* IPV4 Address */ -uint16_t len, /* Length of IP address */ -uint8_t *val /* Domain Name String */ +uint8_t numBytes, /* number of Byte to convert */ +uint8_t *ipv4Addr, /* IPV4 Address */ +uint16_t len, /* Length of IP address */ +uint8_t *val /* Domain Name String */ ) -#else -S16 cmInetAsciiToIpv4(numBytes, ipv4Addr, len, val) -uint8_t numBytes; /* number of Byte to convert */ -uint8_t *ipv4Addr; /* IPV4 Address */ -uint16_t len; /* Length of IP address */ -uint8_t *val; /* Domain Name String */ -#endif { - uint8_t byteCount; /* Byte Count */ - uint8_t idx; /* Index for string*/ + uint8_t byteCount; /* Byte Count */ + uint8_t idx; /* Index for string*/ idx = 0; @@ -10385,7 +9888,6 @@ uint8_t *val; /* Domain Name String */ * */ -#ifdef ANSI S32 cmInetGetAddrInfo ( const S8 *node, /* Network addr which has to be resolved */ @@ -10393,13 +9895,6 @@ const S8 *service, /* Sets the port number in network addr */ const CmInetAddrInfo *hints, /* Specifies preferred socket type or protocol */ CmInetAddrInfo **res /* Link list of addrInfo structure */ ) -#else -S32 cmInetGetAddrInfo(node,service,hints,res) -const S8 *node; /* Network addr which has to be resolved */ -const S8 *service; /* Sets the port number in network addr */ -const CmInetAddrInfo *hints; /* Specifies preferred socket type or protocol */ -CmInetAddrInfo **res; /* Link list of addrInfo structure */ -#endif { S32 ret; ret = ROK; @@ -10449,15 +9944,10 @@ CmInetAddrInfo **res; /* Link list of addrInfo structure */ * */ -#ifdef ANSI Void cmInetFreeAddrInfo ( -CmInetAddrInfo *res /* Link list of addrInfo structure */ +CmInetAddrInfo *res /* Link list of addrInfo structure */ ) -#else -Void cmInetFreeAddrInfo(res) -CmInetAddrInfo *res; /* Link list of addrInfo structure */ -#endif { #if (ERRCLASS & ERRCLS_INT_PAR) @@ -10493,19 +9983,12 @@ CmInetAddrInfo *res; /* Link list of addrInfo structure */ * File: cm_inet.c * */ -#ifdef ANSI S16 cmInetFlushRecvBuf ( CmInetFd *sockFd, /* socket file descriptor */ MsgLen *len, /* number of octects to be flushed */ S32 flags /* additional control flags */ ) -#else -S16 cmInetFlushRecvBuf(sockFd, len, flags) -CmInetFd *sockFd; /* socket file descriptor */ -MsgLen *len; /* number of octects to be flushed */ -S32 flags; /* additional control flags */ -#endif /* ANSI */ { Data recvTempBuf[CM_INET_MAX_BYTES_READ]; diff --git a/src/cm/cm_lib.c b/src/cm/cm_lib.c index 8503d8549..2dd32569c 100644 --- a/src/cm/cm_lib.c +++ b/src/cm/cm_lib.c @@ -196,19 +196,7 @@ Size regMemSize; * File: cm_lib.c * */ -#ifdef ANSI -uint8_t *cmMemcpy -( -uint8_t *tgt, -const uint8_t *src, -PTR len -) -#else -uint8_t *cmMemcpy(tgt, src, len) -uint8_t *tgt; -const uint8_t *src; -PTR len; -#endif +uint8_t *cmMemcpy(uint8_t *tgt,const uint8_t *src,PTR len) { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ @@ -261,19 +249,7 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize))) * File: cm_lib.c * */ -#ifdef ANSI -S16 cmMemcmp -( -const uint8_t *s1, -const uint8_t *s2, -PTR len -) -#else -S16 cmMemcmp (s1, s2, len) -const uint8_t *s1; -const uint8_t *s2; -PTR len; -#endif +S16 cmMemcmp(const uint8_t *s1,const uint8_t *s2,PTR len) { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #if MEMCMP_AVAIL /* memcmp is available */ @@ -309,19 +285,7 @@ PTR len; * File: cm_lib.c * */ -#ifdef ANSI -uint8_t *cmMemset -( -uint8_t *str, -uint8_t val, -PTR len -) -#else -uint8_t *cmMemset(str, val, len) -uint8_t *str; -uint8_t val; -PTR len; -#endif +uint8_t *cmMemset(uint8_t *str,uint8_t val,PTR len) { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #if MS_MBUF_CORRUPTION /* checking for valid memory address */ @@ -387,17 +351,7 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize))) * File: cm_lib.c * */ -#ifdef ANSI -S16 cmStrcmp -( -const uint8_t *s1, -const uint8_t *s2 -) -#else -S16 cmStrcmp (s1, s2) -const uint8_t *s1; -const uint8_t *s2; -#endif +S16 cmStrcmp(const uint8_t *s1,const uint8_t *s2) { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #if (STRCMP_AVAIL) @@ -451,19 +405,12 @@ const uint8_t *s2; * File: cm_lib.c * */ -#ifdef ANSI S16 cmStrncmp ( const uint8_t *s1, const uint8_t *s2, MsgLen len /* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/ ) -#else -S16 cmStrncmp (s1, s2, len) -const uint8_t *s1; -const uint8_t *s2; -MsgLen len; -#endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #if (STRNCMP_AVAIL) @@ -505,16 +452,7 @@ MsgLen len; * File: cm_lib.c * */ -#ifdef ANSI -MsgLen cmStrlen -( -const uint8_t *s -) -#else -/* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/ -MsgLen cmStrlen (s) -const uint8_t *s; -#endif +MsgLen cmStrlen(const uint8_t *s) { #if (STRLEN_AVAIL) /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/ diff --git a/src/cm/cm_llist.c b/src/cm/cm_llist.c index e9f070d09..1cc4092aa 100644 --- a/src/cm/cm_llist.c +++ b/src/cm/cm_llist.c @@ -60,15 +60,10 @@ * File: cm_llist.c * */ -#ifdef ANSI Void cmLListInit ( CmLListCp *lCp /* list control point */ ) -#else -Void cmLListInit(lCp) -CmLListCp *lCp; /* list control point */ -#endif { lCp->first = (CmLList *)NULLP; @@ -95,17 +90,11 @@ CmLListCp *lCp; /* list control point */ * File: cm_llist.c * */ -#ifdef ANSI Void cmLListAdd2Head ( CmLListCp *lCp, /* list control point */ CmLList *node /* node to be added */ ) -#else -Void cmLListAdd2Head(lCp, node) -CmLListCp *lCp; /* list control point */ -CmLList *node; /* node to be added */ -#endif { #ifdef ERRCHK @@ -143,17 +132,11 @@ CmLList *node; /* node to be added */ * File: cm_llist.c * */ -#ifdef ANSI Void cmLListAdd2Tail ( CmLListCp *lCp, /* list control point */ CmLList *node /* node to be added */ ) -#else -Void cmLListAdd2Tail(lCp, node) -CmLListCp *lCp; /* list control point */ -CmLList *node; /* node to be added */ -#endif { #ifdef ERRCHK @@ -191,17 +174,11 @@ CmLList *node; /* node to be added */ * File: cm_llist.c * */ -#ifdef ANSI Void cmLListInsCrnt ( CmLListCp *lCp, /* list control point */ CmLList *node /* node to be added */ ) -#else -Void cmLListInsCrnt(lCp, node) -CmLListCp *lCp; /* list control point */ -CmLList *node; /* node to be added */ -#endif { #ifdef ERRCHK @@ -245,17 +222,11 @@ CmLList *node; /* node to be added */ * File: cm_llist.c * */ -#ifdef ANSI Void cmLListInsAfterCrnt ( CmLListCp *lCp, /* list control point */ CmLList *node /* node to be added */ ) -#else -Void cmLListInsAfterCrnt(lCp, node) -CmLListCp *lCp; /* list control point */ -CmLList *node; /* node to be added */ -#endif { #ifdef ERRCHK @@ -301,17 +272,11 @@ CmLList *node; /* node to be added */ * File: cm_llist.c * */ -#ifdef ANSI CmLList *cmLListDelFrm ( CmLListCp *lCp, /* list control pointer */ CmLList *node /* node to be removed */ ) -#else -CmLList *cmLListDelFrm(lCp, node) -CmLListCp *lCp; /* list control pointer */ -CmLList *node; /* node to be removed */ -#endif { #ifdef ERRCHK @@ -370,17 +335,11 @@ CmLList *node; /* node to be removed */ * File: cm_llist.c * --*/ -#ifdef ANSI Void cmLListCatLList ( - CmLListCp *list1, /*-- list control point --*/ - CmLListCp *list2 /*-- node to be added --*/ - ) -#else -Void cmLListCatLList(list1, list2) - CmLListCp *list1; /*-- list control point --*/ - CmLListCp *list2; /*-- node to be added --*/ -#endif +CmLListCp *list1, /*-- list control point --*/ +CmLListCp *list2 /*-- node to be added --*/ +) { /*-- if the second list is empty nothing to do --*/ diff --git a/src/cm/cm_lte.c b/src/cm/cm_lte.c index 8a08904cb..3c8e706f7 100755 --- a/src/cm/cm_lte.c +++ b/src/cm/cm_lte.c @@ -88,17 +88,7 @@ uint32_t cmLteTime; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkLteRlcId -( -CmLteRlcId *param, -Buffer *mBuf -) -#else -S16 cmPkLteRlcId(param, mBuf) -CmLteRlcId *param; -Buffer *mBuf; -#endif +S16 cmPkLteRlcId(CmLteRlcId *param,Buffer *mBuf) { @@ -126,17 +116,7 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkLteRlcId -( -CmLteRlcId *param, -Buffer *mBuf -) -#else -S16 cmUnpkLteRlcId(param, mBuf) -CmLteRlcId *param; -Buffer *mBuf; -#endif +S16 cmUnpkLteRlcId(CmLteRlcId *param,Buffer *mBuf) { @@ -164,17 +144,7 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkLteTimingInfo -( -CmLteTimingInfo *param, -Buffer *mBuf -) -#else -S16 cmPkLteTimingInfo(param, mBuf) -CmLteTimingInfo *param; -Buffer *mBuf; -#endif +S16 cmPkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf) { @@ -201,17 +171,7 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkLteTimingInfo -( -CmLteTimingInfo *param, -Buffer *mBuf -) -#else -S16 cmUnpkLteTimingInfo(param, mBuf) -CmLteTimingInfo *param; -Buffer *mBuf; -#endif +S16 cmUnpkLteTimingInfo(CmLteTimingInfo *param,Buffer *mBuf) { @@ -238,17 +198,7 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmPkLtePdcpId -( -CmLtePdcpId *param, -Buffer *mBuf -) -#else -S16 cmPkLtePdcpId(param, mBuf) -CmLtePdcpId *param; -Buffer *mBuf; -#endif +S16 cmPkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf) { @@ -276,17 +226,7 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI -S16 cmUnpkLtePdcpId -( -CmLtePdcpId *param, -Buffer *mBuf -) -#else -S16 cmUnpkLtePdcpId(param, mBuf) -CmLtePdcpId *param; -Buffer *mBuf; -#endif +S16 cmUnpkLtePdcpId(CmLtePdcpId *param,Buffer *mBuf) { @@ -297,15 +237,7 @@ Buffer *mBuf; return ROK; } #ifdef LTE_L2_MEAS -#ifdef ANSI -S16 cmUpdateSsiMemInfo -( -CmLteMemInfo *mInfo -) -#else -S16 cmUpdateSsiMemInfo(mInfo) -CmLteMemInfo *mInfo; -#endif +S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo) { uint8_t numReg = 0; uint8_t numPool = 0; @@ -349,17 +281,7 @@ CmLteMemInfo *mInfo; return ROK; } -#ifdef ANSI -S16 cmFillMemUtilizationMeas -( - CmLteMemInfo *memoryInfo, -CmLteMemInfo *memInfo -) -#else -S16 cmFillMemUtilizationMeas(memoryInfo,memInfo) -CmLteMemInfo *memoryInfo; -CmLteMemInfo *memInfo; -#endif +S16 cmFillMemUtilizationMeas( CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo) { uint8_t idxReg = 0; uint8_t idxPool = 0; @@ -384,15 +306,7 @@ CmLteMemInfo *memInfo; return ROK; } -#ifdef ANSI -S16 cmClearMemUtilizationCounter -( -CmLteMemInfo *memInfo -) -#else -S16 cmClearMemUtilizationCounter(memInfo) -CmLteMemInfo *memInfo; -#endif +S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo) { uint8_t idxReg = 0; uint8_t idxPool = 0; @@ -416,15 +330,7 @@ CmLteMemInfo *memInfo; return ROK; } -#ifdef ANSI -S16 cmClearCpuUtilizationCounter -( -CmCpuStatsInfo *cpuInfo -) -#else -S16 cmClearCpuUtilizationCounter(cpuInfo) -CmCpuStatsInfo *cpuInfo -#endif +S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo) { uint8_t idx= 0; for(idx=0; idx < cpuInfo->numCores; idx++) @@ -437,17 +343,7 @@ CmCpuStatsInfo *cpuInfo return ROK; } -#ifdef ANSI -S16 cmFillCpuUtilizationMeas -( -CmLteCpuInfo *cpuMeasInfo, -CmCpuStatsInfo *cpuInfo -) -#else -S16 cmFillCpuUtilizationMeas(cpuMeasInfo,cpuInfo) -CmLteCpuInfo *cpuMeasInfo; -CmCpuStatsInfo *cpuInfo; -#endif +S16 cmFillCpuUtilizationMeas(CmLteCpuInfo *cpuMeasInfo,CmCpuStatsInfo *cpuInfo) { uint8_t idx= 0; cpuMeasInfo->numCores = cpuInfo->numCores; diff --git a/src/cm/cm_math.c b/src/cm/cm_math.c index 052043c9c..3a2e272da 100755 --- a/src/cm/cm_math.c +++ b/src/cm/cm_math.c @@ -61,15 +61,7 @@ * File: cm_math.c * */ -#ifdef ANSI -uint32_t cmAbs -( -F64 val -) -#else -uint32_t cmAbs(val) -F64 val; -#endif +uint32_t cmAbs(F64 val) { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) return ((uint32_t) abs((int) val));/* G++ */ @@ -92,17 +84,7 @@ F64 val; * File: cm_math.c * */ -#ifdef ANSI -F64 cmPow -( -F64 x, -F64 y -) -#else -F64 cmPow(x, y) -F64 x; -F64 y; -#endif +F64 cmPow(F64 x,F64 y) { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) return ((F64) pow((F64)x, (F64)y)); @@ -125,15 +107,7 @@ F64 y; * File: cm_math.c * */ -#ifdef ANSI -F64 cmFloor -( -F64 x -) -#else -F64 cmFloor(x) -F64 x; -#endif +F64 cmFloor(F64 x) { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) return ((F64) floor((F64)x)); @@ -156,15 +130,7 @@ F64 x; * File: cm_math.c * */ -#ifdef ANSI -F64 cmLog -( -F64 x -) -#else -F64 cmLog(x) -F64 x; -#endif +F64 cmLog(F64 x) { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) return ((F64) log((F64)x)); @@ -187,15 +153,7 @@ F64 x; * File: cm_math.c * */ -#ifdef ANSI -F64 cmLog10 -( -F64 x -) -#else -F64 cmLog10(x) -F64 x; -#endif +F64 cmLog10(F64 x) { #if (defined(SUNOS)|| defined(WIN32)|| defined(WIN2K)|| defined (SS_LINUX)) return ((F64) log10((F64)x)); diff --git a/src/cm/cm_mblk.c b/src/cm/cm_mblk.c index fe78a73d0..630c62cf9 100644 --- a/src/cm/cm_mblk.c +++ b/src/cm/cm_mblk.c @@ -83,7 +83,6 @@ static Void cmAddMemNode ARGS((CmMemListCp *lCp,CmMemList *node)); * */ -#ifdef ANSI S16 cmAllocEvnt ( Size evntSize, /* Size of the Event structure */ @@ -91,13 +90,6 @@ Size maxBlkSize, /* Chunk Memory size */ Mem *sMem, /* Static memory region and pool */ Ptr *ptr /* Location to place allocated event ptr */ ) -#else -S16 cmAllocEvnt (evntSize,maxBlkSize,sMem,ptr) -Size evntSize; /* Size of the Event structure */ -Size maxBlkSize; /* Memory size requested */ -Mem *sMem; /* Static Memory region and pool */ -Ptr *ptr; /* Location to place allocated event ptr */ -#endif { Data *allocPtr; /* Allocated Memory Pointer */ @@ -199,22 +191,14 @@ Ptr *ptr; /* Location to place allocated event ptr */ * */ -#ifdef ANSI Void cmInitMemCp ( CmMemListCp *memCp, /* Memory control pointer */ Size maxBlkSize, /* Chunk Memory size */ Mem *sMem /* Static memory region and pool */ ) -#else -Void cmInitMemCp (memCp,maxBlkSize,sMem) -CmMemListCp *memCp; /* Memory control pointer */ -Size maxBlkSize; /* Memory size requested */ -Mem *sMem; /* Static Memory region and pool */ -#endif { - /* Intialise Memory Control Point */ CM_INIT_MEMCP(memCp,maxBlkSize,sMem); @@ -238,19 +222,12 @@ Mem *sMem; /* Static Memory region and pool */ * */ -#ifdef ANSI S16 cmGetMem ( Ptr memPtr, /* Pointer to memCp */ Size size, /* Memory size requested */ Ptr *allocPtr /* location to place pointer */ ) -#else -S16 cmGetMem (memPtr,size,allocPtr) -Ptr memPtr; /* Pointer to memCp */ -Size size; /* Memory size requested */ -Ptr *allocPtr; /* location to place pointer */ -#endif { CmMemCb *cb; /* Pointer to Memory Control Block */ @@ -356,7 +333,6 @@ Ptr *allocPtr; /* location to place pointer */ * */ -#ifdef ANSI S16 cmAllocEvntNoInit ( Size evntSize, /* Size of the Event structure */ @@ -364,13 +340,6 @@ Size maxBlkSize, /* Chunk Memory size */ Mem *sMem, /* Static memory region and pool */ Ptr *ptr /* Location to place allocated event ptr */ ) -#else -S16 cmAllocEvntNoInit (evntSize,maxBlkSize,sMem,ptr) -Size evntSize; /* Size of the Event structure */ -Size maxBlkSize; /* Memory size requested */ -Mem *sMem; /* Static Memory region and pool */ -Ptr *ptr; /* Location to place allocated event ptr */ -#endif { Data *allocPtr; /* Allocated Memory Pointer */ @@ -459,19 +428,12 @@ Ptr *ptr; /* Location to place allocated event ptr */ * */ -#ifdef ANSI S16 cmGetMemNoInit ( Ptr memPtr, /* Pointer to memCp */ Size size, /* Memory size requested */ Ptr *allocPtr /* location to place pointer */ ) -#else -S16 cmGetMemNoInit (memPtr,size,allocPtr) -Ptr memPtr; /* Pointer to memCp */ -Size size; /* Memory size requested */ -Ptr *allocPtr; /* location to place pointer */ -#endif { CmMemCb *cb; /* Pointer to Memory Control Block */ @@ -578,15 +540,10 @@ Ptr *allocPtr; /* location to place pointer */ * */ -#ifdef ANSI Void cmFreeMem ( Ptr memPtr /* Link List CP */ ) -#else -Void cmFreeMem (memPtr) -Ptr memPtr; /* Link List CP */ -#endif { Mem sMem; /* Static Memory region and pool */ S32 count; /* Count of linked blocks */ @@ -650,17 +607,11 @@ Ptr memPtr; /* Link List CP */ * File: cm_mblk.c * */ -#ifdef ANSI static Void cmAddMemNode ( CmMemListCp *lCp, /* list control point */ CmMemList *node /* node to be added */ ) -#else -static Void cmAddMemNode (lCp, node) -CmMemListCp *lCp; /* list control point */ -CmMemList *node; /* node to be added */ -#endif { lCp->count++; @@ -697,17 +648,11 @@ CmMemList *node; /* node to be added */ * */ -#ifdef ANSI Void cmGetMemStatus ( Ptr memPtr, /* Memory control pointer */ CmMemStatus *status /* memory region,pool and status */ ) -#else -Void cmGetMemStatus (memPtr,status) -Ptr memPtr; /* Memory control pointer */ -CmMemStatus *status; /* memory region,pool and status */ -#endif { CmMemListCp *memCp; /* Memory Link List */ diff --git a/src/cm/cm_mem.c b/src/cm/cm_mem.c index 6bda4fb99..4ef65d623 100755 --- a/src/cm/cm_mem.c +++ b/src/cm/cm_mem.c @@ -461,23 +461,11 @@ uint32_t cmDblFreeAttempts = 0; * File: cm_mem.c * */ -#ifdef ANSI -S16 cmMmRegInit -( -Region region, -CmMmRegCb *regCb, -CmMmRegCfg *cfg -) -#else -S16 cmMmRegInit(region, regCb, cfg) -Region region; -CmMmRegCb *regCb; -CmMmRegCfg *cfg; -#endif +S16 cmMmRegInit(Region region,CmMmRegCb *regCb,CmMmRegCfg *cfg) { Data *memAddr; - uint16_t bktIdx; - uint16_t lstMapIdx; + uint16_t bktIdx; + uint16_t lstMapIdx; #if (ERRCLASS & ERRCLS_INT_PAR) Size lstQnSize; @@ -797,15 +785,7 @@ CmMmRegCfg *cfg; * File: cm_mem.c * */ -#ifdef ANSI -S16 cmMmRegDeInit -( -CmMmRegCb *regCb -) -#else -S16 cmMmRegDeInit(regCb) -CmMmRegCb *regCb; -#endif +S16 cmMmRegDeInit(CmMmRegCb *regCb) { uint16_t bktIdx; @@ -927,144 +907,82 @@ int regFreeBktSts[10][2][6]={{0}}; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmAlloc ( -Void *regionCb, -Size *size, +Void *regionCb, +Size *size, uint32_t flags, -Data **ptr, +Data **ptr, uint32_t memType, uint32_t line, uint8_t *fileName, uint8_t entId, -Bool hstReg +Bool hstReg ) #else -static S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif -#else -#ifdef ANSI static S16 cmAlloc ( -Void *regionCb, -Size *size, +Void *regionCb, +Size *size, uint32_t flags, -Data **ptr, +Data **ptr, uint32_t line, -uint8_t *fileName, +uint8_t *fileName, uint8_t entId, -Bool hstReg +Bool hstReg ) -#else -static S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif #endif /* SSI_DEBUG_LEVEL1 */ #else #ifdef SS_LIGHT_MEM_LEAK_STS -#ifdef ANSI static S16 cmAlloc ( -Void *regionCb, -Size *size, +Void *regionCb, +Size *size, uint32_t flags, -Data **ptr, +Data **ptr, uint32_t memType, uint32_t lineNo, -uint8_t *funcName +uint8_t *funcName ) -#else -static S16 cmAlloc(regionCb, size, flags, ptr ,memType, lineNo, funcName) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -uint32_t lineNo; -uint8_t *funcName; -#endif #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmAlloc ( -Void *regionCb, -Size *size, +Void *regionCb, +Size *size, uint32_t flags, -Data **ptr, +Data **ptr, uint32_t memType ) #else -static S16 cmAlloc(regionCb, size, flags, ptr, memType) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -#endif -#else #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmAlloc ( -Void *regionCb, -Size *size, +Void *regionCb, +Size *size, uint32_t flags, -Data **ptr, +Data **ptr, uint32_t memType ) #else -static S16 cmAlloc(regionCb, size, flags, ptr, memType) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -#endif -#else #ifdef T2K_MEM_LEAK_DBG static S16 cmAlloc ( - Void *regionCb, - Size *size, + Void *regionCb, + Size *size, uint32_t flags, - Data **ptr , - char* file, - uint32_t line + Data **ptr, + char* file, + uint32_t line ) #else -#ifdef ANSI static S16 cmAlloc ( -Void *regionCb, -Size *size, +Void *regionCb, +Size *size, uint32_t flags, -Data **ptr +Data **ptr ) -#else -static S16 cmAlloc(regionCb, size, flags, ptr) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -#endif #endif #endif /* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -1075,7 +993,7 @@ Data **ptr; { /* cm_mem_c_001.main_26 : Fixes for Compilation Warnings */ #ifndef USE_PURE - uint16_t idx; + uint16_t idx; CmMmBkt *bkt; #endif CmMmRegCb *regCb; @@ -1609,71 +1527,44 @@ Data **prevptr; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_LIGHT_MEM_LEAK_STS -#ifdef ANSI static S16 cmFree ( -Void *regionCb, -Data *ptr, -Size size, -uint32_t lineNo, -uint8_t *funcName +Void *regionCb, +Data *ptr, +Size size, +uint32_t lineNo, +uint8_t *funcName ) -#else -static S16 cmFree(regionCb, ptr, size, lineNo, funcName) -Void *regionCb; -Data *ptr; -Size size; -uint32_t lineNo; -uint8_t *funcName; -#endif #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI static S16 cmFree ( -Void *regionCb, -Data *ptr, -Size size, -uint32_t line, -uint8_t *fileName, -uint8_t entId, -Bool hstReg +Void *regionCb, +Data *ptr, +Size size, +uint32_t line, +uint8_t *fileName, +uint8_t entId, +Bool hstReg ) -#else -static S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) -Void *regionCb; -Data *ptr; -Size size; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif #else #ifdef T2K_MEM_LEAK_DBG static S16 cmFree ( - Void *regionCb, - Data *ptr, - Size size, - char* file, - uint32_t line +Void *regionCb, +Data *ptr, +Size size, +char* file, +uint32_t line ) #else /* T2K_MEM_LEAK_DBG */ -#ifdef ANSI static S16 cmFree ( Void *regionCb, Data *ptr, Size size ) -#else -static S16 cmFree(regionCb, ptr, size) -Void *regionCb; -Data *ptr; -Size size; -#endif #endif /* cm_mem_c_001.main_15 : Additions */ #endif /* SS_HISTOGRAM_SUPPORT */ @@ -2245,62 +2136,34 @@ Size size; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI S16 cmAllocNL ( Void *regionCb, Size *size, -uint32_t flags, +uint32_t flags, Data **ptr, -uint32_t memType, -uint32_t line, -uint8_t *fileName, -uint8_t entId, +uint32_t memType, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -S16 cmAllocNL(regionCb, size, flags, ptr, memType, - line, fileName, entId, hstReg) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif -#else -#ifdef ANSI S16 cmAllocNL ( Void *regionCb, Size *size, -uint32_t flags, +uint32_t flags, Data **ptr, -uint32_t line, -uint8_t *fileName, -uint8_t entId, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) -#else -S16 cmAllocNL(regionCb, size, flags, ptr, line, - fileName, entId, hstReg) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif #endif /* SSI_DEBUG_LEVEL1 */ #else #ifdef SS_LIGHT_MEM_LEAK_STS -#ifdef ANSI S16 cmAllocNL ( Void *regionCb, @@ -2311,38 +2174,18 @@ uint32_t memType, uint32_t lineNo, uint8_t *funcName ) -#else -S16 cmAllocNL(regionCb, size, flags, ptr ,memType, lineNo, funcName) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -uint32_t lineNo; -uint8_t *funcName; -#endif #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI S16 cmAllocNL ( Void *regionCb, Size *size, -uint32_t flags, +uint32_t flags, Data **ptr, -uint32_t memType +uint32_t memType ) #else -S16 cmAllocNL(regionCb, size, flags, ptr, memType) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -#endif -#else #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 -#ifdef ANSI S16 cmAllocNL ( Void *regionCb, @@ -2352,15 +2195,6 @@ Data **ptr, uint32_t memType ) #else -S16 cmAllocNL(regionCb, size, flags, ptr, memType) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -#endif -#else -#ifdef ANSI S16 cmAllocNL ( Void *regionCb, @@ -2368,13 +2202,6 @@ Size *size, uint32_t flags, Data **ptr ) -#else -S16 cmAllocNL(regionCb, size, flags, ptr) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -#endif #endif /* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */ #endif /* SSI_DEBUG_LEVEL1 */ /* cm_mem_c_001.main_15: Additions */ @@ -2812,7 +2639,6 @@ Data **ptr; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_LIGHT_MEM_LEAK_STS -#ifdef ANSI S16 cmFreeNL ( Void *regionCb, @@ -2821,18 +2647,9 @@ Size size, uint32_t lineNo, uint8_t *funcName ) -#else -S16 cmFreeNL(regionCb, ptr, size, lineNo, funcName) -Void *regionCb; -Data *ptr; -Size size; -uint32_t lineNo; -uint8_t *funcName; -#endif #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI S16 cmFreeNL ( Void *regionCb, @@ -2843,32 +2660,14 @@ uint8_t *fileName, uint8_t entId, Bool hstReg ) -#else -S16 cmFreeNL(regionCb, ptr, size, line, fileName, entId, hstReg) -Void *regionCb; -Data *ptr; -Size size; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif - #else -#ifdef ANSI S16 cmFreeNL ( Void *regionCb, Data *ptr, Size size ) -#else -S16 cmFreeNL(regionCb, ptr, size) -Void *regionCb; -Data *ptr; -Size size; -#endif /* cm_mem_c_001.main_15 : Additions */ #endif /* SS_HISTOGRAM_SUPPORT */ #endif /*SS_LIGHT_MEM_LEAK_STS */ @@ -3219,23 +3018,15 @@ Size size; /*cm_mem_c_001.main_21-added new function*/ /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ #ifdef SS_FAP -#ifdef ANSI static S16 cmAllocWL ( Void *regionCb, Size *size, -uint32_t flags, +uint32_t flags, Data **ptr ) -#else -static S16 cmAllocWL(regionCb, size, flags, ptr) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -#endif { - uint16_t idx; + uint16_t idx; CmMmBkt *bkt; CmMmRegCb *regCb; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ @@ -3342,21 +3133,9 @@ Data **ptr; * */ -#ifdef ANSI -static S16 cmFreeWL -( -Void *regionCb, -Data *ptr, -Size size -) -#else -static S16 cmFreeWL(regionCb, ptr, size) -Void *regionCb; -Data *ptr; -Size size; -#endif +static S16 cmFreeWL(Void *regionCb,Data *ptr, Size size) { - uint16_t idx; + uint16_t idx; CmMmBkt *bkt; CmMmRegCb *regCb; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ @@ -3470,19 +3249,7 @@ Size size; * */ -#ifdef ANSI -static S16 cmCtl -( -Void *regionCb, -Event event, -SMemCtl *memCtl -) -#else -static S16 cmCtl(regionCb, event, memCtl) -Void *regionCb; -Event event; -SMemCtl *memCtl; -#endif +static S16 cmCtl(Void *regionCb,Event event, SMemCtl *memCtl) { CmMmRegCb *regCb; @@ -3602,23 +3369,14 @@ SMemCtl *memCtl; * File: cm_mem.c * */ -#ifdef ANSI static Void cmMmBktInit ( -Data **memAddr, +Data **memAddr, CmMmRegCb *regCb, CmMmRegCfg *cfg, -uint16_t bktIdx, -uint16_t *lstMapIdx +uint16_t bktIdx, +uint16_t *lstMapIdx ) -#else -static Void cmMmBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) -Data **memAddr; -CmMmRegCb *regCb; -CmMmRegCfg *cfg; -uint16_t bktIdx; -uint16_t *lstMapIdx; -#endif { uint32_t cnt; uint16_t idx; @@ -3857,19 +3615,7 @@ uint16_t *lstMapIdx; * File: cm_mem.c * */ -#ifdef ANSI -static Void cmMmHeapInit -( -Data *memAddr, -CmMmHeapCb *heapCb, -Size size -) -#else -static Void cmMmHeapInit (memAddr, heapCb, size) -Data *memAddr; -CmMmHeapCb *heapCb; -Size size; -#endif +static Void cmMmHeapInit(Data *memAddr,CmMmHeapCb *heapCb,Size size) { /* cm_mem_c_001.main_12 - addition for ssi enhancements */ #ifdef SSI_DEBUG_LEVEL1 @@ -3948,7 +3694,6 @@ uint8_t ysCellConfigDone; #endif #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, @@ -3961,18 +3706,6 @@ uint8_t entId, Bool hstReg ) #else -static S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) -CmMmHeapCb *heapCb; -Data **ptr; -Size *size; -uint32_t memType; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif -#else -#ifdef ANSI static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, @@ -3983,20 +3716,9 @@ uint8_t *fileName, uint8_t entId, Bool hstReg ) -#else -static S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) -CmMmHeapCb *heapCb; -Data **ptr; -Size *size; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif #endif /* SSI_DEBUG_LEVEL1 */ #else #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, @@ -4005,26 +3727,12 @@ Size *size, uint32_t memType ) #else -static S16 cmHeapAlloc (heapCb, ptr, size, memType) -CmMmHeapCb *heapCb; -Data **ptr; -Size *size; -uint32_t memType; -#endif -#else -#ifdef ANSI static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size ) -#else -static S16 cmHeapAlloc (heapCb, ptr, size) -CmMmHeapCb *heapCb; -Data **ptr; -Size *size; -#endif #endif /* SSI_DEBUG_LEVEL1 */ /* cm_mem_c_001.main_15 : Additions */ #endif /* SS_HISTOGRAM_SUPPORT */ @@ -4315,7 +4023,6 @@ Size *size; */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI static S16 cmHeapFree ( CmMmHeapCb *heapCb, @@ -4327,29 +4034,12 @@ uint8_t entId, Bool hstReg ) #else -static S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) -CmMmHeapCb *heapCb; -Data *ptr; -Size size; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif -#else -#ifdef ANSI static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, Size size ) -#else -static S16 cmHeapFree (heapCb, ptr, size) -CmMmHeapCb *heapCb; -Data *ptr; -Size size; -#endif /* cm_mem_c_001.main_15 : Additions */ #endif /* SS_HISTOGRAM_SUPPORT */ { @@ -4724,14 +4414,7 @@ Size size; } /* end of cmHeapFree */ #endif/*USE_PURE*/ #ifdef SS_LIGHT_MEM_LEAK_STS -#ifdef ANSI -uint32_t cmGetFreeIndx -( -Void -) -#else uint32_t cmGetFreeIndx(Void) -#endif { if(gmemLkCb.head == gmemLkCb.tail) @@ -4747,16 +4430,7 @@ uint32_t cmGetFreeIndx(Void) } } -#ifdef ANSI -uint32_t cmPutFreeIndx -( -uint32_t allocQIndx -) -#else -uint32_t cmPutFreeIndx(allocQIndx) -uint32_t allocQIndx; -#endif - +uint32_t cmPutFreeIndx(uint32_t allocQIndx) { uint32_t tmpTail = (gmemLkCb.tail+1)% CM_MAX_ALLOC_ENTERIES; if(tmpTail == gmemLkCb.head) @@ -4786,14 +4460,7 @@ uint32_t allocQIndx; * File: cm_mem.c * */ -#ifdef ANSI -Void cmInitMemLeak -( -Void -) -#else Void cmInitMemLeak (Void) -#endif { uint32_t indx; @@ -4825,14 +4492,7 @@ Void cmInitMemLeak (Void) * File: cm_mem.c * **/ -#ifdef ANSI -Void cmDeinitMemLeak -( -Void -) -#else -Void cmDeinitMemLeak (Void) -#endif +Void cmDeinitMemLeak(Void) { uint32_t indx; @@ -4862,16 +4522,7 @@ Void cmDeinitMemLeak (Void) * File: cm_mem.c * */ -#ifdef ANSI -uint32_t cmStorAllocBlk -( -Void *addr -) -#else -uint32_t cmStorAllocBlk (addr) -Void *addr; -#endif /* ANSI */ - +uint32_t cmStorAllocBlk(Void *addr) { uint32_t allocQIndx; @@ -4904,15 +4555,7 @@ Void *addr; * File: cm_mem.c * */ -#ifdef ANSI -Void cmRlsAllocBlk -( -uint32_t allocQIndx -) -#else -Void cmRlsAllocBlk(allocQIndx) -uint32_t allocQIndx; -#endif +Void cmRlsAllocBlk(uint32_t allocQIndx) { if(allocQIndx < CM_MAX_ALLOC_ENTERIES) @@ -4940,14 +4583,7 @@ uint32_t allocQIndx; * File: cm_mem.c * */ -#ifdef ANSI -Void cmStartStopLeakLog -( -Void -) -#else Void cmStartStopLeakLog(Void) -#endif { if (FALSE == gmemLkCb.isStarted) { @@ -4976,14 +4612,7 @@ Void cmStartStopLeakLog(Void) * File: cm_mem.c * */ -#ifdef ANSI -Void cmPrintLeakLog -( -Void -) -#else Void cmPrintLeakLog(Void) -#endif { uint32_t indx; @@ -5036,19 +4665,12 @@ Void cmPrintLeakLog(Void) * */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 -#ifdef ANSI Void cmRlsAllocBlk ( CmMmBlkHdr *ptrHdr, CmMmRegCb *regCb ) #else -Void cmRlsAllocBlk(ptrHdr, regCb) -CmMmBlkHdr *ptrHdr; -CmMmRegCb *regCb; -#endif -#else -#ifdef ANSI Void cmRlsAllocBlk ( #ifdef BIT_64 @@ -5057,20 +4679,12 @@ uint64_t addr uint32_t addr #endif ) -#else -Void cmRlsAllocBlk(addr) -#ifdef BIT_64 -uint64_t addr; -#else -uint32_t addr; -#endif -#endif #endif { Ptr trace[CM_MAX_STACK_TRACE]; S8 **funcNm; - uint8_t idx; - uint8_t i; + uint8_t idx; + uint8_t i; S16 retVal; S32 traceSize; #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 @@ -5216,7 +4830,6 @@ uint32_t addr; * */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 -#ifdef ANSI Void cmStorAllocBlk ( CmMmBlkHdr *ptrHdr, @@ -5226,15 +4839,6 @@ uint16_t bktIdx, CmMmRegCb *regCb ) #else -Void cmStorAllocBlk (ptrHdr, reqSz, allocSz, bktIdx, regCb) -CmMmBlkHdr *ptrHdr; -Size reqSz; -Size allocSz; -uint16_t bktIdx; -CmMmRegCb *regCb; -#endif -#else -#ifdef ANSI Void cmStorAllocBlk ( #ifdef BIT_64 @@ -5246,17 +4850,6 @@ Size reqSz, Size allocSz, uint16_t bktIdx ) -#else -Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx) -#ifdef BIT_64 -uint64_t addr; -#else -uint32_t addr; -#endif -Size reqSz; -Size allocSz; -uint16_t bktIdx; -#endif /* ANSI */ #endif /* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */ { #ifndef SS_MEM_LEAK_SOL @@ -5361,14 +4954,7 @@ uint16_t bktIdx; * File: cm_mem.c * */ -#ifdef ANSI -Void SLogLkInfo -( -Void -) -#else Void SLogLkInfo (Void) -#endif { #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 uint8_t idx; @@ -5518,17 +5104,10 @@ Void SLogLkInfo (Void) * File: cm_mem.c * */ -#ifdef ANSI -Void cmInitMemLeakMdl -( -Void -) -#else Void cmInitMemLeakMdl (Void) -#endif { uint8_t memMdl; - uint8_t hashIdx; + uint8_t hashIdx; memLkCb.memLkMdlInit = FALSE; @@ -5566,14 +5145,7 @@ Void cmInitMemLeakMdl (Void) * File: cm_mem.c * **/ -#ifdef ANSI -Void cmDeinitMemLeakMdl -( -Void -) -#else Void cmDeinitMemLeakMdl (Void) -#endif { uint8_t memMdl; uint8_t hashIdx; @@ -5606,15 +5178,7 @@ Void cmDeinitMemLeakMdl (Void) * File: cm_mem.c * */ -#ifdef ANSI -Void cmMemOpenMemLkFile -( -S8 *arg -) -#else -Void cmMemOpenMemLkFile (arg) -S8 *msOptArg; -#endif +Void cmMemOpenMemLkFile(S8 *arg) { memLkCb.fileLkLog = NULLP; memLkCb.fileLkLog = fopen(arg, "w"); @@ -5635,19 +5199,12 @@ S8 *msOptArg; * File: cm_mem.c * */ -#ifdef ANSI -Void SFlushLkInfo -( -Void -) -#else Void SFlushLkInfo (Void) -#endif { - MemAllocInfo *newMemInfo; - uint8_t memMdl; - uint8_t hashIdx; - S8 **funcNm; + MemAllocInfo *newMemInfo; + uint8_t memMdl; + uint8_t hashIdx; + S8 **funcNm; #ifdef SS_MEM_LEAK_SOL uint8_t i; #endif /* SS_MEM_LEAK_SOL */ @@ -5712,21 +5269,11 @@ Void SFlushLkInfo (Void) * File: cm_mem.c * */ -#ifdef ANSI -uint8_t cmMemGetModuleId -( -S8 **funNm, -S32 traceSize -) -#else -uint8_t cmMemGetModuleId (funNm, traceSize) -S8 **funNm; -S32 traceSize; -#endif /* ANSI */ +uint8_t cmMemGetModuleId(S8 **funNm,S32 traceSize) { - uint8_t idx; - uint8_t memStrIdx; - uint32_t len; + uint8_t idx; + uint8_t memStrIdx; + uint32_t len; S32 retVal; S16 memReqIdx; S16 mdlFunStrIdx; @@ -5788,7 +5335,6 @@ S32 traceSize; * File: cm_mem.c * */ -#ifdef ANSI S16 cmMemGetStrMtchIdx ( uint8_t strtIdx, @@ -5796,13 +5342,6 @@ uint8_t endIdx, S8 *str, S8 **strLst ) -#else -S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst) -uint8_t strtIdx; -uint8_t endIdx; -S8 *str; -S8 **strLst; -#endif { S8 cmpStr[255]; @@ -5861,19 +5400,7 @@ S8 **strLst; * File: cm_mem.c * */ -#ifdef ANSI -S32 cmAddrToSymStr -( -Void *pc, -S8 *buffer, -S32 size -) -#else -S32 cmAddrToSymStr(pc, buffer, size) -Void *pc; -S8 *buffer; -S32 size; -#endif +S32 cmAddrToSymStr(Void *pc, S8 *buffer, S32 size) { Dl_info info; @@ -5917,19 +5444,7 @@ S32 size; * File: cm_mem.c * */ -#ifdef ANSI -S32 cmLeakCallBack -( -uintptr_t pc, -S32 sigNo, -Void *arg -) -#else -S32 cmLeakCallBack(pc, sigNo, arg) -uintptr_t pc; -S32 sigNo; -Void *arg; -#endif +S32 cmLeakCallBack(uintptr_t pc,S32 sigNo, Void *arg) { S8 *buffer; @@ -5972,27 +5487,9 @@ Void *arg; * */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 -#ifdef ANSI -S16 cmMmRegIsBlkSane -( -CmMmBlkHdr *blkPtr, -Size size -) -#else -S16 cmMmRegIsBlkSane(blkPtr, size) -CmMmBlkHdr *blkPtr; -Size size; -#endif +S16 cmMmRegIsBlkSane(CmMmBlkHdr *blkPtr,Size size) #else -#ifdef ANSI -S16 cmMmRegIsBlkSane -( -CmMmBlkHdr *blkPtr -) -#else -S16 cmMmRegIsBlkSane(blkPtr) -CmMmBlkHdr *blkPtr; -#endif +S16 cmMmRegIsBlkSane(CmMmBlkHdr *blkPtr) #endif { uint32_t sigCnt; @@ -6041,15 +5538,7 @@ CmMmBlkHdr *blkPtr; * File: cm_mem.c * */ -#ifdef ANSI -static S16 cmMmBktSanityChk -( -CmMmBkt *bkt -) -#else -static S16 cmMmBktSanityChk(bkt) -CmMmBkt *bkt; -#endif +static S16 cmMmBktSanityChk(CmMmBkt *bkt) { CmMmBlkHdr *ptrBlk; uint32_t blkCnt; @@ -6101,18 +5590,9 @@ CmMmBkt *bkt; * File: cm_mem.c * */ -#ifdef ANSI -static S16 cmMmHeapSanityChk -( -CmMmHeapCb *heapCb -) -#else -static S16 cmMmHeapSanityChk(heapCb) -CmMmHeapCb *heapCb; -#endif +static S16 cmMmHeapSanityChk(CmMmHeapCb *heapCb) { - /* increment the trample count */ heapCb->trampleCount++; @@ -6139,19 +5619,7 @@ CmMmHeapCb *heapCb; * File: cm_mem.c * */ -#ifdef ANSI -static S16 cmMmHashFunc -( -CmMmHashListCp *hashListCp, -uint32_t key, -uint16_t *idx -) -#else -static S16 cmMmHashFunc (hashListCp, key, idx) -CmMmHashListCp *hashListCp; /* hash list control point */ -uint32_t key; /* key string */ -uint16_t *idx; /* idx to return */ -#endif +static S16 cmMmHashFunc(CmMmHashListCp *hashListCp,uint32_t key,uint16_t *idx) { *idx = (uint16_t)(key % hashListCp->numOfbins); @@ -6181,21 +5649,13 @@ uint16_t *idx; /* idx to return */ * File: cm_mem.c * */ -#ifdef ANSI static S16 cmMmHashListInit ( CmMmHashListCp *hashListCp, /* hash list to initialize */ -uint16_t nmbBins, /* number of hash list bins */ +uint16_t nmbBins, /* number of hash list bins */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) -#else -static S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) -CmMmHashListCp *hashListCp; /* hash list to initialize */ -uint16_t nmbBins; /* number of hash list bins */ -Region region; /* memory region to allocate bins */ -Pool pool; /* memory pool to allocate bins */ -#endif { uint16_t i; CmMmHashListEnt *hl; @@ -6246,19 +5706,12 @@ Pool pool; /* memory pool to allocate bins */ * File: cm_mem.c * */ -#ifdef ANSI static S16 cmMmHashListDeinit ( CmMmHashListCp *hashListCp, /* hash list to deinitialize */ -Region region, /* memory region to allocate bins */ -Pool pool /* memory pool to allocate bins */ +Region region, /* memory region to allocate bins */ +Pool pool /* memory pool to allocate bins */ ) -#else -static S16 cmMmHashListDeinit(hashListCp, region, pool) -CmMmHashListCp *hashListCp; /* hash list to deinitialize */ -Region region; /* memory region to allocate bins */ -Pool pool; /* memory pool to allocate bins */ -#endif { /* deallocate memory for bins */ @@ -6292,17 +5745,11 @@ Pool pool; /* memory pool to allocate bins */ * File: cm_mem.c * */ -#ifdef ANSI static S16 cmMmHashListInsert ( CmMmHashListCp *hashListCp, /* hash list to add to */ -uint32_t key /* pointer to key */ +uint32_t key /* pointer to key */ ) -#else -static S16 cmMmHashListInsert(hashListCp, key) -CmMmHashListCp *hashListCp; /* hash list to add to */ -uint32_t key; /* pointer to key */ -#endif { CmMmHashListEnt *hashListEnt; /* pointer to hash list entry header */ uint16_t idx; /* index for insertion into hash list */ @@ -6376,15 +5823,10 @@ uint32_t key; /* pointer to key */ * File: cm_mem.c * */ -#ifdef ANSI static S16 cmHstGrmHashListInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) -#else -static S16 cmHstGrmHashListInit(hashListCp) -CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ -#endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #ifdef DEBUGP @@ -6416,15 +5858,10 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * File: cm_mem.c * */ -#ifdef ANSI static S16 cmHstGrmHashListDeInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) -#else -static S16 cmHstGrmHashListDeInit(hashListCp) -CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ -#endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #ifdef DEBUGP @@ -6460,28 +5897,19 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * File: cm_mem.c * */ -#ifdef ANSI static S16 cmHstGrmFreeInsert ( CmHstGrmHashListCp* hashListCp, /* hash list cp */ -uint32_t blkSz, /* size of the block freed */ -uint32_t line, /* Line number */ -uint8_t *fileName, /* file name */ -uint8_t entId /* Tapa task which free the memory */ +uint32_t blkSz, /* size of the block freed */ +uint32_t line, /* Line number */ +uint8_t *fileName, /* file name */ +uint8_t entId /* Tapa task which free the memory */ ) -#else -static S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) -CmHstGrmHashListCp* hashListCp; /* hash list cp */ -uint32_t blkSz; /* size of the block freed */ -uint32_t line; /* line number */ -uint8_t *fileName; /* file Name */ -uint8_t entId; /* Tapa task which frees the memory */ -#endif { - uint32_t binIdx = 0; /* Bin index to insert the entry into the hash list */ - uint32_t key = 0; /* Key to fine the bin index */ - uint32_t ret = 0; /* Return value */ - CmMemEntries *entry = NULLP; /* Entry which contains the information */ + uint32_t binIdx = 0; /* Bin index to insert the entry into the hash list */ + uint32_t key = 0; /* Key to fine the bin index */ + uint32_t ret = 0; /* Return value */ + CmMemEntries *entry = NULLP; /* Entry which contains the information */ @@ -6542,30 +5970,20 @@ uint8_t entId; /* Tapa task which frees the memory */ * File: cm_mem.c * */ -#ifdef ANSI static S16 cmHstGrmAllocInsert ( CmHstGrmHashListCp *hashListCp, -uint32_t blkSz, -uint32_t *reqSz, -uint32_t line, -uint8_t *fileName, -uint8_t entId +uint32_t blkSz, +uint32_t *reqSz, +uint32_t line, +uint8_t *fileName, +uint8_t entId ) -#else -static S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) -CmHstGrmHashListCp *hashListCp; -uint32_t blkSz; -uint32_t *reqSz; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -#endif { - uint32_t binIdx = 0; - uint32_t key = 0; - uint32_t ret = 0; - CmMemEntries *entry = NULLP; + uint32_t binIdx = 0; + uint32_t key = 0; + uint32_t ret = 0; + CmMemEntries *entry = NULLP; /* check for the total number of entries in the hash list. * @@ -6629,21 +6047,13 @@ uint8_t entId; * File: cm_mem.c * */ -#ifdef ANSI static S16 cmHstGrmGetHashIdxAndKey ( -uint8_t *fileName, -uint32_t line, -uint32_t *binIdx, -uint32_t *key +uint8_t *fileName, +uint32_t line, +uint32_t *binIdx, +uint32_t *key ) -#else -static S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) -uint8_t *fileName; -uint32_t line; -uint32_t *binIdx; -uint32_t *key; -#endif { uint32_t i = 0; @@ -6678,23 +6088,14 @@ uint32_t *key; * File: cm_mem.c * */ -#ifdef ANSI static S16 cmHstGrmFillEntry ( -CmMemEntries *entry, -uint32_t key, -uint32_t line, -uint8_t *fileName, -uint8_t entId +CmMemEntries *entry, +uint32_t key, +uint32_t line, +uint8_t *fileName, +uint8_t entId ) -#else -static S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) -CmMemEntries *entry; -uint32_t key; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -#endif { uint32_t idx = 0; @@ -6726,25 +6127,17 @@ uint8_t entId; * File: cm_mem.c * */ -#ifdef ANSI static S16 cmHstGrmFindEntry ( CmHstGrmHashListCp *hashListCp, -uint32_t key, -uint32_t *binIdx, -CmMemEntries **entry +uint32_t key, +uint32_t *binIdx, +CmMemEntries **entry ) -#else -static S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) -CmHstGrmHashListCp *hashListCp; -uint32_t key; -uint32_t *binIdx; -CmMemEntries **entry; -#endif { - uint32_t numEnt = 0; - uint32_t numBin = 0; + uint32_t numEnt = 0; + uint32_t numBin = 0; CmHstGrmHashListEnt *tmpBin = NULLP; for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++) diff --git a/src/cm/cm_mem_wl.c b/src/cm/cm_mem_wl.c index 7c60b2a59..31c073b08 100755 --- a/src/cm/cm_mem_wl.c +++ b/src/cm/cm_mem_wl.c @@ -388,7 +388,6 @@ void DumpLayersDebugInformation() * File: cm_mem_wl.c * */ -#ifdef ANSI static Void cmMmStatBktInit ( Data **memAddr, @@ -397,14 +396,6 @@ CmMmRegCfg *cfg, uint16_t bktIdx, uint16_t *lstMapIdx ) -#else -static Void cmMmStatBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) -Data **memAddr; -CmMmRegCb *regCb; -CmMmRegCfg *cfg; -uint16_t bktIdx; -uint16_t *lstMapIdx; -#endif { uint32_t cnt; uint16_t idx; @@ -553,19 +544,12 @@ uint16_t *lstMapIdx; * File: cm_mem_wl.c * */ -#ifdef ANSI S16 cmMmStatRegInit ( Region region, CmMmRegCb *regCb, CmMmRegCfg *cfg ) -#else -S16 cmMmStatRegInit(region, regCb, cfg) -Region region; -CmMmRegCb *regCb; -CmMmRegCfg *cfg; -#endif { Data *memAddr; uint16_t bktIdx; @@ -807,15 +791,10 @@ CmMmRegCfg *cfg; * File: cm_mem_wl.c * */ -#ifdef ANSI S16 cmMmGlobRegInit ( CmMmGlobRegCb *regCb ) -#else -S16 cmMmGlobRegInit(regCb) -CmMmGlobRegCb *regCb; -#endif { Data **memAddr; Data **next; @@ -899,7 +878,6 @@ CmMmGlobRegCb *regCb; * */ #ifdef T2K_MEM_LEAK_DBG -#ifdef ANSI static S16 cmIccAllocWithLock ( Void *regionCb, /* Pointer to a region */ @@ -909,9 +887,7 @@ Data **ptr, /* Reference to pointer for which need to be allocate */ char *file, uint32_t line ) -#endif #else -#ifdef ANSI static S16 cmIccAllocWithLock ( Void *regionCb, /* Pointer to a region */ @@ -919,13 +895,6 @@ Size *size, /* size needs to be allocated */ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) -#else -static S16 cmIccAllocWithLock(regionCb, size, flags, ptr) -Void *regionCb; /* Pointer to a region */ -Size *size; /* size needs to be allocated */ -uint32_t flags; /* Flags used */ -Data **ptr; /* Reference to pointer for which need to be allocate */ -#endif #endif { CmMmDynRegCb *regCb; @@ -991,7 +960,6 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ * */ #ifdef T2K_MEM_LEAK_DBG -#ifdef ANSI static S16 cmIccFreeWithLock ( Void *regionCb, /* Pointer to region cb */ @@ -1000,21 +968,13 @@ Size size, /* Size of the block */ char *file, uint32_t line ) -#endif #else -#ifdef ANSI static S16 cmIccFreeWithLock ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) -#else -static S16 cmIccFreeWithLock(regionCb, ptr, size) -Void *regionCb; /* Pointer to region cb */ -Data *ptr; /* Memory block needs to be freed */ -Size size; /* Size of the block */ -#endif #endif { CmMmDynRegCb *regCb; @@ -1059,7 +1019,6 @@ Size size; /* Size of the block */ * */ #ifdef T2K_MEM_LEAK_DBG -#ifdef ANSI static S16 cmIccAlloc ( Void *regionCb, /* Pointer to a region */ @@ -1070,9 +1029,6 @@ char *file, uint32_t line ) #else -#endif -#else -#ifdef ANSI static S16 cmIccAlloc ( Void *regionCb, /* Pointer to a region */ @@ -1080,13 +1036,6 @@ Size *size, /* size needs to be allocated */ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) -#else -static S16 cmIccAlloc(regionCb, size, flags, ptr) -Void *regionCb; /* Pointer to a region */ -Size *size; /* size needs to be allocated */ -uint32_t flags; /* Flags used */ -Data **ptr; /* Reference to pointer for which need to be allocate */ -#endif #endif { @@ -1150,19 +1099,12 @@ char* file, uint32_t line ) #else -#ifdef ANSI static S16 cmIccFree ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) -#else -static S16 cmIccFree(regionCb, ptr, size) -Void *regionCb; /* Pointer to region cb */ -Data *ptr; /* Memory block needs to be freed */ -Size size; /* Size of the block */ -#endif #endif { CmMmDynRegCb *regCb; @@ -1214,15 +1156,10 @@ Size size; /* Size of the block */ * File: cm_mem_wl.c * */ -#ifdef ANSI S16 cmMmDynRegInit ( CmMmDynRegCb *regCb ) -#else -S16 cmMmDynRegInit(regCb) -CmMmDynRegCb *regCb; -#endif { SRegInfo regInfo; #ifdef T2200_2GB_DDR_CHANGES @@ -1323,15 +1260,10 @@ CmMmDynRegCb *regCb; * File: cm_mem_wl.c * */ -#ifdef ANSI S16 cmMmDynRegInit ( CmMmDynRegCb *regCb ) -#else -S16 cmMmDynRegInit(regCb) -CmMmDynRegCb *regCb; -#endif { Region region; uint16_t lstMapIdx; @@ -1454,15 +1386,7 @@ CmMmDynRegCb *regCb; * File: cm_mem_wl.c * */ -#ifdef ANSI -S16 cmMmRegDeInit -( -CmMmRegCb *regCb -) -#else -S16 cmMmRegDeInit(regCb) -CmMmRegCb *regCb; -#endif +S16 cmMmRegDeInit(CmMmRegCb *regCb) { uint16_t bktIdx; @@ -1553,17 +1477,11 @@ CmMmRegCb *regCb; * */ -#ifdef ANSI static CmMmBlkSetElement* cmGetMemBlkSetForAlloc ( -uint8_t bucketIndex, /* Index to the bucket list */ +uint8_t bucketIndex, /* Index to the bucket list */ CmMmDynBktCb *bkt /* Bucket list control block */ ) -#else -static CmMmBlkSetElement* cmGetMemBlkSetForAlloc(bucketIndex, bkt) -uint8_t bucketIndex; /* Index to the bucket list */ -CmMmDynBktCb *bkt; /* Bucket list control block */ -#endif { CmMmBlkSetElement *memBlkSetElem; CmMmBlkSetElement *nextMemBlkSetElem; @@ -1677,17 +1595,11 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ * */ -#ifdef ANSI static CmMmBlkSetElement* cmGetMemBlkSetForFree ( -uint8_t bucketIndex, /* Index to the bucket list */ +uint8_t bucketIndex, /* Index to the bucket list */ CmMmDynBktCb *bkt /* Bucket list control block */ ) -#else -static CmMmBlkSetElement* cmGetMemBlkSetForFree(bucketIndex, bkt) -uint8_t bucketIndex; /* Index to the bucket list */ -CmMmDynBktCb *bkt; /* Bucket list control block */ -#endif { CmMmBlkSetElement *memBlkSetElem; CmMmBlkSetElement *nextMemBlkSetElem; @@ -1793,17 +1705,11 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ * */ -#ifdef ANSI static S16 cmRemoveAllocPtrFromList ( CmMmDynRegCb *regionCb, /* Pointer to a region */ PTR ptr ) -#else -static S16 cmRemoveAllocPtrFromList(regionCb, ptr) -CmMmDynRegCb *regionCb; /* Pointer to a region */ -PTR ptr; -#endif { CmMemDoubleFree *memNode = NULLP; @@ -1859,17 +1765,11 @@ PTR ptr; * */ -#ifdef ANSI static S16 cmInsertAllocPtrToList ( CmMmDynRegCb *regionCb, /* Pointer to a region */ PTR ptr ) -#else -static S16 cmInsertAllocPtrToList(regionCb, ptr) -CmMmDynRegCb *regionCb; /* Pointer to a region */ -PTR ptr; -#endif { CmMemDoubleFree *memNode; @@ -1913,7 +1813,6 @@ PTR ptr; */ /* cm_mem_c_001.main_15 : Additions */ -#ifdef ANSI static S16 cmDynAllocWithLock ( Void *regionCb, /* Pointer to a region */ @@ -1921,13 +1820,6 @@ Size *size, /* size needs to be allocated */ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) -#else -static S16 cmDynAllocWithLock(regionCb, size, flags, ptr) -Void *regionCb; /* Pointer to a region */ -Size *size; /* size needs to be allocated */ -uint32_t flags; /* Flags used */ -Data **ptr; /* Reference to pointer for which need to be allocate */ -#endif { S16 ret; @@ -1966,21 +1858,13 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ */ /* cm_mem_c_001.main_15 : Additions */ -#ifdef ANSI static S16 cmDynAlloc ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ -uint32_t flags, /* Flags used */ +uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) -#else -static S16 cmDynAlloc(regionCb, size, flags, ptr) -Void *regionCb; /* Pointer to a region */ -Size *size; /* size needs to be allocated */ -uint32_t flags; /* Flags used */ -Data **ptr; /* Reference to pointer for which need to be allocate */ -#endif { CmMmDynRegCb *regCb; @@ -2195,7 +2079,6 @@ static S16 cmAlloc #else #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmAlloc ( Void *regionCb, @@ -2209,19 +2092,6 @@ uint8_t entId, Bool hstReg ) #else -static S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif -#else -#ifdef ANSI static S16 cmAlloc ( Void *regionCb, @@ -2233,23 +2103,11 @@ uint8_t *fileName, uint8_t entId, Bool hstReg ) -#else -static S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif #endif /* SSI_DEBUG_LEVEL1 */ #else #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmAlloc ( Void *regionCb, @@ -2259,15 +2117,6 @@ Data **ptr, uint32_t memType ) #else -static S16 cmAlloc(regionCb, size, flags, ptr, memType) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -uint32_t memType; -#endif -#else -#ifdef ANSI static S16 cmAlloc ( Void *regionCb, @@ -2275,13 +2124,6 @@ Size *size, uint32_t flags, Data **ptr ) -#else -static S16 cmAlloc(regionCb, size, flags, ptr) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -#endif #endif #endif /* SSI_DEBUG_LEVEL1 */ @@ -2700,19 +2542,11 @@ Data **ptr; * File: cm_mem_wl.c * */ -#ifdef ANSI -S16 cmInitDoubleFreeList -( -Void -) -#else -S16 cmInitDoubleFreeList() -#endif +S16 cmInitDoubleFreeList(void) { - uint16_t offset; + uint16_t offset; CmMemDoubleFree memNode; - offset = (uint16_t)((PTR)(&memNode.tmpListEnt) - (PTR)&memNode); if((cmHashListInit(&(memDoubleFree), 1000, offset, 0, @@ -2742,13 +2576,7 @@ S16 cmInitDoubleFreeList() * File: cm_mem_wl.c * */ -#ifdef ANSI -static S16 cmInitBtInfo -( -) -#else -static S16 cmInitBtInfo (Void) -#endif +static S16 cmInitBtInfo() { regBtInfo = (CmBtInfo *)calloc(1, 8 * sizeof (CmBtInfo)); if (regBtInfo == NULLP) @@ -2780,17 +2608,11 @@ static S16 cmInitBtInfo (Void) * File: cm_mem_wl.c * */ -#ifdef ANSI Void cmAnalyseBtInfo ( PTR ptr, /* Memory block needs to be freed */ uint32_t idx ) -#else -Void cmAnalyseBtInfo (ptr,idx) -PTR ptr; /* Memory block needs to be freed */ -uint32_t idx; -#endif { uint32_t tmpCnt; uint32_t btIdx; @@ -2851,19 +2673,12 @@ uint32_t idx; * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmDynFreeWithLock ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) -#else -static S16 cmDynFreeWithLock(regionCb, ptr, size) -Void *regionCb; /* Pointer to region cb */ -Data *ptr; /* Memory block needs to be freed */ -Size size; /* Size of the block */ -#endif { S16 ret; @@ -2901,19 +2716,12 @@ Size size; /* Size of the block */ * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmDynFree ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) -#else -static S16 cmDynFree(regionCb, ptr, size) -Void *regionCb; /* Pointer to region cb */ -Data *ptr; /* Memory block needs to be freed */ -Size size; /* Size of the block */ -#endif { CmMmDynRegCb *regCb; #ifndef USE_PURE @@ -3110,7 +2918,6 @@ static S16 cmFree ) #else #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI static S16 cmFree ( Void *regionCb, @@ -3122,31 +2929,12 @@ uint8_t entId, Bool hstReg ) #else -static S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) -Void *regionCb; -Data *ptr; -Size size; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif - -#else - -#ifdef ANSI static S16 cmFree ( Void *regionCb, Data *ptr, Size size ) -#else -static S16 cmFree(regionCb, ptr, size) -Void *regionCb; -Data *ptr; -Size size; -#endif #endif /* cm_mem_c_001.main_15 : Additions */ #endif /* SS_HISTOGRAM_SUPPORT */ @@ -3492,7 +3280,6 @@ char* file, uint32_t line ) #else -#ifdef ANSI static S16 cmAllocWL ( Void *regionCb, @@ -3500,13 +3287,6 @@ Size *size, uint32_t flags, Data **ptr ) -#else -static S16 cmAllocWL(regionCb, size, flags, ptr) -Void *regionCb; -Size *size; -uint32_t flags; -Data **ptr; -#endif #endif { #ifndef USE_PURE @@ -3653,19 +3433,12 @@ char* file, uint32_t line ) #else -#ifdef ANSI static S16 cmFreeWL ( Void *regionCb, Data *ptr, Size size ) -#else -static S16 cmFreeWL(regionCb, ptr, size) -Void *regionCb; -Data *ptr; -Size size; -#endif #endif { #ifndef USE_PURE @@ -3803,19 +3576,12 @@ Size size; * */ -#ifdef ANSI static S16 cmCtl ( Void *regionCb, Event event, SMemCtl *memCtl ) -#else -static S16 cmCtl(regionCb, event, memCtl) -Void *regionCb; -Event event; -SMemCtl *memCtl; -#endif { CmMmRegCb *regCb; @@ -3935,19 +3701,12 @@ SMemCtl *memCtl; * File: cm_mem_wl.c * */ -#ifdef ANSI static Void cmMmHeapInit ( Data *memAddr, CmMmHeapCb *heapCb, Size size ) -#else -static Void cmMmHeapInit (memAddr, heapCb, size) -Data *memAddr; -CmMmHeapCb *heapCb; -Size size; -#endif { /* cm_mem_c_001.main_12 - addition for ssi enhancements */ #ifdef SSI_DEBUG_LEVEL1 @@ -4024,7 +3783,6 @@ Size size; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, @@ -4037,18 +3795,6 @@ uint8_t entId, Bool hstReg ) #else -static S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) -CmMmHeapCb *heapCb; -Data **ptr; -Size *size; -uint32_t memType; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif -#else -#ifdef ANSI static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, @@ -4059,20 +3805,9 @@ uint8_t *fileName, uint8_t entId, Bool hstReg ) -#else -static S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) -CmMmHeapCb *heapCb; -Data **ptr; -Size *size; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif #endif /* SSI_DEBUG_LEVEL1 */ #else #ifdef SSI_DEBUG_LEVEL1 -#ifdef ANSI static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, @@ -4081,26 +3816,12 @@ Size *size, uint32_t memType ) #else -static S16 cmHeapAlloc (heapCb, ptr, size, memType) -CmMmHeapCb *heapCb; -Data **ptr; -Size *size; -uint32_t memType; -#endif -#else -#ifdef ANSI static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size ) -#else -static S16 cmHeapAlloc (heapCb, ptr, size) -CmMmHeapCb *heapCb; -Data **ptr; -Size *size; -#endif #endif /* SSI_DEBUG_LEVEL1 */ /* cm_mem_c_001.main_15 : Additions */ #endif /* SS_HISTOGRAM_SUPPORT */ @@ -4379,7 +4100,6 @@ Size *size; */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT -#ifdef ANSI static S16 cmHeapFree ( CmMmHeapCb *heapCb, @@ -4391,29 +4111,12 @@ uint8_t entId, Bool hstReg ) #else -static S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) -CmMmHeapCb *heapCb; -Data *ptr; -Size size; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -Bool hstReg; -#endif -#else -#ifdef ANSI static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, Size size ) -#else -static S16 cmHeapFree (heapCb, ptr, size) -CmMmHeapCb *heapCb; -Data *ptr; -Size size; -#endif /* cm_mem_c_001.main_15 : Additions */ #endif /* SS_HISTOGRAM_SUPPORT */ { @@ -4804,17 +4507,10 @@ Size size; * File: cm_mem_wl.c * */ -#ifdef ANSI -Void cmInitMemLeakMdl -( -Void -) -#else -Void cmInitMemLeakMdl (Void) -#endif +Void cmInitMemLeakMdl(Void) { uint8_t memMdl; - uint8_t hashIdx; + uint8_t hashIdx; memLkCb.memLkMdlInit = FALSE; @@ -4852,14 +4548,7 @@ Void cmInitMemLeakMdl (Void) * File: cm_mem_wl.c * **/ -#ifdef ANSI -Void cmDeinitMemLeakMdl -( -Void -) -#else Void cmDeinitMemLeakMdl (Void) -#endif { uint8_t memMdl; uint8_t hashIdx; @@ -4892,15 +4581,7 @@ Void cmDeinitMemLeakMdl (Void) * File: cm_mem_wl.c * */ -#ifdef ANSI -Void cmMemOpenMemLkFile -( -S8 *arg -) -#else -Void cmMemOpenMemLkFile (arg) -S8 *msOptArg; -#endif +Void cmMemOpenMemLkFile(S8 *arg) { memLkCb.fileLkLog = NULLP; memLkCb.fileLkLog = fopen(arg, "w"); @@ -4922,23 +4603,16 @@ S8 *msOptArg; * File: cm_mem_wl.c * */ -#ifdef ANSI -Void SLogLkInfo -( -Void -) -#else Void SLogLkInfo (Void) -#endif { - MemAllocInfo *oldMemInfo; - MemAllocInfo *newMemInfo; - uint8_t memMdl; - uint8_t hashIdx; - uint8_t idx; - Txt prntBuf[255]; - S8 **funcNm; + MemAllocInfo *oldMemInfo; + MemAllocInfo *newMemInfo; + uint8_t memMdl; + uint8_t hashIdx; + uint8_t idx; + Txt prntBuf[255]; + S8 **funcNm; if( memLkCb.memLkMdlInit == FALSE) { return; @@ -5015,21 +4689,14 @@ Void SLogLkInfo (Void) * File: cm_mem_wl.c * */ -#ifdef ANSI -Void SFlushLkInfo -( -Void -) -#else Void SFlushLkInfo (Void) -#endif { - MemAllocInfo *newMemInfo; - uint8_t memMdl; - uint8_t hashIdx; - S8 **funcNm; + MemAllocInfo *newMemInfo; + uint8_t memMdl; + uint8_t hashIdx; + S8 **funcNm; #ifdef SS_MEM_LEAK_SOL - uint8_t i; + uint8_t i; #endif /* SS_MEM_LEAK_SOL */ if( memLkCb.memLkMdlInit == FALSE) @@ -5093,7 +4760,6 @@ Void SFlushLkInfo (Void) * File: cm_mem_wl.c * */ -#ifdef ANSI Void cmStorAllocBlk ( uint32_t addr, @@ -5101,13 +4767,6 @@ Size reqSz, Size allocSz, uint16_t bktIdx ) -#else -Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx) -uint32_t addr; -Size reqSz; -Size allocSz; -uint16_t bktIdx; -#endif /* ANSI */ { #ifndef SS_MEM_LEAK_SOL Ptr trace[CM_MAX_STACK_TRACE]; @@ -5183,17 +4842,11 @@ uint16_t bktIdx; * File: cm_mem_wl.c * */ -#ifdef ANSI uint8_t cmMemGetModuleId ( S8 **funNm, S32 traceSize ) -#else -uint8_t cmMemGetModuleId (funNm, traceSize) -S8 **funNm; -S32 traceSize; -#endif /* ANSI */ { uint8_t idx; uint8_t memStrIdx; @@ -5259,7 +4912,6 @@ S32 traceSize; * File: cm_mem_wl.c * */ -#ifdef ANSI S16 cmMemGetStrMtchIdx ( uint8_t strtIdx, @@ -5267,13 +4919,6 @@ uint8_t endIdx, S8 *str, S8 **strLst ) -#else -S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst) -uint8_t strtIdx; -uint8_t endIdx; -S8 *str; -S8 **strLst; -#endif { S8 cmpStr[255]; @@ -5332,20 +4977,15 @@ S8 **strLst; * File: cm_mem_wl.c * */ -#ifdef ANSI Void cmRlsAllocBlk ( uint32_t addr ) -#else -Void cmRlsAllocBlk(addr) -uint32_t addr; -#endif { Ptr trace[CM_MAX_STACK_TRACE]; S8 **funcNm; - uint8_t idx; - uint8_t i; + uint8_t idx; + uint8_t i; S16 retVal; S32 traceSize; MemAllocInfo *memAllocInfo; @@ -5471,19 +5111,12 @@ uint32_t addr; * File: cm_mem_wl.c * */ -#ifdef ANSI S32 cmAddrToSymStr ( Void *pc, S8 *buffer, S32 size ) -#else -S32 cmAddrToSymStr(pc, buffer, size) -Void *pc; -S8 *buffer; -S32 size; -#endif { Dl_info info; @@ -5527,19 +5160,12 @@ S32 size; * File: cm_mem_wl.c * */ -#ifdef ANSI S32 cmLeakCallBack ( uintptr_t pc, S32 sigNo, Void *arg ) -#else -S32 cmLeakCallBack(pc, sigNo, arg) -uintptr_t pc; -S32 sigNo; -Void *arg; -#endif { S8 *buffer; @@ -5575,17 +5201,11 @@ Void *arg; * File: cm_mem_wl.c * */ -#ifdef ANSI S32 backtrace ( -Void **buffer, -S32 count +Void **buffer, +S32 count ) -#else -S32 backtrace(buffer, count) -Void **buffer; -S32 count; -#endif { Backtrace_t bt; @@ -5630,15 +5250,7 @@ S32 count; * File: cm_mem_wl.c * */ -#ifdef ANSI -static S16 cmMmBktSanityChk -( -CmMmBkt *bkt -) -#else -static S16 cmMmBktSanityChk(bkt) -CmMmBkt *bkt; -#endif +static S16 cmMmBktSanityChk(CmMmBkt *bkt) { CmMmBlkHdr *ptrBlk; uint32_t blkCnt; @@ -5691,18 +5303,9 @@ CmMmBkt *bkt; * File: cm_mem_wl.c * */ -#ifdef ANSI -static S16 cmMmHeapSanityChk -( -CmMmHeapCb *heapCb -) -#else -static S16 cmMmHeapSanityChk(heapCb) -CmMmHeapCb *heapCb; -#endif +static S16 cmMmHeapSanityChk(CmMmHeapCb *heapCb) { - /* increment the trample count */ heapCb->trampleCount++; @@ -5728,15 +5331,7 @@ CmMmHeapCb *heapCb; * File: cm_mem_wl.c * */ -#ifdef ANSI -S16 cmMmRegIsBlkSane -( -CmMmBlkHdr *blkPtr -) -#else -S16 cmMmRegIsBlkSane(blkPtr) -CmMmBlkHdr *blkPtr; -#endif +S16 cmMmRegIsBlkSane(CmMmBlkHdr *blkPtr) { uint32_t sigCnt; @@ -5768,19 +5363,12 @@ CmMmBlkHdr *blkPtr; * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmMmHashFunc ( CmMmHashListCp *hashListCp, uint32_t key, uint16_t *idx ) -#else -static S16 cmMmHashFunc (hashListCp, key, idx) -CmMmHashListCp *hashListCp; /* hash list control point */ -uint32_t key; /* key string */ -uint16_t *idx; /* idx to return */ -#endif { *idx = (uint16_t)(key % hashListCp->numOfbins); @@ -5810,21 +5398,13 @@ uint16_t *idx; /* idx to return */ * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmMmHashListInit ( CmMmHashListCp *hashListCp, /* hash list to initialize */ -uint16_t nmbBins, /* number of hash list bins */ +uint16_t nmbBins, /* number of hash list bins */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) -#else -static S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) -CmMmHashListCp *hashListCp; /* hash list to initialize */ -uint16_t nmbBins; /* number of hash list bins */ -Region region; /* memory region to allocate bins */ -Pool pool; /* memory pool to allocate bins */ -#endif { uint16_t i; CmMmHashListEnt *hl; @@ -5875,19 +5455,12 @@ Pool pool; /* memory pool to allocate bins */ * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmMmHashListDeinit ( CmMmHashListCp *hashListCp, /* hash list to deinitialize */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) -#else -static S16 cmMmHashListDeinit(hashListCp, region, pool) -CmMmHashListCp *hashListCp; /* hash list to deinitialize */ -Region region; /* memory region to allocate bins */ -Pool pool; /* memory pool to allocate bins */ -#endif { /* deallocate memory for bins */ @@ -5921,17 +5494,11 @@ Pool pool; /* memory pool to allocate bins */ * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmMmHashListInsert ( CmMmHashListCp *hashListCp, /* hash list to add to */ -uint32_t key /* pointer to key */ +uint32_t key /* pointer to key */ ) -#else -static S16 cmMmHashListInsert(hashListCp, key) -CmMmHashListCp *hashListCp; /* hash list to add to */ -uint32_t key; /* pointer to key */ -#endif { CmMmHashListEnt *hashListEnt; /* pointer to hash list entry header */ uint16_t idx; /* index for insertion into hash list */ @@ -6005,15 +5572,10 @@ uint32_t key; /* pointer to key */ * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmHstGrmHashListInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) -#else -static S16 cmHstGrmHashListInit(hashListCp) -CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ -#endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #ifdef DEBUGP @@ -6045,15 +5607,10 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmHstGrmHashListDeInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) -#else -static S16 cmHstGrmHashListDeInit(hashListCp) -CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ -#endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #ifdef DEBUGP @@ -6089,28 +5646,19 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmHstGrmFreeInsert ( CmHstGrmHashListCp* hashListCp, /* hash list cp */ -uint32_t blkSz, /* size of the block freed */ -uint32_t line, /* Line number */ -uint8_t *fileName, /* file name */ -uint8_t entId /* Tapa task which free the memory */ +uint32_t blkSz, /* size of the block freed */ +uint32_t line, /* Line number */ +uint8_t *fileName, /* file name */ +uint8_t entId /* Tapa task which free the memory */ ) -#else -static S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) -CmHstGrmHashListCp* hashListCp; /* hash list cp */ -uint32_t blkSz; /* size of the block freed */ -uint32_t line; /* line number */ -uint8_t *fileName; /* file Name */ -uint8_t entId; /* Tapa task which frees the memory */ -#endif { - uint32_t binIdx = 0; /* Bin index to insert the entry into the hash list */ - uint32_t key = 0; /* Key to fine the bin index */ - uint32_t ret = 0; /* Return value */ - CmMemEntries *entry = NULLP; /* Entry which contains the information */ + uint32_t binIdx = 0; /* Bin index to insert the entry into the hash list */ + uint32_t key = 0; /* Key to fine the bin index */ + uint32_t ret = 0; /* Return value */ + CmMemEntries *entry = NULLP; /* Entry which contains the information */ @@ -6171,30 +5719,20 @@ uint8_t entId; /* Tapa task which frees the memory */ * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmHstGrmAllocInsert ( CmHstGrmHashListCp *hashListCp, -uint32_t blkSz, -uint32_t *reqSz, -uint32_t line, -uint8_t *fileName, -uint8_t entId +uint32_t blkSz, +uint32_t *reqSz, +uint32_t line, +uint8_t *fileName, +uint8_t entId ) -#else -static S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) -CmHstGrmHashListCp *hashListCp; -uint32_t blkSz; -uint32_t *reqSz; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -#endif { - uint32_t binIdx = 0; - uint32_t key = 0; - uint32_t ret = 0; - CmMemEntries *entry = NULLP; + uint32_t binIdx = 0; + uint32_t key = 0; + uint32_t ret = 0; + CmMemEntries *entry = NULLP; /* check for the total number of entries in the hash list. * @@ -6258,21 +5796,13 @@ uint8_t entId; * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmHstGrmGetHashIdxAndKey ( -uint8_t *fileName, -uint32_t line, -uint32_t *binIdx, -uint32_t *key +uint8_t *fileName, +uint32_t line, +uint32_t *binIdx, +uint32_t *key ) -#else -static S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) -uint8_t *fileName; -uint32_t line; -uint32_t *binIdx; -uint32_t *key; -#endif { uint32_t i = 0; @@ -6307,23 +5837,14 @@ uint32_t *key; * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmHstGrmFillEntry ( CmMemEntries *entry, -uint32_t key, -uint32_t line, -uint8_t *fileName, -uint8_t entId +uint32_t key, +uint32_t line, +uint8_t *fileName, +uint8_t entId ) -#else -static S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) -CmMemEntries *entry; -uint32_t key; -uint32_t line; -uint8_t *fileName; -uint8_t entId; -#endif { uint32_t idx = 0; @@ -6355,29 +5876,20 @@ uint8_t entId; * File: cm_mem_wl.c * */ -#ifdef ANSI static S16 cmHstGrmFindEntry ( CmHstGrmHashListCp *hashListCp, -uint32_t key, -uint32_t *binIdx, +uint32_t key, +uint32_t *binIdx, CmMemEntries **entry ) -#else -static S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) -CmHstGrmHashListCp *hashListCp; -uint32_t key; -uint32_t *binIdx; -CmMemEntries **entry; -#endif { - uint32_t numEnt = 0; - uint32_t numBin = 0; + uint32_t numEnt = 0; + uint32_t numBin = 0; CmHstGrmHashListEnt *tmpBin = NULLP; - for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++) { /* find for the entry in the bin */ @@ -6550,17 +6062,11 @@ void DumpT2kMemLeakInfoToFile() #ifdef TENB_T2K3K_SPECIFIC_CHANGES /* For Updating SOC Specific Memory Information */ -#ifdef ANSI S16 UpdateSocMemInfo ( uint8_t areaIndex, CmLteMemInfo *mInfo ) -#else -S16 UpdateSocMemInfo(areaIndex,mInfo) -uint8_t areaIndex; -CmLteMemInfo *mInfo; -#endif { uint8_t idxReg; uint8_t idxPool; @@ -6636,14 +6142,9 @@ CmLteMemInfo *mInfo; * File: cm_mem_wl.c * */ -#ifdef ANSI uint32_t isL2MemUsageBelowLowerThreshold( Region region ) -#else -uint32_t isL2MemUsageBelowLowerThreshold(region) -Region region; -#endif { void * iccHdl = ssGetIccHdl(region); @@ -6680,14 +6181,9 @@ Region region; * File: cm_mem_wl.c * */ -#ifdef ANSI uint32_t isMemUsageBelowLowerThreshold( Region region ) -#else -uint32_t isMemUsageBelowLowerThreshold(region) -Region region; -#endif { void * iccHdl = ssGetIccHdl(region); @@ -6729,14 +6225,9 @@ Region region; * File: cm_mem_wl.c * */ -#ifdef ANSI static uint32_t isMemUsageAboveUpperThreshold( Region region ) -#else -static uint32_t isMemUsageAboveUpperThreshold(region) -Region region; -#endif { void * iccHdl = ssGetIccHdl(region); @@ -6792,14 +6283,9 @@ Region region; * File: cm_mem_wl.c * */ -#ifdef ANSI uint32_t isMemThreshReached( Region reg ) -#else -uint32_t isMemThreshReached(reg) -Region reg; -#endif { if(gMemoryAlarm) { diff --git a/src/cm/cm_tenb_stats.c b/src/cm/cm_tenb_stats.c index b0ca7f766..2c4b8c3de 100755 --- a/src/cm/cm_tenb_stats.c +++ b/src/cm/cm_tenb_stats.c @@ -100,17 +100,7 @@ static Buffer* TSInfUtlAllocMsg ARGS(( * * */ -#ifdef ANSI -static Void TSInfTrigL2Stats -( - Region region, - Pool pool -) -#else -static Void TSInfTrigL2Stats(region, pool) - Region region; - Pool pool; -#endif +static Void TSInfTrigL2Stats(Region region,Pool pool) { Buffer* pBuf; Pst pst = {0}; @@ -143,17 +133,7 @@ static Void TSInfTrigL2Stats(region, pool) * * */ -#ifdef ANSI -Void TSInfTrigStats -( - Region region, - Pool pool -) -#else -Void TSInfTrigStats(region, pool) - Region region; - Pool pool; -#endif +Void TSInfTrigStats(Region region,Pool pool) { //TODO TSInfTrigL2Stats(region, pool); @@ -162,15 +142,7 @@ Void TSInfTrigStats(region, pool) } -#ifdef ANSI -static Buffer* TSInfUtlAllocMsg -( - Pst *pst -) -#else -static Buffer* TSInfUtlAllocMsg(pst) - Pst *pst; -#endif +static Buffer* TSInfUtlAllocMsg(Pst *pst) { Buffer *mBuf; @@ -181,17 +153,7 @@ static Buffer* TSInfUtlAllocMsg(pst) return (mBuf); } -#ifdef ANSI -static Void TSInfUtlPackUeInfo -( - Buffer *mBuf, - TSInfL2UeStats *stats -) -#else -static Void TSInfUtlPackUeInfo(mBuf, stats) - Buffer *mBuf; - TSInfL2UeStats *stats; -#endif +static Void TSInfUtlPackUeInfo(Buffer *mBuf,TSInfL2UeStats *stats) { S32 i; uint32_t k; @@ -262,17 +224,7 @@ static Void TSInfUtlPackUeInfo(mBuf, stats) return; } -#ifdef ANSI -static Void TSInfUtlPackCellInfo -( - Buffer *mBuf, - TSInfL2CellStats *stats -) -#else -static Void TSInfUtlPackCellInfo(mBuf, stats) - Buffer *mBuf; - TSInfL2CellStats *stats; -#endif +static Void TSInfUtlPackCellInfo(Buffer *mBuf,TSInfL2CellStats *stats ) { S32 i,j; @@ -378,17 +330,7 @@ static Void TSInfUtlPackCellInfo(mBuf, stats) return; } -#ifdef ANSI -static Void TSInfUtlUnpkUeInfo -( - Buffer *mBuf, - TSInfL2UeStats *stats -) -#else -static Void TSInfUtlUnpkUeInfo(mBuf, stats) - Buffer *mBuf; - TSInfL2UeStats *stats; -#endif +static Void TSInfUtlUnpkUeInfo(Buffer *mBuf, TSInfL2UeStats *stats ) { S32 i; uint32_t k; @@ -460,17 +402,7 @@ static Void TSInfUtlUnpkUeInfo(mBuf, stats) return; } -#ifdef ANSI -static Void TSInfUtlUnpkCellInfo -( - Buffer *mBuf, - TSInfL2CellStats *stats -) -#else -static Void TSInfUtlUnpkCellInfo(mBuf, stats) - Buffer *mBuf; - TSInfL2CellStats *stats; -#endif +static Void TSInfUtlUnpkCellInfo(Buffer *mBuf,TSInfL2CellStats *stats ) { S32 i,j; @@ -576,19 +508,7 @@ static Void TSInfUtlUnpkCellInfo(mBuf, stats) return; } -#ifdef ANSI -Void TSInfPkSndL2UeStats -( - Pst *pst, - SuId suId, - TSInfL2UeStats *stats -) -#else -Void TSInfPkSndL2UeStats(pst, suId, stats) - Pst *pst; - SuId suId; - TSInfL2UeStats *stats; -#endif +Void TSInfPkSndL2UeStats(Pst *pst,SuId suId,TSInfL2UeStats *stats) { Buffer *mBuf; @@ -601,24 +521,11 @@ Void TSInfPkSndL2UeStats(pst, suId, stats) return; } -#ifdef ANSI -Void TSInfUnpkL2UeStats -( - TSInfL2UeStatsInd func, - Pst *pst, - Buffer *mBuf -) -#else -Void TSInfUnpkL2UeStats(func, pst, mBuf) - TSInfL2UeStatsInd func; - Pst *pst; - Buffer *mBuf; -#endif +Void TSInfUnpkL2UeStats(TSInfL2UeStatsInd func, Pst *pst,Buffer *mBuf) { SuId suId; TSInfL2UeStats stats; - SUnpkS16(&suId, mBuf); TSInfUtlUnpkUeInfo(mBuf, &stats); SPutMsg(mBuf); @@ -626,23 +533,10 @@ Void TSInfUnpkL2UeStats(func, pst, mBuf) return; } -#ifdef ANSI -Void TSInfPkSndL2CellStats -( - Pst *pst, - SuId suId, - TSInfL2CellStats *stats -) -#else -Void TSInfPkSndL2CellStats(pst, suId, stats) - Pst *pst; - SuId suId; - TSInfL2Cellstats *stats; -#endif +Void TSInfPkSndL2CellStats(Pst *pst,SuId suId,TSInfL2CellStats *stats ) { Buffer *mBuf; - mBuf = TSInfUtlAllocMsg(pst); TSInfUtlPackCellInfo(mBuf, stats); SPkS16(suId, mBuf); @@ -651,19 +545,7 @@ Void TSInfPkSndL2CellStats(pst, suId, stats) return; } -#ifdef ANSI -Void TSInfUnpkL2CellStats -( - TSInfL2CellStatsInd func, - Pst *pst, - Buffer *mBuf -) -#else -Void TSInfUnpkL2CellStats(func, pst, mBuf) - TSInfL2CellStatsInd func; - Pst *pst; - Buffer *mBuf; -#endif +Void TSInfUnpkL2CellStats(TSInfL2CellStatsInd func,Pst *pst,Buffer *mBuf) { SuId suId; TSInfL2CellStats stats; diff --git a/src/cm/cm_tkns.c b/src/cm/cm_tkns.c index 3020f74ee..165ea0ac5 100644 --- a/src/cm/cm_tkns.c +++ b/src/cm/cm_tkns.c @@ -66,17 +66,11 @@ File: cm_tkns.c * */ -#ifdef ANSI S16 cmPkTknS16 ( TknS16 *tknS16, /* token S16 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknS16(tknS16, mBuf) -TknS16 *tknS16; /* token S16 */ -Buffer *mBuf; /* message buffer */ -#endif { if (tknS16->pres) @@ -106,17 +100,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknBStr32 ( TknBStr32 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknBStr32(tknStr, mBuf) -TknBStr32 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNBSTR(tknStr, mBuf); @@ -139,17 +127,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr8 ( TknStr8 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr8(tknStr, mBuf) -TknStr8 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -173,17 +155,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr16 ( TknStr16 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr16(tknStr, mBuf) -TknStr16 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -207,17 +183,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrOSXL ( TknStrOSXL *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrOSXL(tknStr, mBuf) -TknStrOSXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { uint16_t ndx; @@ -255,17 +225,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrBSXL ( TknStrBSXL *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrBSXL(tknStr, mBuf) -TknStrBSXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { uint16_t ndx; uint16_t len; @@ -308,17 +272,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrBMP4 ( TknStrBMP4 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrBMP4(tknStr, mBuf) -TknStrBMP4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t ndx; @@ -356,17 +314,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrBMPXL ( TknStrBMPXL *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrBMPXL(tknStr, mBuf) -TknStrBMPXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { uint16_t ndx; @@ -402,17 +354,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrUNI4 ( TknStrUNI4 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrUNI4(tknStr, mBuf) -TknStrUNI4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t ndx; @@ -450,17 +396,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrUNIXL ( TknStrUNIXL *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrUNIXL(tknStr, mBuf) -TknStrUNIXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { uint16_t ndx; @@ -499,17 +439,11 @@ Buffer *mBuf; /* message buffer */ File: cm_tkns.c * */ -#ifdef ANSI S16 cmUnpkTknS16 ( TknS16 *tknS16, /* token S16 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknS16(tknS16, mBuf) -TknS16 *tknS16; /* token S16 */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ @@ -539,17 +473,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknBStr32 ( TknBStr32 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknBStr32(tknStr, mBuf) -TknBStr32 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNBSTR(tknStr, mBuf); @@ -573,17 +501,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr8 ( TknStr8 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr8(tknStr, mBuf) -TknStr8 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -607,17 +529,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr16 ( TknStr16 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr16(tknStr, mBuf) -TknStr16 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -641,19 +557,12 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrOSXL ( TknStrOSXL *tknStr, /* token string */ Buffer *mBuf, /* message buffer */ Ptr ptr /* pointer to memory control block */ ) -#else -S16 cmUnpkTknStrOSXL(tknStr, mBuf, ptr) -TknStrOSXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -Ptr ptr; /* pointer to control memory block */ -#endif { uint16_t ndx; @@ -695,19 +604,12 @@ Ptr ptr; /* pointer to control memory block */ * */ -#ifdef ANSI S16 cmUnpkTknStrBSXL ( TknStrBSXL *tknStr, /* token string */ Ptr ptr, /* pointer to memory control block */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrBSXL(tknStr, ptr, mBuf) -TknStrBSXL *tknStr; /* token string */ -Ptr ptr; /* pointer to control memory block */ -Buffer *mBuf; /* message buffer */ -#endif { uint16_t ndx; uint16_t len; @@ -755,17 +657,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrBMP4 ( TknStrBMP4 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrBMP4(tknStr, mBuf) -TknStrBMP4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t ndx; @@ -803,19 +699,12 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrBMPXL ( TknStrBMPXL *tknStr, /* token string */ Buffer *mBuf, /* message buffer */ Ptr ptr /* pointer to memory control block */ ) -#else -S16 cmUnpkTknStrBMPXL(tknStr, mBuf, ptr) -TknStrBMPXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -Ptr ptr; /* pointer to control memory block */ -#endif { uint16_t ndx; @@ -858,17 +747,11 @@ Ptr ptr; /* pointer to control memory block */ * */ -#ifdef ANSI S16 cmUnpkTknStrUNI4 ( TknStrUNI4 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrUNI4(tknStr, mBuf) -TknStrUNI4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t ndx; @@ -906,19 +789,12 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrUNIXL ( TknStrUNIXL *tknStr, /* token string */ Buffer *mBuf, /* message buffer */ Ptr ptr /* pointer to memory control block */ ) -#else -S16 cmUnpkTknStrUNIXL(tknStr, mBuf, ptr) -TknStrUNIXL *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -Ptr ptr; /* pointer to control memory block */ -#endif { uint16_t ndx; diff --git a/src/cm/cm_tpt.c b/src/cm/cm_tpt.c index e22afaed6..2fb417029 100755 --- a/src/cm/cm_tpt.c +++ b/src/cm/cm_tpt.c @@ -114,17 +114,11 @@ extern "C" { * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIpv4TptAddr ( CmIpv4TptAddr *pkParam, /* IPv4 Address structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIpv4TptAddr (pkParam, mBuf) -CmIpv4TptAddr *pkParam; /* IPv4 Address structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkCmIpv4NetAddr, pkParam->address, mBuf); @@ -146,17 +140,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmPkCmIpv6NetAddr ( -CmIpv6NetAddr *pkParam, -Buffer *mBuf /* message buffer */ +CmIpv6NetAddr *pkParam, +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmPkCmIpv6NetAddr (pkParam, mBuf) -CmIpv6NetAddr *pkParam; -Buffer *mBuf; /* message buffer */ -#endif { uint8_t num; uint8_t *ptr = (uint8_t*)pkParam; @@ -184,17 +172,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmPkCmIpv6TptAddr ( -CmIpv6TptAddr *pkParam, /* IPv6 transport address */ -Buffer *mBuf /* message buffer */ +CmIpv6TptAddr *pkParam, /* IPv6 transport address */ +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmPkCmIpv6TptAddr (pkParam, mBuf) -CmIpv6TptAddr *pkParam; /* IPv6 transport address */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->ipv6NetAddr, mBuf); @@ -217,20 +199,14 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmNetAddrTbl ( -CmNetAddrTbl *pkParam, /* Network Address Table */ -Buffer *mBuf /* message buffer */ +CmNetAddrTbl *pkParam, /* Network Address Table */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmNetAddrTbl (pkParam, mBuf) -CmNetAddrTbl *pkParam; /* Network Address Table */ -Buffer *mBuf; /* message buffer */ -#endif { - uint16_t idx; /* Loop Index */ - CmNetAddr *netAddr; /* Network Address */ + uint16_t idx; /* Loop Index */ + CmNetAddr *netAddr; /* Network Address */ if (pkParam->count > CM_MAX_NET_ADDR) @@ -265,17 +241,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmNetAddr ( -CmNetAddr *pkParam, -Buffer *mBuf /* message buffer */ +CmNetAddr *pkParam, +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmNetAddr (pkParam, mBuf) -CmNetAddr *pkParam; -Buffer *mBuf; /* message buffer */ -#endif { switch (pkParam->type) @@ -313,17 +283,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmTptAddr ( -CmTptAddr *pkParam, -Buffer *mBuf /* message buffer */ +CmTptAddr *pkParam, +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmTptAddr (pkParam, mBuf) -CmTptAddr *pkParam; -Buffer *mBuf; /* message buffer */ -#endif { switch (pkParam->type) @@ -363,17 +327,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmTptLocalInf ( -CmTptLocalInf *pkParam, /* local interface info */ -Buffer *mBuf /* message buffer */ +CmTptLocalInf *pkParam, /* local interface info */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmTptLocalInf (pkParam, mBuf) -CmTptLocalInf *pkParam; /* local interface info */ -Buffer *mBuf; /* message buffer */ -#endif { if (pkParam->intfPrsnt == TRUE) @@ -404,17 +362,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmNetMCastInf6 ( -CmNetMCastInf6 *pkParam, /* IPv6 multicast information */ -Buffer *mBuf /* message buffer */ +CmNetMCastInf6 *pkParam, /* IPv6 multicast information */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmNetMCastInf6(pkParam, mBuf) -CmNetMCastInf6 *pkParam; /* IPv6 multicast information */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkCmIpv6NetAddr, &pkParam->mCastAddr, mBuf); @@ -438,17 +390,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmPkCmSockOpts ( -CmSockOpts *pkParam, -Buffer *mBuf /* message buffer */ +CmSockOpts *pkParam, +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmPkCmSockOpts (pkParam, mBuf) -CmSockOpts *pkParam; -Buffer *mBuf; /* message buffer */ -#endif { switch (pkParam->option) @@ -503,17 +449,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmPkCmSockParam ( -CmSockParam *pkParam, -Buffer *mBuf /* message buffer */ +CmSockParam *pkParam, +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmPkCmSockParam (pkParam, mBuf) -CmSockParam *pkParam; -Buffer *mBuf; /* message buffer */ -#endif { uint32_t num; @@ -547,17 +487,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmPkTlsTptParam ( -TlsTptParam *pkParam, /**/ -Buffer *mBuf /* message buffer */ +TlsTptParam *pkParam, /**/ +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmPkTlsTptParam(pkParam, mBuf) -TlsTptParam *pkParam; /**/ -Buffer *mBuf; /* message buffer */ -#endif { uint32_t num; @@ -593,17 +527,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmTptParam ( -CmTptParam *pkParam, -Buffer *mBuf /* message buffer */ +CmTptParam *pkParam, +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmTptParam (pkParam, mBuf) -CmTptParam *pkParam; -Buffer *mBuf; /* message buffer */ -#endif { switch (pkParam->type) @@ -656,17 +584,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmIpv4TptAddr ( -CmIpv4TptAddr *unpkParam, /* IPv4 Address */ -Buffer *mBuf /* message buffer */ +CmIpv4TptAddr *unpkParam, /* IPv4 Address */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmIpv4TptAddr (unpkParam, mBuf) -CmIpv4TptAddr *unpkParam; /* IPv4 Address */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf); @@ -689,17 +611,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmUnpkCmIpv6NetAddr ( -CmIpv6NetAddr *unpkParam, /* IPv6 address */ -Buffer *mBuf /* message buffer */ +CmIpv6NetAddr *unpkParam, /* IPv6 address */ +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmUnpkCmIpv6NetAddr (unpkParam, mBuf) -CmIpv6NetAddr *unpkParam; /* IPv6 address */ -Buffer *mBuf; /* message buffer */ -#endif { uint32_t num; uint8_t *ptr = (uint8_t*)unpkParam; @@ -729,17 +645,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmUnpkCmIpv6TptAddr ( -CmIpv6TptAddr *unpkParam, /* IPv6 transport address */ -Buffer *mBuf /* message buffer */ +CmIpv6TptAddr *unpkParam, /* IPv6 transport address */ +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmUnpkCmIpv6TptAddr (unpkParam, mBuf) -CmIpv6TptAddr *unpkParam; /* IPv6 transport address */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt16, &unpkParam->port, mBuf); @@ -762,22 +672,15 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmNetAddrTbl ( -CmNetAddrTbl *unpkParam, /* Network Address Table */ -Buffer *mBuf /* message buffer */ +CmNetAddrTbl *unpkParam, /* Network Address Table */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmNetAddrTbl (unpkParam, mBuf ) -CmNetAddrTbl *unpkParam; /* Network Address Table */ -Buffer *mBuf; /* message buffer */ -#endif { - uint16_t idx; /* Loop Index */ - CmNetAddr *netAddr; /* Network Address */ + uint16_t idx; /* Loop Index */ + CmNetAddr *netAddr; /* Network Address */ - /* Unpack the count */ CMCHKUNPK(oduPackUInt16, &(unpkParam->count), mBuf); @@ -808,17 +711,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmNetAddr ( -CmNetAddr *unpkParam, -Buffer *mBuf /* message buffer */ +CmNetAddr *unpkParam, +Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmNetAddr (unpkParam, mBuf ) -CmNetAddr *unpkParam; -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -857,17 +754,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmTptAddr ( -CmTptAddr *unpkParam, -Buffer *mBuf /* message buffer */ +CmTptAddr *unpkParam, +Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmTptAddr (unpkParam, mBuf) -CmTptAddr *unpkParam; -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -908,17 +799,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmNetMCastInf6 ( -CmNetMCastInf6 *unpkParam, /* IPv6 multicast information */ -Buffer *mBuf /* message buffer */ +CmNetMCastInf6 *unpkParam, /* IPv6 multicast information */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmNetMCastInf6(unpkParam, mBuf) -CmNetMCastInf6 *unpkParam; /* IPv6 multicast information */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt32, &unpkParam->localInf, mBuf); @@ -942,17 +827,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmUnpkCmSockOpts ( -CmSockOpts *unpkParam, /* socket options */ -Buffer *mBuf /* message buffer */ +CmSockOpts *unpkParam, /* socket options */ +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmUnpkCmSockOpts (unpkParam, mBuf) -CmSockOpts *unpkParam; /* socket options */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt32, &unpkParam->level, mBuf); @@ -1009,17 +888,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmUnpkCmSockParam ( -CmSockParam *unpkParam, /* socket parameters */ -Buffer *mBuf /* message buffer */ +CmSockParam *unpkParam, /* socket parameters */ +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmUnpkCmSockParam (unpkParam, mBuf) -CmSockParam *unpkParam; /* socket parameters */ -Buffer *mBuf; /* message buffer */ -#endif { uint32_t num; @@ -1055,17 +928,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI static S16 cmUnpkTlsTptParam ( -TlsTptParam *unpkParam, /* TLS parameters */ -Buffer *mBuf /* message buffer */ +TlsTptParam *unpkParam, /* TLS parameters */ +Buffer *mBuf /* message buffer */ ) -#else -static S16 cmUnpkTlsTptParam (unpkParam, mBuf) -TlsTptParam *unpkParam; /* TLS parameters */ -Buffer *mBuf; /* message buffer */ -#endif { uint32_t num; @@ -1103,17 +970,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmTptParam ( -CmTptParam *unpkParam, /* transport parameters */ -Buffer *mBuf /* message buffer */ +CmTptParam *unpkParam, /* transport parameters */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmTptParam (unpkParam, mBuf) -CmTptParam *unpkParam; /* transport parameters */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -1163,17 +1024,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIpHdrParm ( -CmIpHdrParm *pkParam, /* IP hdr parameters */ -Buffer *mBuf /* message buffer */ +CmIpHdrParm *pkParam, /* IP hdr parameters */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIpHdrParm (pkParam, mBuf) -CmIpHdrParm *pkParam; /* IP hdr parameters */ -Buffer *mBuf; /* message buffer */ -#endif { switch (pkParam->type) @@ -1233,17 +1088,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmTptLocalInf ( -CmTptLocalInf *unpkParam, /* local interface info */ -Buffer *mBuf /* message buffer */ +CmTptLocalInf *unpkParam, /* local interface info */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmTptLocalInf (unpkParam, mBuf) -CmTptLocalInf *unpkParam; /* local interface info */ -Buffer *mBuf; /* message buffer */ -#endif { /* first unpack the bool intfPrsnt value which is always packed */ @@ -1275,17 +1124,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIpv6ExtHdr ( -CmIpv6ExtHdr *pkParam, /* IPV6 extension hdrs */ -Buffer *mBuf /* message buffer */ +CmIpv6ExtHdr *pkParam, /* IPV6 extension hdrs */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIpv6ExtHdr (pkParam, mBuf) -CmIpv6ExtHdr *pkParam; /*IPV6 extension hdrs */ -Buffer *mBuf; /* message buffer */ -#endif { /* pack first Route hdr */ @@ -1320,17 +1163,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIpv6RtHdr ( -CmIpv6RtHdr *pkParam, /* IPV6 Route hdr */ -Buffer *mBuf /* message buffer */ +CmIpv6RtHdr *pkParam, /* IPV6 Route hdr */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIpv6RtHdr (pkParam, mBuf) -CmIpv6RtHdr *pkParam; /* IPV6 Route hdr */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t idx; @@ -1362,19 +1199,12 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmIpv6RtHdr ( -CmIpv6RtHdr *unpkParam, /* IPV6 Route hdr */ -Buffer *mBuf, /* message buffer */ -Mem *memInfo /* meminfo to allocate for Route hdr */ +CmIpv6RtHdr *unpkParam, /* IPV6 Route hdr */ +Buffer *mBuf, /* message buffer */ +Mem *memInfo /* meminfo to allocate for Route hdr */ ) -#else -S16 cmUnpkCmIpv6RtHdr (unpkParam, mBuf, memInfo) -CmIpv6RtHdr *unpkParam; /* IPV6 Route hdr */ -Buffer *mBuf; /* message buffer */ -Mem *memInfo; /* meminfo to allocate for Route hdr */ -#endif { uint8_t idx; /* array index */ S32 retVal; /* temporary return value */ @@ -1418,19 +1248,12 @@ Mem *memInfo; /* meminfo to allocate for Route hdr */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmIpv6ExtHdr ( -CmIpv6ExtHdr *unpkParam, /* IPV6 extension hdrs */ -Buffer *mBuf, /* message buffer */ -Mem *memInfo /* meminfo to allocate for IPV6 ext hdr */ +CmIpv6ExtHdr *unpkParam, /* IPV6 extension hdrs */ +Buffer *mBuf, /* message buffer */ +Mem *memInfo /* meminfo to allocate for IPV6 ext hdr */ ) -#else -S16 cmUnpkCmIpv6ExtHdr (unpkParam, mBuf, memInfo) -CmIpv6ExtHdr *unpkParam; /* IPV6 extension hdrs */ -Buffer *mBuf; /* message buffer */ -Mem *memInfo; /* meminfo to allocate for IPV6 ext hdr */ -#endif { /* unpack HBH hdr first */ @@ -1465,17 +1288,11 @@ Mem *memInfo; /* meminfo to allocate for IPV6 ext hdr */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIpv6DestOptsArr ( -CmIpv6DestOptsArr *pkParam, /* IPV6 Dest hdr array */ -Buffer *mBuf /* message buffer */ +CmIpv6DestOptsArr *pkParam, /* IPV6 Dest hdr array */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIpv6DestOptsArr (pkParam, mBuf) -CmIpv6DestOptsArr *pkParam; /* IPV6 Dest hdr array */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t numOptions; @@ -1503,17 +1320,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIpv6DestOptsHdr ( -CmIpv6DestOptsHdr *pkParam, /* IPV6 Dest opt */ -Buffer *mBuf /* message buffer */ +CmIpv6DestOptsHdr *pkParam, /* IPV6 Dest opt */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIpv6DestOptsHdr (pkParam, mBuf) -CmIpv6DestOptsHdr *pkParam; /* IPV6 Dest opt */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t optLen; @@ -1542,19 +1353,12 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmIpv6DestOptsHdr ( -CmIpv6DestOptsHdr *unpkParam,/* IPV6 Dest Option */ -Buffer *mBuf, /* message buffer */ -Mem *memInfo /* meminfo to allocate mem for dest opt */ +CmIpv6DestOptsHdr *unpkParam,/* IPV6 Dest Option */ +Buffer *mBuf, /* message buffer */ +Mem *memInfo /* meminfo to allocate mem for dest opt */ ) -#else -S16 cmUnpkCmIpv6DestOptsHdr (unpkParam, mBuf, memInfo) -CmIpv6DestOptsHdr *unpkParam;/* IPV6 Dest Option */ -Buffer *mBuf; /* message buffer */ -Mem *memInfo; /* meminfo to allocate mem for dest opt */ -#endif { S32 retVal; /* temporary return value */ uint8_t optLen; /* length of value field */ @@ -1596,19 +1400,12 @@ Mem *memInfo; /* meminfo to allocate mem for dest opt */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmIpv6DestOptsArr ( -CmIpv6DestOptsArr *unpkParam, /* all IPV6 Destination Options */ -Buffer *mBuf, /* message buffer */ -Mem *memInfo /* meminfo to allocate mem for dest opts */ +CmIpv6DestOptsArr *unpkParam, /* all IPV6 Destination Options */ +Buffer *mBuf, /* message buffer */ +Mem *memInfo /* meminfo to allocate mem for dest opts */ ) -#else -S16 cmUnpkCmIpv6DestOptsArr (unpkParam, mBuf, memInfo) -CmIpv6DestOptsArr *unpkParam; /* all IPV6 Destination Options */ -Buffer *mBuf; /* message buffer */ -Mem *memInfo; /* meminfo to allocate mem for dest opts */ -#endif { uint8_t numOptions; S16 retVal; @@ -1652,17 +1449,11 @@ Mem *memInfo; /* meminfo to allocate mem for dest opts */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIpv6HBHHdrArr ( -CmIpv6HBHHdrArr *pkParam, /* all IPV6 HopByHop options */ -Buffer *mBuf /* message buffer */ +CmIpv6HBHHdrArr *pkParam, /* all IPV6 HopByHop options */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIpv6HBHHdrArr (pkParam, mBuf) -CmIpv6HBHHdrArr *pkParam; /* IPV6 HopByHop options */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t numOptions; @@ -1689,17 +1480,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIpv6HBHHdr ( -CmIpv6HBHHdr *pkParam, /* individual IPV6 HBH options */ -Buffer *mBuf /* message buffer */ +CmIpv6HBHHdr *pkParam, /* individual IPV6 HBH options */ +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIpv6HBHHdr (pkParam, mBuf) -CmIpv6HBHHdr *pkParam; /* individual IPV6 HBH options */ -Buffer *mBuf; /* message buffer */ -#endif { uint8_t optLen; @@ -1731,23 +1516,15 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmIpv6HBHHdr ( -CmIpv6HBHHdr *unpkParam,/* individual IPV6 HBH Option */ -Buffer *mBuf, /* message buffer */ -Mem *memInfo /* meminfo to allocate mem for HBH opt */ +CmIpv6HBHHdr *unpkParam,/* individual IPV6 HBH Option */ +Buffer *mBuf, /* message buffer */ +Mem *memInfo /* meminfo to allocate mem for HBH opt */ ) -#else -S16 cmUnpkCmIpv6HBHHdr (unpkParam, mBuf, memInfo) -CmIpv6HBHHdr *unpkParam;/* individual IPV6 HBH Option */ -Buffer *mBuf; /* message buffer */ -Mem *memInfo; /* meminfo to allocate mem for HBH opt */ -#endif { S32 retVal; /* temporary return value */ uint8_t optLen; /* length of value field */ - CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); CMCHKUNPK(oduPackUInt8, &unpkParam->length, mBuf); @@ -1784,19 +1561,12 @@ Mem *memInfo; /* meminfo to allocate mem for HBH opt */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmIpv6HBHHdrArr ( -CmIpv6HBHHdrArr *unpkParam, /* all HBH options */ -Buffer *mBuf, /* message buffer */ -Mem *memInfo /* meminfo to allocate space for HBH opt */ +CmIpv6HBHHdrArr *unpkParam, /* all HBH options */ +Buffer *mBuf, /* message buffer */ +Mem *memInfo /* meminfo to allocate space for HBH opt */ ) -#else -S16 cmUnpkCmIpv6HBHHdrArr (unpkParam, mBuf, memInfo) -CmIpv6HBHHdrArr *unpkParam; /* all HBH options */ -Buffer *mBuf; /* message buffer */ -Mem *memInfo; /* meminfo to allocate space for HBH opt */ -#endif { uint8_t numOptions; S16 retVal; @@ -1837,7 +1607,6 @@ Mem *memInfo; /* meminfo to allocate space for HBH opt */ * File: cm_tpt.c * */ -#ifdef ANSI /* added */ #ifdef IPV6_OPTS_SUPPORTED S16 cmUnpkCmIpHdrParm @@ -1853,19 +1622,6 @@ CmIpHdrParm *unpkParam,/* ip hdr parameters */ Buffer *mBuf /* message buffer */ ) #endif /* IPV6_OPTS_SUPPORTED */ -#else -/* added */ -#ifdef IPV6_OPTS_SUPPORTED -S16 cmUnpkCmIpHdrParm (unpkParam, mBuf, memInfo) -CmIpHdrParm *unpkParam;/* ip hdr parameters */ -Buffer *mBuf; /* message buffer */ -Mem *memInfo; /* meminfo to allocate mem for ipHdrParam */ -#else -S16 cmUnpkCmIpHdrParm (unpkParam, mBuf) -CmIpHdrParm *unpkParam;/* ip hdr parameters */ -Buffer *mBuf; /* message buffer */ -#endif /* IPV6_OPTS_SUPPORTED */ -#endif { CMCHKUNPK(oduPackUInt8, &unpkParam->type, mBuf); @@ -1923,17 +1679,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmPkCmIcmpFilter ( -CmIcmpFilter *pkParam, -Buffer *mBuf /* message buffer */ +CmIcmpFilter *pkParam, +Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmIcmpFilter (pkParam, mBuf) -CmIcmpFilter *pkParam; -Buffer *mBuf; /* message buffer */ -#endif { /* Variable declaration */ S16 idx; @@ -1997,17 +1747,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_tpt.c * */ -#ifdef ANSI S16 cmUnpkCmIcmpFilter ( -CmIcmpFilter *unpkParam, -Buffer *mBuf /* message buffer */ +CmIcmpFilter *unpkParam, +Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmIcmpFilter (unpkParam, mBuf) -CmIcmpFilter *unpkParam; -Buffer *mBuf; /* message buffer */ -#endif { /* Variable declaration */ S16 idx; diff --git a/src/cm/crg.c b/src/cm/crg.c index 2acd045ba..1e221cd27 100755 --- a/src/cm/crg.c +++ b/src/cm/crg.c @@ -55,19 +55,12 @@ * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCrgBndReq ( Pst* pst, SuId suId, SpId spId ) -#else -S16 cmPkCrgBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { Buffer *mBuf = NULLP; @@ -115,19 +108,12 @@ SpId spId; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCrgBndReq ( CrgBndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCrgBndReq(func, pst, mBuf) -CrgBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; SpId spId; @@ -170,19 +156,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCrgBndCfm ( Pst* pst, SuId suId, uint8_t status ) -#else -S16 cmPkCrgBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -231,19 +210,12 @@ uint8_t status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCrgBndCfm ( CrgBndCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCrgBndCfm(func, pst, mBuf) -CrgBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; uint8_t status; @@ -285,19 +257,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCrgUbndReq ( Pst* pst, SpId spId, Reason reason ) -#else -S16 cmPkCrgUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif { Buffer *mBuf = NULLP; @@ -345,19 +310,12 @@ Reason reason; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCrgUbndReq ( CrgUbndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCrgUbndReq(func, pst, mBuf) -CrgUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; Reason reason; @@ -401,7 +359,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCrgCfgReq ( Pst* pst, @@ -409,13 +366,6 @@ SpId spId, CrgCfgTransId transId, CrgCfgReqInfo * cfgReqInfo ) -#else -S16 cmPkCrgCfgReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -CrgCfgTransId transId; -CrgCfgReqInfo * cfgReqInfo; -#endif { Buffer *mBuf = NULLP; @@ -488,19 +438,12 @@ CrgCfgReqInfo * cfgReqInfo; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCrgCfgReq ( CrgCfgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCrgCfgReq(func, pst, mBuf) -CrgCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; CrgCfgTransId transId; @@ -564,7 +507,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCrgCfgCfm ( Pst* pst, @@ -572,13 +514,6 @@ SuId suId, CrgCfgTransId transId, uint8_t status ) -#else -S16 cmPkCrgCfgCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -CrgCfgTransId transId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -637,19 +572,12 @@ uint8_t status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCrgCfgCfm ( CrgCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCrgCfgCfm(func, pst, mBuf) -CrgCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; CrgCfgTransId transId; @@ -703,17 +631,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgCfgTransId ( CrgCfgTransId *param, Buffer *mBuf ) -#else -S16 cmPkCrgCfgTransId(param, mBuf) -CrgCfgTransId *param; -Buffer *mBuf; -#endif { S32 i; @@ -741,17 +663,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgCfgTransId ( CrgCfgTransId *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgCfgTransId(param, mBuf) -CrgCfgTransId *param; -Buffer *mBuf; -#endif { S32 i; @@ -779,17 +695,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgBwCfg ( CrgBwCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgBwCfg(param, mBuf) -CrgBwCfg *param; -Buffer *mBuf; -#endif { @@ -815,17 +725,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgBwCfg ( CrgBwCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgBwCfg(param, mBuf) -CrgBwCfg *param; -Buffer *mBuf; -#endif { @@ -851,17 +755,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgRachCfg ( CrgRachCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgRachCfg(param, mBuf) -CrgRachCfg *param; -Buffer *mBuf; -#endif { @@ -886,17 +784,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgRachCfg ( CrgRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgRachCfg(param, mBuf) -CrgRachCfg *param; -Buffer *mBuf; -#endif { @@ -921,20 +813,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgCellCfg ( CrgCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgCellCfg(param, mBuf) -CrgCellCfg *param; -Buffer *mBuf; -#endif { - #ifdef EMTC_ENABLE CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); #endif @@ -965,17 +850,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgCellCfg ( CrgCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgCellCfg(param, mBuf) -CrgCellCfg *param; -Buffer *mBuf; -#endif { @@ -1009,17 +888,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgUeUlHqCfg ( CrgUeUlHqCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgUeUlHqCfg(param, mBuf) -CrgUeUlHqCfg *param; -Buffer *mBuf; -#endif { @@ -1043,17 +916,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmPkCrgUeSCellCfg ( CrgUeSCellInfo *param, Buffer *mBuf ) -#else -static S16 cmPkCrgUeSCellCfg(param, mBuf) -CrgUeSCellInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(SPkS16, param->rguDlSapId, mBuf); CMCHKPK(SPkS16, param->rguUlSapId, mBuf); @@ -1077,17 +944,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmUnpkCrgUeSCellCfg ( CrgUeSCellInfo *param, Buffer *mBuf ) -#else -static S16 cmUnpkCrgUeSCellCfg(param, mBuf) -CrgUeSCellInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->macInst, mBuf); @@ -1110,17 +971,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgUeSecCellInfo ( CrgUeSecCellInfo *param, Buffer *mBuf ) -#else -S16 cmPkCrgUeSecCellInfo(param, mBuf) -CrgUeSecCellInfo *param; -Buffer *mBuf; -#endif { S8 idx; for(idx = param->numSCells - 1; idx >= 0; idx--) @@ -1149,17 +1004,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgUeSecCellInfo ( CrgUeSecCellInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgUeSecCellInfo(param, mBuf) -CrgUeSecCellInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -1195,17 +1044,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgUeUlHqCfg ( CrgUeUlHqCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgUeUlHqCfg(param, mBuf) -CrgUeUlHqCfg *param; -Buffer *mBuf; -#endif { @@ -1230,17 +1073,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgUeCfg ( CrgUeCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgUeCfg(param, mBuf) -CrgUeCfg *param; -Buffer *mBuf; -#endif { #ifdef TENB_MULT_CELL_SUPPRT @@ -1272,17 +1109,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgUeCfg ( CrgUeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgUeCfg(param, mBuf) -CrgUeCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -1317,17 +1148,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgDlLchCfg ( CrgDlLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgDlLchCfg(param, mBuf) -CrgDlLchCfg *param; -Buffer *mBuf; -#endif { @@ -1352,17 +1177,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgDlLchCfg ( CrgDlLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgDlLchCfg(param, mBuf) -CrgDlLchCfg *param; -Buffer *mBuf; -#endif { @@ -1387,20 +1206,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgUlLchCfg ( CrgUlLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgUlLchCfg(param, mBuf) -CrgUlLchCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); return ROK; @@ -1423,17 +1235,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgUlLchCfg ( CrgUlLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgUlLchCfg(param, mBuf) -CrgUlLchCfg *param; -Buffer *mBuf; -#endif { @@ -1459,17 +1265,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgLchCfg ( CrgLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgLchCfg(param, mBuf) -CrgLchCfg *param; -Buffer *mBuf; -#endif { /* crg_c_001.main_5 - ADD - Added the packing for LTE_L2_MEAS. */ @@ -1503,17 +1303,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgLchCfg ( CrgLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgLchCfg(param, mBuf) -CrgLchCfg *param; -Buffer *mBuf; -#endif { @@ -1548,17 +1342,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgCfg ( CrgCfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgCfg(param, mBuf) -CrgCfg *param; -Buffer *mBuf; -#endif { @@ -1596,17 +1384,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgCfg ( CrgCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgCfg(param, mBuf) -CrgCfg *param; -Buffer *mBuf; -#endif { @@ -1644,17 +1426,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgCellRecfg ( CrgCellRecfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgCellRecfg(param, mBuf) -CrgCellRecfg *param; -Buffer *mBuf; -#endif { @@ -1680,17 +1456,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgCellRecfg ( CrgCellRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgCellRecfg(param, mBuf) -CrgCellRecfg *param; -Buffer *mBuf; -#endif { @@ -1716,17 +1486,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgUeRecfg ( CrgUeRecfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgUeRecfg(param, mBuf) -CrgUeRecfg *param; -Buffer *mBuf; -#endif { #ifdef LTE_ADV @@ -1765,17 +1529,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgUeRecfg ( CrgUeRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgUeRecfg(param, mBuf) -CrgUeRecfg *param; -Buffer *mBuf; -#endif { @@ -1808,17 +1566,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgLchRecfg ( CrgLchRecfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgLchRecfg(param, mBuf) -CrgLchRecfg *param; -Buffer *mBuf; -#endif { @@ -1846,17 +1598,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgLchRecfg ( CrgLchRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgLchRecfg(param, mBuf) -CrgLchRecfg *param; -Buffer *mBuf; -#endif { @@ -1884,17 +1630,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgRecfg ( CrgRecfg *param, Buffer *mBuf ) -#else -S16 cmPkCrgRecfg(param, mBuf) -CrgRecfg *param; -Buffer *mBuf; -#endif { @@ -1932,17 +1672,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgRecfg ( CrgRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgRecfg(param, mBuf) -CrgRecfg *param; -Buffer *mBuf; -#endif { @@ -1980,17 +1714,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgDel ( CrgDel *param, Buffer *mBuf ) -#else -S16 cmPkCrgDel(param, mBuf) -CrgDel *param; -Buffer *mBuf; -#endif { @@ -2032,17 +1760,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgDel ( CrgDel *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgDel(param, mBuf) -CrgDel *param; -Buffer *mBuf; -#endif { @@ -2084,17 +1806,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgRst ( CrgRst *param, Buffer *mBuf ) -#else -S16 cmPkCrgRst(param, mBuf) -CrgRst *param; -Buffer *mBuf; -#endif { @@ -2120,17 +1836,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgRst ( CrgRst *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgRst(param, mBuf) -CrgRst *param; -Buffer *mBuf; -#endif { @@ -2156,17 +1866,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkCrgCfgReqInfo ( CrgCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkCrgCfgReqInfo(param, mBuf) -CrgCfgReqInfo *param; -Buffer *mBuf; -#endif { @@ -2207,17 +1911,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkCrgCfgReqInfo ( CrgCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCrgCfgReqInfo(param, mBuf) -CrgCfgReqInfo *param; -Buffer *mBuf; -#endif { diff --git a/src/cm/ctf.c b/src/cm/ctf.c index 08e00eaa8..4a943f29f 100755 --- a/src/cm/ctf.c +++ b/src/cm/ctf.c @@ -63,19 +63,12 @@ * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfBndReq ( Pst* pst, SuId suId, SpId spId ) -#else -S16 cmPkCtfBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { Buffer *mBuf = NULLP; @@ -126,19 +119,12 @@ SpId spId; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfBndReq ( CtfBndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfBndReq(func, pst, mBuf) -CtfBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; SpId spId = 0; @@ -183,19 +169,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfBndCfm ( Pst* pst, SuId suId, uint8_t status ) -#else -S16 cmPkCtfBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -247,19 +226,12 @@ uint8_t status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfBndCfm ( CtfBndCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfBndCfm(func, pst, mBuf) -CtfBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; uint8_t status; @@ -303,19 +275,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfUbndReq ( Pst* pst, SpId spId, Reason reason ) -#else -S16 cmPkCtfUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif { Buffer *mBuf = NULLP; @@ -366,19 +331,12 @@ Reason reason; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfUbndReq ( CtfUbndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfUbndReq(func, pst, mBuf) -CtfUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; Reason reason = 0; @@ -423,17 +381,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI static S16 cmRelCtfCfgReq ( Pst *pst, CtfCfgReqInfo *cfgReqInfo ) -#else -static S16 cmRelCtfCfgReq(pst,cfgReqInfo) -Pst *pst; -CtfCfgReqInfo *param; -#endif { /* ctf_c_001.main_4: Added support for vendor specific parameters */ #ifdef CTF_VER3 @@ -468,17 +420,11 @@ CtfCfgReqInfo *param; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfNhKeyInfo ( CtfNhKeyInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfNhKeyInfo(param, mBuf) -CtfNhKeyInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -514,17 +460,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfKenbStarInfo ( CtfKenbStarInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfKenbStarInfo(param, mBuf) -CtfKenbStarInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -561,22 +501,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfAskeyInfo ( CtfAsKeyInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfAskeyInfo(param, mBuf) -CtfAsKeyInfo *param; -Buffer *mBuf; -#endif { - S16 idx; - - for(idx=31;idx>=0;idx--) { @@ -608,17 +539,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfKdfReqInfo ( CtfKdfReqInfo *param, Buffer *mBuf - ) -#else -S16 cmPkCtfKdfReqInfo(param, mBuf) -CtfKdfReqInfo *param; -Buffer *mBuf; -#endif +) { @@ -656,7 +581,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfKdfReq ( Pst* pst, @@ -664,18 +588,9 @@ SpId spId, CtfCfgTransId transId, CtfKdfReqInfo* kdfReqInfo ) -#else -S16 cmPkCtfKdfReq(pst, spId, transId, kdfReqInfo) -Pst* pst; -SpId spId; -CtfCfgTransId transId; -CtfKdfReqInfo* kdfReqInfo; -#endif { Buffer *mBuf = NULLP; - - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -743,16 +658,11 @@ CtfKdfReqInfo* kdfReqInfo; /********************************************************************************************************************************/ /*START OF CNM PACK & UNPACK FUNCTIONS*/ /********************************************************************************************************************************/ -#ifdef ANSI S16 cmPkCtfCnmVendorSpecificInfo ( CtfCnmVendorSpecificInfo *param, Buffer *mBuf ) -#else -CtfCnmVendorSpecificInfo *param; -Buffer *mBuf; -#endif { S32 i; if(param->numOfVendorSpecifcParam <= CTF_CNM_MAX_VENDOR_PARAMS) @@ -766,17 +676,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmPkCtfCtfCnmCellSyncReq ( CtfCnmCellSyncReq *param, Buffer *mBuf ) -#else -S16 cmPkCtfCtfCnmCellSyncReq(param, mBuf) -CtfCnmCellSyncReq *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->nbrEarfcn, mBuf); @@ -790,17 +694,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmPkCtfcfgReqInfo ( CtfCnmInitSyncReq *param, Buffer *mBuf ) -#else -S16 cmPkCtfcfgReqInfo(param, mBuf) -CtfCnmInitSyncReq *param; -Buffer *mBuf; -#endif { S32 i; @@ -819,17 +717,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkCtfCnmVendorSpecificInfo ( CtfCnmVendorSpecificInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmVendorSpecificInfo(param, mBuf) -CtfCnmVendorSpecificInfo *param; -Buffer *mBuf; -#endif { S32 i; @@ -841,20 +733,13 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkCtfCtfCnmCellSyncReq ( CtfCnmCellSyncReq *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCtfCnmCellSyncReq(param, mBuf) -CtfCnmCellSyncReq *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->nbrSpecSfCfg, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->nbrCellNRb, mBuf); @@ -866,17 +751,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkCtfsyncReqInfo ( CtfCnmInitSyncReq *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfsyncReqInfo(param, mBuf) -CtfCnmInitSyncReq *param; -Buffer *mBuf; -#endif { S32 i; @@ -907,7 +786,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmCellSyncReq ( Pst* pst, @@ -915,18 +793,10 @@ SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncReq * cfgReqInfo ) -#else -S16 cmPkCtfCnmCellSyncReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmCellSyncReq * cfgReqInfo; -#endif { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) /* ctf_c_001.main_3 Compilation warning fix with g++ */ @@ -1008,19 +878,12 @@ CtfCnmCellSyncReq * cfgReqInfo; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmCellSyncReq ( CtfCnmCellSyncReqMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmCellSyncReq(func, pst, mBuf) -CtfCnmCellSyncReqMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -1099,7 +962,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmInitSyncReq ( Pst* pst, @@ -1107,13 +969,6 @@ SpId spId, CtfCfgTransId *transId, CtfCnmInitSyncReq * cfgReqInfo ) -#else -S16 cmPkCtfCnmInitSyncReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmInitSyncReq * cfgReqInfo; -#endif { Buffer *mBuf = NULLP; @@ -1201,19 +1056,12 @@ CtfCnmInitSyncReq * cfgReqInfo; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmInitSyncReq ( CtfCnmInitSyncReqMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmInitSyncReq(func, pst, mBuf) -CtfCnmInitSyncReqMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -1275,17 +1123,11 @@ Buffer *mBuf; } /*-----------------------------------------------------------------------------*/ -#ifdef ANSI S16 cmPkCtfctfCnmMibInfo ( CtfCnmMibInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfctfCnmMibInfo(param, mBuf) -CtfCnmMibInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); @@ -1297,17 +1139,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmPkCtfctfCnmInitSyncInfo ( CtfCnmInitSyncInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfctfCnmInitSyncInfo(param, mBuf) -CtfCnmInitSyncInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->pci, mBuf); @@ -1320,21 +1156,14 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmPkCtfcfgRspInfo ( CtfCnmInitSyncRsp *param, Buffer *mBuf ) -#else -S16 cmPkCtfcfgRspInfo(param, mBuf) -CtfCnmInitSyncRsp *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKPK(oduUnpackUInt8, param->status, mBuf); CMCHKPK(oduUnpackUInt16, param->earfcn, mBuf); if(param->numOfNeighbourInfo <= CTF_CNM_MAX_CELL_SEARCH) @@ -1364,7 +1193,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmInitSyncRsp ( Pst* pst, @@ -1372,13 +1200,6 @@ SpId spId, CtfCfgTransId *transId, CtfCnmInitSyncRsp * cfgRspInfo ) -#else -S16 cmPkCtfCnmInitSyncRsp(pst, spId, transId, cfgRspInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmInitSyncRsp * cfgRspInfo; -#endif { Buffer *mBuf = NULLP; @@ -1451,20 +1272,13 @@ CtfCnmInitSyncRsp * cfgRspInfo; } /*-----------------------------------------------------------------------------*/ -#ifdef ANSI S16 cmUnpkCtfctfCnmMibInfo ( CtfCnmMibInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfctfCnmMibInfo(param, mBuf) -CtfCnmMibInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->dlSystemBandWidht, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->phichResource, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->phichDuration, mBuf); @@ -1474,17 +1288,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkctfCnmInitSyncInfo ( CtfCnmInitSyncInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkctfCnmInitSyncInfo(param, mBuf) -CtfCnmInitSyncInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); @@ -1497,21 +1305,14 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkCtfCnmInitSyncRspMsg ( CtfCnmInitSyncRsp *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmInitSyncRspMsg(param, mBuf) -CtfCnmInitSyncRsp *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->numOfNeighbourInfo, mBuf); for(i=0; (i < param->numOfNeighbourInfo)&&(i < CTF_CNM_MAX_CELL_SEARCH); i++) { @@ -1536,19 +1337,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmInitSyncRsp ( CtfCnmInitSyncRspMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmInitSyncRsp(func, pst, mBuf) -CtfCnmInitSyncRspMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -1611,20 +1405,13 @@ Buffer *mBuf; } /*-----------------------------------------------------------------------*/ -#ifdef ANSI S16 cmPkCtfCellSyncRsp ( CtfCnmCellSyncRsp *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellSyncRsp(param, mBuf) -CtfCnmCellSyncRsp *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->status, mBuf); return ROK; @@ -1644,7 +1431,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmCellSyncRsp ( Pst* pst, @@ -1652,13 +1438,6 @@ SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncRsp * cfgRspInfo ) -#else -S16 cmPkCtfCnmCellSyncRsp(pst, spId, transId, cfgRspInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmCellSyncRsp * cfgRspInfo; -#endif { Buffer *mBuf = NULLP; @@ -1733,20 +1512,13 @@ CtfCnmCellSyncRsp * cfgRspInfo; } /*------------------------------------------------------------*/ -#ifdef ANSI S16 cmUnpkCtfCnmSyncRspMsg ( CtfCnmCellSyncRsp *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmSyncRspMsg(param, mBuf) -CtfCnmCellSyncRsp *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); return ROK; @@ -1765,19 +1537,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmCellSyncRsp ( CtfCnmCellSyncRspMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmCellSyncRsp(func, pst, mBuf) -CtfCnmCellSyncRspMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -1840,20 +1605,13 @@ Buffer *mBuf; } /*---------------------------------------------------------------*/ -#ifdef ANSI S16 cmPkCtfcfgIndInfo ( CtfCnmCellSyncInd *param, Buffer *mBuf ) -#else -S16 cmPkCtfcfgIndInfo(param, mBuf) -CtfCnmCellSyncInd *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->status, mBuf); CMCHKPK(cmPkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); return ROK; @@ -1874,7 +1632,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCnmCellSyncInd ( Pst* pst, @@ -1882,13 +1639,6 @@ SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncInd * cfgIndInfo ) -#else -S16 cmPkCtfCnmCellSyncInd(pst, spId, transId, cfgIndInfo) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfCnmCellSyncInd * cfgIndInfo; -#endif { Buffer *mBuf = NULLP; @@ -1963,20 +1713,13 @@ CtfCnmCellSyncInd * cfgIndInfo; /*---------------------------------------------------------------*/ -#ifdef ANSI S16 cmUnpkCtfCnmSyncIndMsg ( CtfCnmCellSyncInd *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmSyncIndMsg(param, mBuf) -CtfCnmCellSyncInd *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkCtfCnmVendorSpecificInfo, ¶m->ctfCnmVendorSpecificInfo, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->status, mBuf); return ROK; @@ -1996,19 +1739,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCnmCellSyncInd ( CtfCnmCellSyncIndMsg func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCnmCellSyncInd(func, pst, mBuf) -CtfCnmCellSyncIndMsg func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; @@ -2092,7 +1828,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCfgReq ( Pst* pst, @@ -2100,13 +1835,6 @@ SpId spId, CtfCfgTransId transId, CtfCfgReqInfo* cfgReqInfo ) -#else -S16 cmPkCtfCfgReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -CtfCfgTransId transId; -CtfCfgReqInfo* cfgReqInfo; -#endif { Buffer *mBuf = NULLP; @@ -2194,22 +1922,15 @@ CtfCfgReqInfo* cfgReqInfo; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfNhKeyInfo ( CtfNhKeyInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfNhKeyInfo(param, mBuf) -CtfNhKeyInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; - - + CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); for(idx=0;idx<32;idx++) @@ -2237,22 +1958,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfKenbStarInfo ( CtfKenbStarInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfKenbStarInfo(param, mBuf) -CtfKenbStarInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; - CMCHKUNPK(oduPackUInt16, ¶m->dlCarrFreq, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->physCellId, mBuf); for(idx=0;idx<32;idx++) @@ -2281,22 +1995,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfAskeyInfo ( CtfAsKeyInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfAskeyInfo(param, mBuf) -CtfAskeyInfo *param; -Buffer *mBuf; -#endif { - uint8_t idx; - CMCHKUNPK(oduPackUInt8, ¶m->intgAlgoType, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ciphAlgoType, mBuf); for(idx=0;idx<32;idx++) @@ -2324,20 +2030,13 @@ Buffer *mBuf; * File: * * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfKdfReqInfo ( CtfKdfReqInfo *param, Buffer *mBuf - ) -#else -S16 cmUnpkCtfKdfReqInfo(param, mBuf) -CtfKdfReqInfo *param; -Buffer *mBuf; -#endif +) { - CMCHKUNPK(oduPackUInt8, ¶m->keyDerType, mBuf); switch (param->keyDerType) { @@ -2371,19 +2070,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfKdfReq ( CtfKdfReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfKdfReq(func, pst, mBuf) -CtfKdfReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; CtfCfgTransId transId; @@ -2466,19 +2158,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCfgReq ( CtfCfgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgReq(func, pst, mBuf) -CtfCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; CtfCfgTransId transId; @@ -2558,21 +2243,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfNhKeyCfmInfo ( CtfNhKeyCfmInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfNhKeyCfmInfo(param, mBuf) -CtfNhKeyCfmInfo *param; -Buffer *mBuf; -#endif { S16 idx; - for(idx=31;idx>=0;idx--) { @@ -2599,17 +2277,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfKenbStarCfmInfo ( CtfKenbStarCfmInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfKenbStarCfmInfo(param, mBuf) -CtfKenbStarCfmInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -2641,22 +2313,15 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfAskeyCfmInfo ( CtfAskeyCfmInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfAskeyCfmInfo(param, mBuf) -CtfAskeyCfmInfo *param; -Buffer *mBuf; -#endif { S16 idx; - for(idx=15;idx>=0;idx--) { CMCHKPK(oduUnpackUInt8,param->cpCiphKey[idx],mBuf); @@ -2690,22 +2355,15 @@ Buffer *mBuf; * File: * * **********************************************************/ -#ifdef ANSI S16 cmPkCtfKdfCfmInfo ( CtfKdfCfmInfo *param, Buffer *mBuf - ) -#else -S16 cmPkCtfKdfCfmInfo(param, mBuf) -CtfKdfCfmInfo *param; -Buffer *mBuf; -#endif +) { - switch (param->keyDerType) - { + { case CTF_KDF_TYPE1: CMCHKPK(cmPkCtfAskeyCfmInfo, ¶m->u.kEnbInf, mBuf); break; @@ -2736,7 +2394,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfKdfCfm ( Pst* pst, @@ -2745,13 +2402,6 @@ CtfCfgTransId transId, CtfKdfCfmInfo *kdfCfmInfo, uint8_t status ) -#else -S16 cmPkCtfKdfCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -CtfCfgTransId transId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -2845,7 +2495,6 @@ uint8_t status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfCfgCfm ( Pst* pst, @@ -2853,13 +2502,6 @@ SuId suId, CtfCfgTransId transId, uint8_t status ) -#else -S16 cmPkCtfCfgCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -CtfCfgTransId transId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -2919,19 +2561,12 @@ uint8_t status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfEnbStopInd ( Pst* pst, SuId suId, CtfCfgTransId transId ) -#else -S16 cmPkCtfEnbStopInd(pst, suId, transId) -Pst* pst; -SuId suId; -CtfCfgTransId transId; -#endif { Buffer *mBuf = NULLP; @@ -2987,22 +2622,15 @@ CtfCfgTransId transId; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfNhKeyCfmInfo ( CtfNhKeyCfmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfNhKeyCfmInfo(param, mBuf) -CtfNhKeyCfmInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; - for(idx=0;idx<32;idx++) { CMCHKUNPK(oduPackUInt8,¶m->secKey[idx],mBuf); @@ -3028,21 +2656,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfKenbStarCfmInfo ( CtfKenbStarCfmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfKenbStarCfmInfo(param, mBuf) -CtfKenbStarCfmInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; - for(idx=0;idx<32;idx++) { @@ -3070,17 +2691,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfAskeyCfmInfo ( CtfAskeyCfmInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfAskeyCfmInfo(param, mBuf) -CtfAskeyCfmInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -3119,17 +2734,11 @@ Buffer *mBuf; * File: * * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfKdfCfmInfo ( CtfKdfCfmInfo *param, Buffer *mBuf - ) -#else -S16 cmUnpkCtfKdfCfmInfo(param, mBuf) -CtfKdfCfmInfo *param; -Buffer *mBuf; -#endif +) { @@ -3165,19 +2774,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfKdfCfm ( CtfKdfCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgCfm(func, pst, mBuf) -CtfKdfCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; @@ -3246,19 +2848,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfCfgCfm ( CtfCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgCfm(func, pst, mBuf) -CtfCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; @@ -3312,23 +2907,15 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfEnbStopInd ( CtfEnbStopInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfEnbStopInd(func, pst, mBuf) -CtfEnbStopInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; - if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -3370,7 +2957,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfUeIdChgReq ( Pst* pst, @@ -3379,14 +2965,6 @@ CtfCfgTransId transId, CtfUeInfo * ueInfo, CtfUeInfo * newUeInfo ) -#else -S16 cmPkCtfUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo) -Pst* pst; -SpId spId; -CtfCfgTransId transId; -CtfUeInfo * ueInfo; -CtfUeInfo * newUeInfo; -#endif { Buffer *mBuf = NULLP; @@ -3523,19 +3101,12 @@ CtfUeInfo * newUeInfo; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfUeIdChgReq ( CtfUeIdChgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeIdChgReq(func, pst, mBuf) -CtfUeIdChgReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId = 0; CtfCfgTransId transId; @@ -3645,7 +3216,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfUeIdChgCfm ( Pst* pst, @@ -3654,14 +3224,6 @@ CtfCfgTransId transId, CtfUeInfo * ueInfo, CmStatus status ) -#else -S16 cmPkCtfUeIdChgCfm(pst, suId, transId, ueInfo, status) -Pst* pst; -SuId suId; -CtfCfgTransId transId; -CtfUeInfo * ueInfo; -CmStatus status; -#endif { Buffer *mBuf = NULLP; @@ -3766,19 +3328,12 @@ CmStatus status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkCtfUeIdChgCfm ( CtfUeIdChgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeIdChgCfm(func, pst, mBuf) -CtfUeIdChgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; @@ -3867,21 +3422,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCfgTransId ( CtfCfgTransId *param, Buffer *mBuf ) -#else -S16 cmPkCtfCfgTransId(param, mBuf) -CtfCfgTransId *param; -Buffer *mBuf; -#endif { S32 i; - for (i=CTF_CFG_TRANSID_SIZE-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); } @@ -3905,17 +3453,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCfgTransId ( CtfCfgTransId *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgTransId(param, mBuf) -CtfCfgTransId *param; -Buffer *mBuf; -#endif { S32 i; @@ -3943,20 +3485,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfUeInfo ( CtfUeInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfUeInfo(param, mBuf) -CtfUeInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkLteRnti, param->ueId, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; @@ -3979,20 +3514,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfUeInfo ( CtfUeInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeInfo(param, mBuf) -CtfUeInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); return ROK; @@ -4017,17 +3545,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfBwCfgInfo ( CtfBwCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfBwCfgInfo(param, mBuf) -CtfBwCfgInfo *param; -Buffer *mBuf; -#endif { @@ -4057,17 +3579,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfBwCfgInfo ( CtfBwCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfBwCfgInfo(param, mBuf) -CtfBwCfgInfo *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4099,20 +3615,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfTxSchemeCfg ( CtfTxSchemeCfg *param, Buffer *mBuf ) -#else -S16 cmPkCtfTxSchemeCfg(param, mBuf) -CtfTxSchemeCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->cycPfx, mBuf); CMCHKPK(oduUnpackUInt32, param->scSpacing, mBuf); CMCHKPK(oduUnpackUInt32, param->duplexMode, mBuf); @@ -4138,17 +3647,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfTxSchemeCfg ( CtfTxSchemeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfTxSchemeCfg(param, mBuf) -CtfTxSchemeCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4182,20 +3685,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfAntennaCfgInfo ( CtfAntennaCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfAntennaCfgInfo(param, mBuf) -CtfAntennaCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->antPortsCnt, mBuf); return ROK; } @@ -4219,17 +3715,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfAntennaCfgInfo ( CtfAntennaCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfAntennaCfgInfo(param, mBuf) -CtfAntennaCfgInfo *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4263,20 +3753,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPrachCfgInfo ( CtfPrachCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPrachCfgInfo(param, mBuf) -CtfPrachCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -4315,20 +3798,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPrachCfgInfo ( CtfPrachCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPrachCfgInfo(param, mBuf) -CtfPrachCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4361,17 +3837,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPdschCfgInfo ( CtfPdschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPdschCfgInfo(param, mBuf) -CtfPdschCfgInfo *param; -Buffer *mBuf; -#endif { /*ctf_c_001.main_1*/ @@ -4403,20 +3873,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPdschCfgInfo ( CtfPdschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPdschCfgInfo(param, mBuf) -CtfPdschCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4446,20 +3909,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPuschCfgBasic ( CtfPuschCfgBasic *param, Buffer *mBuf ) -#else -S16 cmPkCtfPuschCfgBasic(param, mBuf) -CtfPuschCfgBasic *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->enable64QAM, mBuf); CMCHKPK(oduUnpackUInt8, param->hoppingOffset, mBuf); CMCHKPK(oduUnpackUInt32, param->hoppingMode, mBuf); @@ -4486,21 +3942,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPuschCfgBasic ( CtfPuschCfgBasic *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPuschCfgBasic(param, mBuf) -CtfPuschCfgBasic *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->noOfsubBands, mBuf); CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->hoppingMode = (CtfPuschHoppingMode)tmpEnum; @@ -4528,20 +3977,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPuschUlRS ( CtfPuschUlRS *param, Buffer *mBuf ) -#else -S16 cmPkCtfPuschUlRS(param, mBuf) -CtfPuschUlRS *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->cycShift, mBuf); CMCHKPK(oduUnpackUInt8, param->grpNum, mBuf); CMCHKPK(oduUnpackUInt8, param->seqHopEnabled, mBuf); @@ -4568,17 +4010,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPuschUlRS ( CtfPuschUlRS *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPuschUlRS(param, mBuf) -CtfPuschUlRS *param; -Buffer *mBuf; -#endif { @@ -4608,20 +4044,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPuschCfgInfo ( CtfPuschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPuschCfgInfo(param, mBuf) -CtfPuschCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -4651,20 +4080,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPuschCfgInfo ( CtfPuschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPuschCfgInfo(param, mBuf) -CtfPuschCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4694,20 +4116,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPhichCfgInfo ( CtfPhichCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPhichCfgInfo(param, mBuf) -CtfPhichCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -4737,21 +4152,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPhichCfgInfo ( CtfPhichCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPhichCfgInfo(param, mBuf) -CtfPhichCfgInfo *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4783,17 +4191,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPucchCfgInfo ( CtfPucchCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfPucchCfgInfo(param, mBuf) -CtfPucchCfgInfo *param; -Buffer *mBuf; -#endif { @@ -4828,21 +4230,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfPucchCfgInfo ( CtfPucchCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPucchCfgInfo(param, mBuf) -CtfPucchCfgInfo *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4875,20 +4270,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfSrsUlCfgInfo ( CtfSrsUlCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfSrsUlCfgInfo(param, mBuf) -CtfSrsUlCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -4921,20 +4309,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfSrsUlCfgInfo ( CtfSrsUlCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfSrsUlCfgInfo(param, mBuf) -CtfSrsUlCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -4967,20 +4348,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfTddSfCfgInfo ( CtfTddSfCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfTddSfCfgInfo(param, mBuf) -CtfTddSfCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -5010,17 +4384,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfVendorSpecParams ( CtfVendorSpecific *param, Buffer *mBuf ) -#else -S16 cmPkCtfVendorSpecParams(param, mBuf) -CtfVendorSpecific *param; -Buffer *mBuf; -#endif { if( param->buffLen != 0) { @@ -5048,22 +4416,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfVendorSpecParams ( Pst *pst, CtfVendorSpecific *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfVendorSpecParams(pst, param, mBuf) -Pst *pst; -CtfVendorSpecific *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt16, ¶m->buffLen, mBuf); if(param->buffLen != 0) { @@ -5102,20 +4462,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfTddSfCfgInfo ( CtfTddSfCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfTddSfCfgInfo(param, mBuf) -CtfTddSfCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -5140,17 +4493,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI static S16 cmPkCtfUnLicnsdCellParam ( CtfUnLicnsdCfgInfo *param, Buffer *mBuf ) -#else -static S16 cmPkCtfUnLicnsdCellParam(param, mBuf) -CtfUnLicnsdCfgInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -5193,17 +4540,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellCfgInfo ( CtfCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellCfgInfo(param, mBuf) -CtfCellCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef EMTC_ENABLE S32 i; @@ -5317,21 +4658,14 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI static S16 cmUnpkCtfUnLicnsdCellParam ( CtfUnLicnsdCfgInfo *param, Buffer *mBuf ) -#else -static S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf) -CtfUnLicnsdCfgInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; - CMCHKUNPK(oduPackUInt8, ¶m->numFreq, mBuf); for(idx = 0; idx < param->numFreq; idx++) @@ -5371,17 +4705,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellCfgInfo ( CtfCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellCfgInfo(param, mBuf) -CtfCellCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef EMTC_ENABLE S32 i; @@ -5504,17 +4832,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellRecfgInfo ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellRecfgInfo(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { @@ -5610,17 +4932,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellRecfgInfo ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellRecfgInfo(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5719,20 +5035,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedPdschCfgInfo ( CtfDedPdschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedPdschCfgInfo(param, mBuf) -CtfDedPdschCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) CMCHKPK(oduUnpackUInt32, param->pA, mBuf); @@ -5759,17 +5068,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedPdschCfgInfo ( CtfDedPdschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedPdschCfgInfo(param, mBuf) -CtfDedPdschCfgInfo *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5802,17 +5105,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedPucchCfgInfo ( CtfDedPucchCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedPucchCfgInfo(param, mBuf) -CtfDedPucchCfgInfo *param; -Buffer *mBuf; -#endif { @@ -5865,17 +5162,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedPucchCfgInfo ( CtfDedPucchCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedPucchCfgInfo(param, mBuf) -CtfDedPucchCfgInfo *param; -Buffer *mBuf; -#endif { @@ -5928,20 +5219,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedPuschCfgInfo ( CtfDedPuschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedPuschCfgInfo(param, mBuf) -CtfDedPuschCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -5972,20 +5256,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedPuschCfgInfo ( CtfDedPuschCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedPuschCfgInfo(param, mBuf) -CtfDedPuschCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -6017,17 +5294,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCqiRptModePeriodic ( CtfCqiRptModePeriodic *param, Buffer *mBuf ) -#else -S16 cmPkCtfCqiRptModePeriodic(param, mBuf) -CtfCqiRptModePeriodic *param; -Buffer *mBuf; -#endif { /* ctf_c_001.main_2: added packning for cqiMask*/ @@ -6065,17 +5336,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCqiRptModePeriodic ( CtfCqiRptModePeriodic *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCqiRptModePeriodic(param, mBuf) -CtfCqiRptModePeriodic *param; -Buffer *mBuf; -#endif { #ifdef CTF_VER1 uint32_t tmpEnum; @@ -6117,20 +5382,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCqiReportCfgInfo ( CtfCqiReportCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCqiReportCfgInfo(param, mBuf) -CtfCqiReportCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -6196,17 +5454,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCqiReportCfgInfo ( CtfCqiReportCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCqiReportCfgInfo(param, mBuf) -CtfCqiReportCfgInfo *param; -Buffer *mBuf; -#endif { #if defined (CTF_VER1) || defined (CTF_VER2) uint32_t tmpEnum; @@ -6279,20 +5531,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedSrsUlCfgInfo ( CtfDedSrsUlCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedSrsUlCfgInfo(param, mBuf) -CtfDedSrsUlCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -6328,20 +5573,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedSrsUlCfgInfo ( CtfDedSrsUlCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedSrsUlCfgInfo(param, mBuf) -CtfDedSrsUlCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->pres, mBuf); /*ctf_c_001.main_1*/ if(param->pres != FALSE) @@ -6377,20 +5615,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedSRCfgInfo ( CtfDedSRCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedSRCfgInfo(param, mBuf) -CtfDedSRCfgInfo *param; -Buffer *mBuf; -#endif { - /*ctf_c_001.main_1*/ if(param->pres != FALSE) { @@ -6421,17 +5652,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedSRCfgInfo ( CtfDedSRCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedSRCfgInfo(param, mBuf) -CtfDedSRCfgInfo *param; -Buffer *mBuf; -#endif { @@ -6466,17 +5691,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedAntCfgInfo ( CtfDedAntCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedAntCfgInfo(param, mBuf) -CtfDedAntCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef CTF_VER2 @@ -6567,17 +5786,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedAntCfgInfo ( CtfDedAntCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedAntCfgInfo(param, mBuf) -CtfDedAntCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef CTF_VER2 S16 idx; @@ -6671,17 +5884,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfUeSecCellCfgInfo ( CtfUeSecCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfUeSecCellCfgInfo(*param, mBuf) -CtfUeSecCellCfgInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); @@ -6704,17 +5911,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfSecCellCfgInfo ( CtfSecCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfSecCellCfgInfo(*param, mBuf) -CtfSecCellCfgInfo *param; -Buffer *mBuf; -#endif { S8 idx; @@ -6744,17 +5945,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfUeSecCellCfgInfo ( CtfUeSecCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeSecCellCfgInfo(*param, mBuf) -CtfUeSecCellCfgInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); @@ -6779,17 +5974,11 @@ Buffer *mBuf; * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfSecCellCfgInfo ( CtfSecCellCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfSecCellCfgInfo(*param, mBuf) -CtfSecCellCfgInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -6821,17 +6010,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfUeCatCfgInfo ( CtfUeCatCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfUeCatCfgInfo(param, mBuf) -CtfUeCatCfgInfo *param; -Buffer *mBuf; -#endif { @@ -6861,17 +6044,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfUeCatCfgInfo ( CtfUeCatCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfUeCatCfgInfo(param, mBuf) -CtfUeCatCfgInfo *param; -Buffer *mBuf; -#endif { @@ -6901,17 +6078,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedCfgInfo ( CtfDedCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedCfgInfo(param, mBuf) -CtfDedCfgInfo *param; -Buffer *mBuf; -#endif { #ifdef EMTC_ENABLE @@ -6951,20 +6122,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedCfgInfo ( CtfDedCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedCfgInfo(param, mBuf) -CtfDedCfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkCtfUeCatCfgInfo, ¶m->ueCatCfg, mBuf); @@ -7002,20 +6166,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedRecfgInfo ( CtfDedRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedRecfgInfo(param, mBuf) -CtfDedRecfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); /*ctf_c_001.main_1*/ CMCHKPK(cmPkCtfDedAntCfgInfo, ¶m->antInfo, mBuf); @@ -7058,20 +6215,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedRecfgInfo ( CtfDedRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedRecfgInfo(param, mBuf) -CtfDedRecfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); /* ctf_c_001.main_4: ReEst Fix */ @@ -7116,20 +6266,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellReleaseInfo ( CtfCellReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellReleaseInfo(param, mBuf) -CtfCellReleaseInfo *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkLteCellId, param->cellId, mBuf); return ROK; } @@ -7153,20 +6296,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellReleaseInfo ( CtfCellReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellReleaseInfo(param, mBuf) -CtfCellReleaseInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); return ROK; } @@ -7190,17 +6326,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfDedReleaseInfo ( CtfDedReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfDedReleaseInfo(param, mBuf) -CtfDedReleaseInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); @@ -7228,20 +6358,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfDedReleaseInfo ( CtfDedReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfDedReleaseInfo(param, mBuf) -CtfDedReleaseInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); CMCHKUNPK(cmUnpkCtfSecCellCfgInfo, ¶m->sCellInfo,mBuf); @@ -7267,20 +6390,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCfgInfo ( CtfCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCfgInfo(param, mBuf) -CtfCfgInfo *param; -Buffer *mBuf; -#endif { - switch(param->cfgElem) { case CTF_UE_CFG: CMCHKPK(cmPkCtfDedCfgInfo, ¶m->u.dedCfg, mBuf); @@ -7314,17 +6430,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCfgInfo ( CtfCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgInfo(param, mBuf) -CtfCfgInfo *param; -Buffer *mBuf; -#endif { @@ -7361,17 +6471,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfReCfgInfo ( CtfReCfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfReCfgInfo(param, mBuf) -CtfReCfgInfo *param; -Buffer *mBuf; -#endif { @@ -7417,17 +6521,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfReCfgInfo ( CtfReCfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfReCfgInfo(param, mBuf) -CtfReCfgInfo *param; -Buffer *mBuf; -#endif { @@ -7472,17 +6570,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfReleaseInfo ( CtfReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfReleaseInfo(param, mBuf) -CtfReleaseInfo *param; -Buffer *mBuf; -#endif { @@ -7519,17 +6611,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfReleaseInfo ( CtfReleaseInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfReleaseInfo(param, mBuf) -CtfReleaseInfo *param; -Buffer *mBuf; -#endif { @@ -7569,20 +6655,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCfgReqInfo ( CtfCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCfgReqInfo(param, mBuf) -CtfCfgReqInfo *param; -Buffer *mBuf; -#endif { - /* ctf_c_001.main_4: Added support for vendor specific parameters */ #ifdef CTF_VER3 CMCHKPK(cmPkCtfVendorSpecParams, ¶m->vendorParams, mBuf); @@ -7628,19 +6707,12 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCfgReqInfo ( Pst *pst, CtfCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCfgReqInfo(param, mBuf) -Pst *pst; -CtfCfgReqInfo *param; -Buffer *mBuf; -#endif { #ifdef CTF_VER3 @@ -7687,20 +6759,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellPwrcfgInfo ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellPwrcfgInfo(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - /* Added the pack for newly added reference signal Power*/ CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); @@ -7731,19 +6796,12 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellPwrcfgInfo ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellPwrcfgInfo(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - /* ctf_c_001.main_3: Added the unpack for newly added fileds inside the CFG structure*/ CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -7774,20 +6832,13 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfCellStop ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmPkCtfCellStop(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - /* Added the pack for newly added reference signal Power*/ CMCHKPK(oduUnpackUInt32, (uint32_t)param->ctfCellStatus, mBuf); CMCHKPK(SPkS16, param->pilotSigPwr, mBuf); @@ -7816,19 +6867,12 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmUnpkCtfCellStop ( CtfCellRecfgInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfCellStop(param, mBuf) -CtfCellRecfgInfo *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -7858,17 +6902,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkPerRemScanCellInfo ( CtfPeriodicRemCellInfo *param, Buffer *mBuf ) -#else -S16 cmPkPerRemScanCellInfo(param, mBuf) -CtfPeriodicRemCellInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16,param->pci, mBuf); @@ -7895,17 +6933,11 @@ Buffer *mBuf; * File: * **********************************************************/ -#ifdef ANSI S16 cmPkCtfPeriodicCellSearchRsp ( CtfPeriodicRemCellSearchRsp *param, Buffer *mBuf ) -#else -S16 cmPkCtfPeriodicCellSearchRsp(param, mBuf) -CtfPeriodicRemCellSearchRsp *param; -Buffer *mBuf; -#endif { S16 idx; @@ -7933,7 +6965,6 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCtfPeriodicRemCellSearchRsp ( Pst* pst, @@ -7941,13 +6972,6 @@ SpId spId, CtfCfgTransId *transId, CtfPeriodicRemCellSearchRsp *CellCfgRsp ) -#else -S16 cmPkCtfPeriodicRemCellSearchRsp(pst, spId, transId, CellCfgRsp) -Pst* pst; -SpId spId; -CtfCfgTransId *transId; -CtfPeriodicRemCellSearchRsp *CellCfgRsp; -#endif { Buffer *mBuf = NULLP; @@ -8024,17 +7048,11 @@ CtfPeriodicRemCellSearchRsp *CellCfgRsp; return (SPstTsk(pst,mBuf)); } -#ifdef ANSI S16 cmUnpkCtfPerRemScanCellInfo ( CtfPeriodicRemCellInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPerRemScanCellInfo(param, mBuf) -CtfPeriodicRemCellInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->numTx, mBuf); @@ -8044,17 +7062,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkCtfPerRemCellSrch ( CtfPeriodicRemCellSearchRsp *param, Buffer *mBuf ) -#else -S16 cmUnpkCtfPerRemCellSrch(param, mBuf) -CtfPeriodicRemCellSearchRsp *param; -Buffer *mBuf; -#endif { S16 idx; @@ -8080,19 +7092,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkPerRemCellSrchRsp ( CtfPerRemCellSrchRsp func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkPerRemCellSrchRsp(func, pst, mBuf) -CtfPerRemCellSrchRsp func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId = 0; CtfCfgTransId transId; diff --git a/src/cm/kwu.c b/src/cm/kwu.c index 06899000e..81e317694 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, -uint8_t status -) -#else -S16 cmPkKwuBndCfm(pst, suId, status) -Pst * pst; -SuId suId; -uint8_t status; -#endif +S16 cmPkKwuBndCfm(Pst * pst,SuId suId,uint8_t status) { S16 ret1; Buffer *mBuf; @@ -134,19 +109,7 @@ uint8_t 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 cmPkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf) { - - #ifdef CCPU_OPT switch(param->lcType) { case CM_LTE_LCH_CCCH: @@ -215,19 +166,7 @@ Buffer *mBuf; } /* cmPkKwuDatReqInfo */ -#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 cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf) { #ifdef LCKWU #if (ERRCLASS & ERRCLS_ADD_RES) @@ -390,17 +329,7 @@ Buffer * mBuf; } /* cmPkKwuDatReq */ -#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,17 +421,7 @@ 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 uint32_t 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,17 +562,7 @@ 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; @@ -703,17 +576,7 @@ Buffer *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,19 +872,7 @@ 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; uint8_t status = 0; @@ -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 cmUnpkKwuDatReqInfo(KwuDatReqInfo *param,Buffer *mBuf) { @@ -1196,19 +933,7 @@ 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; @@ -1268,17 +993,7 @@ Buffer *mBuf; } /* 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,21 +1216,10 @@ 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) { uint32_t i; - CMCHKUNPK(cmUnpkLteRlcId, ¶m->rlcId, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numSdu, mBuf); for (i = 0; i < param->numSdu; i++) @@ -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; @@ -1697,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; @@ -1767,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) @@ -1818,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); @@ -1838,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; diff --git a/src/cm/lkw.c b/src/cm/lkw.c index 66f2ec32d..5ea39ab7d 100755 --- a/src/cm/lkw.c +++ b/src/cm/lkw.c @@ -111,17 +111,11 @@ static S16 cmUnpkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf)); * -# Failure : RFAILED */ -#ifdef ANSI S16 packRlcConfigReq ( Pst *pst, /* post structure */ RlcMngmt *cfg /* RLC LM structure */ ) -#else -S16 packRlcConfigReq(pst, cfg) -Pst *pst; /* post structure */ -RlcMngmt *cfg; /* RLC LM structure */ -#endif { Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ @@ -174,19 +168,12 @@ RlcMngmt *cfg; /* RLC LM structure */ * -# Failure : RFAILED */ -#ifdef ANSI uint8_t unpackRlcConfigReq ( RlcConfigReq func, /* primitive to call */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -uint8_t unpackRlcConfigReq(func, pst, mBuf) -RlcConfigReq func; /* primitive to call */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret1; /* Return value */ RlcMngmt cfg; /* RLC LM structure */ @@ -227,17 +214,11 @@ Buffer *mBuf; /* message buffer */ * -# Failure : RFAILED */ -#ifdef ANSI S16 cmPkLkwCntrlReq ( Pst *pst, /* post structure */ RlcMngmt *cntrl /* RLC LM structure */ ) -#else -S16 cmPkLkwCntrlReq(pst,cntrl) -Pst *pst; /* post structure */ -RlcMngmt *cntrl; /* RLC LM structure */ -#endif { Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ @@ -290,19 +271,12 @@ RlcMngmt *cntrl; /* RLC LM structure */ * -# Failure : RFAILED */ -#ifdef ANSI S16 cmUnpkLkwCntrlReq ( LkwCntrlReq func, /* primitive to call */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkLkwCntrlReq(func, pst, mBuf) -LkwCntrlReq func; /* primitive to call */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret1; /* return value */ RlcMngmt cfm; /* Confirmation */ @@ -338,17 +312,11 @@ Buffer *mBuf; /* message buffer */ * -# Failure : RFAILED */ -#ifdef ANSI uint8_t cmPkLkwCntrlCfm ( Pst *pst, /* post structure */ RlcMngmt *cfm /* RLC LM structure */ ) -#else -uint8_t cmPkLkwCntrlCfm(pst, cfm) -Pst *pst; /* post structure */ -RlcMngmt *cfm; /* RLC LM structure */ -#endif { Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ @@ -402,19 +370,12 @@ RlcMngmt *cfm; /* RLC LM structure */ * -# Failure : RFAILED */ -#ifdef ANSI S16 cmUnpkLkwCntrlCfm ( LkwCntrlCfm func, /* primitive to call */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkLkwCntrlCfm(func, pst, mBuf) -LkwCntrlCfm func; /* primitive to call */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { RlcMngmt cfm; /* RLC LM structure */ S16 ret1; /* return value */ @@ -452,19 +413,12 @@ Buffer *mBuf; /* message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI S16 cmUnpkLkwStsCfm ( LkwStsCfm func, /* primitive to call */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkLkwStsCfm(func, pst, mBuf) -LkwStsCfm func; /* primitive to call */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { RlcMngmt cfm; /* RLC LM structure */ S16 ret1; /* return value */ @@ -503,17 +457,11 @@ Buffer *mBuf; /* message buffer */ */ -#ifdef ANSI uint8_t packRlcConfigCfm ( Pst *pst, /* post structure */ RlcMngmt *cfm /* RLC LM structure */ ) -#else -uint8_t packRlcConfigCfm(pst,cfm) -Pst *pst; /* post structure */ -RlcMngmt *cfm; /* RLC LM structure */ -#endif { Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ @@ -566,19 +514,12 @@ RlcMngmt *cfm; /* RLC LM structure */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI uint8_t unpackRlcConfigCfm ( RlcConfigCfm func, /* primitive to call */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -uint8_t unpackRlcConfigCfm(func, pst, mBuf) -RlcConfigCfm func; /* primitive to call */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret1; /* return value */ RlcMngmt cfm; /* RLC LM structure */ @@ -617,17 +558,11 @@ Buffer *mBuf; /* message buffer */ * -# Failure : RFAILED */ -#ifdef ANSI S16 cmPkLkwStaInd ( Pst *pst, /* post structure */ RlcMngmt *usta /* RLC LM structure */ ) -#else -S16 cmPkLkwStaInd(pst,usta) -Pst *pst; /* post structure */ -RlcMngmt *usta; /* RLC LM structure */ -#endif { Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ @@ -681,19 +616,12 @@ RlcMngmt *usta; /* RLC LM structure */ * -# Failure : RFAILED */ -#ifdef ANSI S16 cmUnpkLkwStaInd ( LkwStaInd func, /* primitive pointer */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkLkwStaInd(func, pst, mBuf) -LkwStaInd func; /* primitive pointer */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { RlcMngmt usta; /* RLC LM structure */ S16 ret1; /* return value */ @@ -730,17 +658,11 @@ Buffer *mBuf; /* message buffer */ * -# Failure : RFAILED */ -#ifdef ANSI S16 cmPkLkwStaReq ( Pst *pst, /* post structure */ RlcMngmt *sta /* status */ ) -#else -S16 cmPkLkwStaReq(pst,sta) -Pst *pst; /* post structure */ -RlcMngmt *sta; /* status */ -#endif { Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ @@ -792,19 +714,12 @@ RlcMngmt *sta; /* status */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI S16 cmUnpkLkwStaCfm ( LkwStaReq func, /* primitive pointer */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkLkwStaCfm(func, pst, mBuf) -LkwStaReq func; /* primitive pointer */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { RlcMngmt cfm; /* RLC LM structure */ S16 ret1; /* return value */ @@ -842,19 +757,12 @@ Buffer *mBuf; /* message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI S16 cmUnpkLkwStsReq ( LkwStsReq func, /* primitive pointer */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkLkwStsReq(func, pst, mBuf) -LkwStsReq func; /* primitive pointer */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { RlcMngmt sts; /* RLC LM structure */ S16 ret1; /* return value */ @@ -895,19 +803,12 @@ Buffer *mBuf; /* message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI S16 cmUnpkLkwStaReq ( LkwStaReq func, /* primitive pointer */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkLkwStaReq(func, pst, mBuf) -LkwStaReq func; /* primitive pointer */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { RlcMngmt sta; /* RLC LM structure */ S16 ret1; /* return value */ @@ -946,19 +847,12 @@ Buffer *mBuf; /* message buffer */ * -# Failure : RFAILED */ -#ifdef ANSI S16 cmUnpkLkwTrcInd ( LkwTrcInd func, /* primitive to call */ Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkLkwTrcInd(func, pst, mBuf) -LkwTrcInd func; /* primitive to call */ -Pst *pst; /* post structure */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret1; /* return value */ RlcMngmt trc; /* RLC LM structure */ @@ -997,17 +891,11 @@ Buffer *mBuf; /* message buffer */ * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkCkwSapSta ( RlcCkwCntSapSta *rcSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) -#else -static S16 cmPkCkwSapSta(rcSap, mBuf) -RlcCkwCntSapSta *rcSap; /* SAP statistics */ -Buffer *mBuf; /* Message buffer */ -#endif { CMCHKPK(cmPkState, rcSap->state, mBuf); @@ -1027,17 +915,11 @@ Buffer *mBuf; /* Message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkCkwSapSta ( RlcCkwCntSapSta *rcSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) -#else -static S16 cmUnpkCkwSapSta(rcSap, mBuf) -RlcCkwCntSapSta *rcSap; /* SAP statistics */ -Buffer *mBuf; /* Message buffer */ -#endif { CMCHKUNPK(SUnpkS16, &rcSap->spId, mBuf); @@ -1056,17 +938,11 @@ Buffer *mBuf; /* Message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkKwuSapSta ( RlcKwuSapSta *rlSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) -#else -static S16 cmPkKwuSapSta(rlSap, mBuf) -RlcKwuSapSta *rlSap; /* SAP statistics */ -Buffer *mBuf; /* Message buffer */ -#endif { CMCHKPK(cmPkState, rlSap->state, mBuf); @@ -1086,17 +962,11 @@ Buffer *mBuf; /* Message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkKwuSapSta ( RlcKwuSapSta *rlSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) -#else -static S16 cmUnpkKwuSapSta(rlSap, mBuf) -RlcKwuSapSta *rlSap; /* SAP statistics */ -Buffer *mBuf; /* Message buffer */ -#endif { CMCHKUNPK(SUnpkS16, &rlSap->spId, mBuf); @@ -1116,17 +986,11 @@ Buffer *mBuf; /* Message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkRguSapSta ( RlcRguSapSta *mkSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) -#else -static S16 cmPkRguSapSta(mkSap, mBuf) -RlcRguSapSta *mkSap; /* SAP statistics */ -Buffer *mBuf; /* Message buffer */ -#endif { CMCHKPK(cmPkState, mkSap->state, mBuf); @@ -1146,17 +1010,11 @@ Buffer *mBuf; /* Message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkRguSapSta ( RlcRguSapSta *mkSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) -#else -static S16 cmUnpkRguSapSta(mkSap, mBuf) -RlcRguSapSta *mkSap; /* SAP statistics */ -Buffer *mBuf; /* Message buffer */ -#endif { CMCHKUNPK(cmUnpkSuId, &mkSap->suId, mBuf); @@ -1176,17 +1034,11 @@ Buffer *mBuf; /* Message buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI S16 cmPkLkwStaCfm ( Pst *pst, /* post structure */ RlcMngmt *cfm /* solicited status confirm */ ) -#else -S16 cmPkLkwStaCfm(pst, cfm) -Pst *pst; /* post structure */ -RlcMngmt *cfm; /* solicited status confirm */ -#endif { Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ @@ -1237,19 +1089,12 @@ RlcMngmt *cfm; /* solicited status confirm */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI S16 cmPkLkwTrcInd ( Pst *pst, /* post structure */ RlcMngmt *trc, /* trace */ Buffer *trcBuf /* trace buffer */ ) -#else -S16 cmPkLkwTrcInd(pst, trc, trcBuf) -Pst *pst; /* post structure */ -RlcMngmt *trc; /* trace */ -Buffer *trcBuf; /* trace buffer */ -#endif { S16 ret1 = ROK; /* return value */ Buffer *mBuf = NULLP; /* Buffer to trace */ @@ -1322,19 +1167,12 @@ Buffer *trcBuf; /* trace buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI S16 cmPkLkwStsReq ( Pst *pst, /* post structure */ Action action, /* action */ RlcMngmt *sts /* statistics request */ ) -#else -S16 cmPkLkwStsReq(pst, action, sts) -Pst *pst; /* post structure */ -Action action; /* action */ -RlcMngmt *sts; /* statistics request */ -#endif { Buffer *mBuf; /* message buffer */ @@ -1388,19 +1226,12 @@ RlcMngmt *sts; /* statistics request */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI S16 cmPkLkwStsCfm ( Pst *pst, /* post structure */ Action action, /* action */ RlcMngmt *cfm /* statistics confirmation */ ) -#else -S16 cmPkLkwStsCfm(pst, action, cfm) -Pst *pst; /* post structure */ -Action action; /* action */ -RlcMngmt *cfm; /* statistics confirmation */ -#endif { Buffer *mBuf; /* message buffer */ S16 ret1; /* return value */ @@ -1453,19 +1284,12 @@ RlcMngmt *cfm; /* statistics confirmation */ * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkRlcMngmt ( RlcMngmt *param, /* Managment */ Event eventType, /* Event type */ Buffer *mBuf /* Message Buffer */ ) -#else -static S16 cmPkRlcMngmt(param ,eventType, mBuf) -RlcMngmt *param; /* Managment */ -Event eventType; /* Event type */ -Buffer *mBuf; /* Message Buffer */ -#endif { S16 ret1; /* return value */ @@ -1542,19 +1366,12 @@ Buffer *mBuf; /* Message Buffer */ * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkRlcCfg ( RlcMngmt *cfg, Elmnt elmnt, Buffer *mBuf ) -#else -static S16 cmPkRlcCfg(cfg, elmnt, mBuf) -RlcMngmt *cfg; -Elmnt elmnt; -Buffer *mBuf; -#endif { switch( elmnt ) @@ -1606,19 +1423,12 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkRlcCntrl ( RlcMngmt *cntrl, Elmnt elmnt, Buffer *mBuf ) -#else -static S16 cmPkRlcCntrl(cntrl, elmnt, mBuf) -RlcMngmt *cntrl; -Elmnt elmnt; -Buffer *mBuf; -#endif { uint8_t subAction; /* sub action */ @@ -1685,19 +1495,12 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkRlcUsta ( RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf ) -#else -static S16 cmPkRlcUsta(usta, elmnt, mBuf) -RlcMngmt *usta; -Elmnt elmnt; -Buffer *mBuf; -#endif { /* lkw_c_001.main_2 removed warning */ @@ -1726,7 +1529,6 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkRlcSsta ( RlcMngmt *ssta, @@ -1734,13 +1536,6 @@ Elmnt elmnt, Event eventType, Buffer *mBuf ) -#else -static S16 cmPkRlcSsta(ssta, elmnt, eventType, mBuf) -RlcMngmt *ssta; -Elmnt elmnt; -Event eventType; -Buffer *mBuf; -#endif { S16 ret1; @@ -1790,17 +1585,11 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkRlcTrc ( RlcMngmt *trc, /* trace */ Buffer *mBuf /* data buffer */ ) -#else -static S16 cmPkRlcTrc(trc, mBuf) -RlcMngmt *trc; /* trace */ -Buffer *mBuf; /* data buffer */ -#endif { CMCHKPK(oduUnpackUInt16, trc->t.trc.event, mBuf); @@ -1821,19 +1610,12 @@ Buffer *mBuf; /* data buffer */ * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkRlcSts ( RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf ) -#else -static S16 cmPkRlcSts(sts, elmnt, mBuf) -RlcMngmt *sts; -Elmnt elmnt; -Buffer *mBuf; -#endif { S16 ret1; @@ -1879,17 +1661,11 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkGenSts ( RlcGenSts *gen, Buffer *mBuf ) -#else -static S16 cmPkGenSts(gen, mBuf) -RlcGenSts *gen; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt32, gen->numSduDisc, mBuf); @@ -1918,17 +1694,11 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkCkwSapSts ( RlcCkwCntSts *rcSap, Buffer *mBuf ) -#else -static S16 cmPkCkwSapSts(rcSap, mBuf) -RlcCkwCntSts *rcSap; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt32, rcSap->statMsgs, mBuf); @@ -1946,17 +1716,11 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmPkKwuSapSts ( RlcKwuSapSts *ruSap, Buffer *mBuf ) -#else -static S16 cmPkKwuSapSts(ruSap, mBuf) -RlcKwuSapSts *ruSap; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt32, ruSap->sduTx, mBuf); @@ -1982,19 +1746,12 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkRlcMngmt ( RlcMngmt *param, Event eventType, Buffer *mBuf ) -#else -static S16 cmUnpkRlcMngmt(param ,eventType, mBuf) -RlcMngmt *param; -Event eventType; -Buffer *mBuf; -#endif { S16 ret1; @@ -2075,19 +1832,12 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkRlcCfg ( RlcMngmt *cfg, Elmnt elmnt, Buffer *mBuf ) -#else -static S16 cmUnpkRlcCfg(cfg ,elmnt, mBuf) -RlcMngmt *cfg; -Elmnt elmnt; -Buffer *mBuf; -#endif { switch(elmnt) @@ -2139,19 +1889,12 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkRlcCntrl ( RlcMngmt *cfm, Elmnt elmnt, Buffer *mBuf ) -#else -static S16 cmUnpkRlcCntrl(cfm, elmnt, mBuf) -RlcMngmt *cfm; -Elmnt elmnt; -Buffer *mBuf; -#endif { uint8_t subAction; RlcDbgCntrl *dbgCntrl; @@ -2225,19 +1968,12 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkRlcUsta ( RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf ) -#else -static S16 cmUnpkRlcUsta(usta ,elmnt, mBuf) -RlcMngmt *usta; -Elmnt elmnt; -Buffer *mBuf; -#endif { /* lkw_c_001.main_2 removed warning */ @@ -2265,7 +2001,6 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkRlcSsta ( RlcMngmt *ssta, @@ -2273,13 +2008,6 @@ Elmnt elmnt, Event eventType, Buffer *mBuf ) -#else -static S16 cmUnpkRlcSsta(ssta ,elmnt, eventType, mBuf) -RlcMngmt *ssta; -Elmnt elmnt; -Event eventType; -Buffer *mBuf; -#endif { S16 ret1; /* return value */ @@ -2329,17 +2057,11 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkRlcTrc ( RlcMngmt *trc, Buffer *mBuf ) -#else -static S16 cmUnpkRlcTrc(trc, mBuf) -RlcMngmt *trc; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkDateTime, &trc->t.trc.dt, mBuf); @@ -2360,19 +2082,12 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkRlcSts ( RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf ) -#else -static S16 cmUnpkRlcSts(sts ,elmnt, mBuf) -RlcMngmt *sts; -Elmnt elmnt; -Buffer *mBuf; -#endif { S16 ret1; /* return value */ @@ -2416,17 +2131,11 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkGenSts ( RlcGenSts *gen, Buffer *mBuf ) -#else -static S16 cmUnpkGenSts(gen, mBuf) -RlcGenSts *gen; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt32, &gen->numUe, mBuf); @@ -2454,17 +2163,11 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkCkwSapSts ( RlcCkwCntSts *rcSap, Buffer *mBuf ) -#else -static S16 cmUnpkCkwSapSts(rcSap ,mBuf) -RlcCkwCntSts *rcSap; -Buffer *mBuf; -#endif { @@ -2484,17 +2187,11 @@ Buffer *mBuf; * -# Success : ROK * -# Failure : RFAILED */ -#ifdef ANSI static S16 cmUnpkKwuSapSts ( RlcKwuSapSts *ruSap, Buffer *mBuf ) -#else -static S16 cmUnpkKwuSapSts(ruSap, mBuf) -RlcKwuSapSts *ruSap; -Buffer *mBuf; -#endif { /* lkw_c_001.main_2 changed from suId to spId */ @@ -2508,17 +2205,11 @@ Buffer *mBuf; /* lkw_c_001.main_2 added support for L2 Measurement */ #ifdef LTE_L2_MEAS -#ifdef ANSI S16 cmPkLkwL2MeasReq ( Pst * pst, RlcL2MeasReqEvt *measReqEvt ) -#else -S16 cmPkLkwL2MeasReq(pst, measReqEvt) -Pst * pst; -RlcL2MeasReqEvt *measReqEvt; -#endif { Buffer *mBuf = NULLP; @@ -2566,17 +2257,11 @@ RlcL2MeasReqEvt *measReqEvt; return (SPstTsk(pst,mBuf)); } -#ifdef ANSI S16 cmPkRlcL2MeasReqInfo ( RlcL2MeasReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkRlcL2MeasReqInfo(param, mBuf) -RlcL2MeasReqInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; uint16_t idx1; @@ -2613,17 +2298,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmPkLkwL2MeasStopReq ( Pst *pst, uint8_t measType ) -#else -S16 cmPkLkwL2MeasStopReq(pst, measType) -Pst *pst; -uint8_t measType; -#endif { Buffer *mBuf = NULLP; @@ -2640,17 +2319,11 @@ uint8_t measType; return (SPstTsk(pst,mBuf)); } -#ifdef ANSI S16 cmPkLkwL2MeasSendReq ( Pst *pst, uint8_t measType ) -#else -S16 cmPkLkwL2MeasSendReq(pst, measType) -Pst *pst; -uint8_t measType; -#endif { Buffer *mBuf = NULLP; @@ -2667,19 +2340,12 @@ uint8_t measType; return (SPstTsk(pst,mBuf)); } #ifdef TENB_SPLIT_ARCH -#ifdef ANSI S16 cmUnpkLkwL2MeasReq ( LkwL2MeasReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLkwL2MeasReq(func, pst, mBuf) -LkwL2MeasReq func; -Pst *pst; -Buffer *mBuf; -#endif { RlcL2MeasReqEvt measReqEvt; @@ -2717,19 +2383,12 @@ Buffer *mBuf; return ((*func)(pst, &measReqEvt)); } #else -#ifdef ANSI S16 cmUnpkLkwL2MeasReq ( LkwL2MeasReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLkwL2MeasReq(func, pst, mBuf) -LkwL2MeasReq func; -Pst *pst; -Buffer *mBuf; -#endif { S16 ret; RlcL2MeasReqEvt *measReqEvt; @@ -2781,17 +2440,11 @@ Buffer *mBuf; } #endif -#ifdef ANSI S16 cmUnpkRlcL2MeasReqInfo ( RlcL2MeasReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRlcL2MeasReqInfo(param, mBuf) -RlcL2MeasReqInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; uint16_t idx1; @@ -2830,19 +2483,12 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkLkwL2MeasStopReq ( LkwL2MeasStopReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLkwL2MeasStopReq(func, pst, mBuf) -LkwL2MeasStopReq func; -Pst *pst; -Buffer *mBuf; -#endif { uint8_t measType; @@ -2851,19 +2497,12 @@ Buffer *mBuf; return ((*func)(pst, measType)); } -#ifdef ANSI S16 cmUnpkLkwL2MeasSendReq ( LkwL2MeasSendReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLkwL2MeasSendReq(func, pst, mBuf) -LkwL2MeasSendReq func; -Pst *pst; -Buffer *mBuf; -#endif { uint8_t measType; @@ -2873,17 +2512,11 @@ Buffer *mBuf; return ((*func)(pst, measType)); } -#ifdef ANSI S16 cmPkLkwL2MeasCfm ( Pst * pst, RlcL2MeasCfmEvt *measCfmEvt ) -#else -S16 cmPkLkwL2MeasCfm(pst, measCfmEvt) -Pst * pst; -RlcL2MeasCfmEvt *measCfmEvt; -#endif { Buffer *mBuf = NULLP; uint8_t idx; @@ -2979,19 +2612,12 @@ RlcL2MeasCfmEvt *measCfmEvt; return (SPstTsk(pst,mBuf)); } -#ifdef ANSI S16 cmPkRlcL2MeasCfmInfo ( RlcL2MeasCfmInfo *param, Buffer *mBuf, uint8_t measType ) -#else -S16 cmPkRlcL2MeasCfmInfo(param, mBuf, measType) -RlcL2MeasCfmInfo *param; -Buffer *mBuf; -uint8_t measType; -#endif { if((measType & LKW_L2MEAS_DL_IP) || @@ -3013,19 +2639,12 @@ uint8_t measType; return ROK; } -#ifdef ANSI S16 cmUnpkLkwL2MeasCfm ( LkwL2MeasCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLkwL2MeasCfm(func, pst, mBuf) -LkwL2MeasCfm func; -Pst *pst; -Buffer *mBuf; -#endif { uint8_t idx; uint16_t idx1; @@ -3107,19 +2726,12 @@ Buffer *mBuf; return ((*func)(pst, &measCfmEvt)); } -#ifdef ANSI S16 cmUnpkRlcL2MeasCfmInfo ( RlcL2MeasCfmInfo *param, Buffer *mBuf, uint8_t measType ) -#else -S16 cmUnpkRlcL2MeasCfmInfo(param, mBuf, measType) -RlcL2MeasCfmInfo *param; -Buffer *mBuf; -uint8_t measType; -#endif { if((measType & LKW_L2MEAS_DL_IP) || @@ -3142,19 +2754,12 @@ uint8_t measType; } -#ifdef ANSI S16 cmPkLkwL2MeasStopCfm ( Pst * pst, uint8_t measType, uint8_t status ) -#else -S16 cmPkLkwL2MeasStopCfm(pst, measType,status) -Pst * pst; -uint8_t measType; -uint8_t status -#endif { Buffer *mBuf = NULLP; @@ -3172,19 +2777,13 @@ uint8_t status return (SPstTsk(pst,mBuf)); } -#ifdef ANSI + S16 cmUnpkLkwL2MeasStopCfm ( LkwL2MeasStopCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLkwL2MeasStopCfm(func, pst, mBuf) -LkwL2MeasStopCfm func; -Pst *pst; -Buffer *mBuf; -#endif { uint8_t measType; uint8_t status; diff --git a/src/cm/lrg.c b/src/cm/lrg.c index 7a0f38ee8..38642dbc9 100755 --- a/src/cm/lrg.c +++ b/src/cm/lrg.c @@ -56,17 +56,11 @@ Configuration Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgCfgReq ( Pst * pst, RgMngmt * cfg ) -#else -S16 cmPkLrgCfgReq(pst, cfg) -Pst * pst; -RgMngmt * cfg; -#endif { Buffer *mBuf = NULLP; @@ -107,19 +101,12 @@ Configuration Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgCfgReq ( LrgCfgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgCfgReq(func, pst, mBuf) -LrgCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { /* lrg_c_001.main_2: Changed Pointer across Interface */ RgMngmt cfg; @@ -152,17 +139,11 @@ Configuration Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchCfgReq ( Pst * pst, RgMngmt * cfg ) -#else -S16 cmPkLrgSchCfgReq(pst, cfg) -Pst * pst; -RgMngmt * cfg; -#endif { Buffer *mBuf = NULLP; @@ -203,19 +184,12 @@ Configuration Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchCfgReq ( LrgSchCfgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchCfgReq(func, pst, mBuf) -LrgSchCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { /* lrg_c_001.main_2: Changed Pointer across Interface */ RgMngmt cfg; @@ -248,17 +222,11 @@ Configuration Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI uint8_t cmPkLrgCfgCfm ( Pst * pst, RgMngmt * cfm ) -#else -uint8_t cmPkLrgCfgCfm(pst, cfm) -Pst * pst; -RgMngmt * cfm; -#endif { Buffer *mBuf = NULLP; @@ -300,19 +268,12 @@ Configuration Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgCfgCfm ( LrgCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgCfgCfm(func, pst, mBuf) -LrgCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cfm; @@ -344,17 +305,11 @@ Configuration Confirm from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI uint8_t cmPkLrgSchCfgCfm ( Pst * pst, RgMngmt * cfg ) -#else -uint8_t cmPkLrgSchCfgCfm(pst, cfg) -Pst * pst; -RgMngmt * cfg; -#endif { Buffer *mBuf = NULLP; @@ -396,19 +351,12 @@ Configuration Confirm from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchCfgCfm ( LrgSchCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchCfgCfm(func, pst, mBuf) -LrgSchCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cfg; @@ -439,17 +387,11 @@ Statistics Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgStsReq ( Pst * pst, RgMngmt * sts ) -#else -S16 cmPkLrgStsReq(pst, sts) -Pst * pst; -RgMngmt * sts; -#endif { Buffer *mBuf = NULLP; @@ -491,19 +433,12 @@ Statistics Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgStsReq ( LrgStsReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgStsReq(func, pst, mBuf) -LrgStsReq func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt sts; @@ -535,17 +470,11 @@ Statistics Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgStsCfm ( Pst * pst, RgMngmt * cfm ) -#else -S16 cmPkLrgStsCfm(pst, cfm) -Pst * pst; -RgMngmt * cfm; -#endif { Buffer *mBuf = NULLP; @@ -587,19 +516,12 @@ Statistics Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgStsCfm ( LrgStsCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgStsCfm(func, pst, mBuf) -LrgStsCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cfm; @@ -631,17 +553,11 @@ Status Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgStaReq ( Pst * pst, RgMngmt * sta ) -#else -S16 cmPkLrgStaReq(pst, sta) -Pst * pst; -RgMngmt * sta; -#endif { Buffer *mBuf = NULLP; @@ -681,19 +597,12 @@ Status Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgStaReq ( LrgStaReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgStaReq(func, pst, mBuf) -LrgStaReq func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt sta; @@ -726,17 +635,11 @@ Status Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgStaCfm ( Pst * pst, RgMngmt * cfm ) -#else -S16 cmPkLrgStaCfm(pst, cfm) -Pst * pst; -RgMngmt * cfm; -#endif { Buffer *mBuf = NULLP; @@ -776,19 +679,12 @@ Status Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgStaCfm ( LrgStaCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgStaCfm(func, pst, mBuf) -LrgStaCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cfm; @@ -821,17 +717,11 @@ Status Indication from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgStaInd ( Pst * pst, RgMngmt * usta ) -#else -S16 cmPkLrgStaInd(pst, usta) -Pst * pst; -RgMngmt * usta; -#endif { Buffer *mBuf = NULLP; @@ -873,19 +763,12 @@ Status Indication from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgStaInd ( LrgStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgStaInd(func, pst, mBuf) -LrgStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt usta; @@ -917,17 +800,11 @@ Status Indication from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchStaInd ( Pst * pst, RgMngmt * sta ) -#else -S16 cmPkLrgSchStaInd(pst, sta) -Pst * pst; -RgMngmt * sta; -#endif { Buffer *mBuf = NULLP; @@ -969,19 +846,12 @@ Status Indication from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchStaInd ( LrgSchStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchStaInd(func, pst, mBuf) -LrgSchStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt sta; @@ -1013,17 +883,11 @@ Control Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgCntrlReq ( Pst * pst, RgMngmt * cntrl ) -#else -S16 cmPkLrgCntrlReq(pst, cntrl) -Pst * pst; -RgMngmt * cntrl; -#endif { Buffer *mBuf = NULLP; @@ -1065,19 +929,12 @@ Control Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgCntrlReq ( LrgCntrlReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgCntrlReq(func, pst, mBuf) -LrgCntrlReq func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cntrl; @@ -1109,17 +966,11 @@ Control Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchCntrlReq ( Pst * pst, RgMngmt * cntrl ) -#else -S16 cmPkLrgSchCntrlReq(pst, cntrl) -Pst * pst; -RgMngmt * cntrl; -#endif { Buffer *mBuf = NULLP; @@ -1161,19 +1012,12 @@ Control Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchCntrlReq ( LrgSchCntrlReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchCntrlReq(func, pst, mBuf) -LrgSchCntrlReq func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cntrl; @@ -1205,17 +1049,11 @@ Control Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgCntrlCfm ( Pst * pst, RgMngmt * cfm ) -#else -S16 cmPkLrgCntrlCfm(pst, cfm) -Pst * pst; -RgMngmt * cfm; -#endif { Buffer *mBuf = NULLP; @@ -1257,19 +1095,12 @@ Control Confirm from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgCntrlCfm ( LrgCntrlCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgCntrlCfm(func, pst, mBuf) -LrgCntrlCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cfm; @@ -1301,17 +1132,11 @@ Control Confirm from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchCntrlCfm ( Pst * pst, RgMngmt * cntrl ) -#else -S16 cmPkLrgSchCntrlCfm(pst, cntrl) -Pst * pst; -RgMngmt * cntrl; -#endif { Buffer *mBuf = NULLP; @@ -1353,19 +1178,12 @@ Control Confirm from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchCntrlCfm ( LrgSchCntrlCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchCntrlCfm(func, pst, mBuf) -LrgSchCntrlCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt cntrl; @@ -1398,19 +1216,12 @@ Trace Indication from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgTrcInd ( Pst * pst, RgMngmt * trc, Buffer * trcBuf ) -#else -S16 cmPkLrgTrcInd(pst, trc, trcBuf) -Pst * pst; -RgMngmt * trc; -Buffer * trcBuf; -#endif { Buffer *mBuf = NULLP; @@ -1476,19 +1287,12 @@ Trace Indication from MAC to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgTrcInd ( LrgTrcInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgTrcInd(func, pst, mBuf) -LrgTrcInd func; -Pst *pst; -Buffer *mBuf; -#endif { RgMngmt trc; /* lrg_c_001.main_3 - MODIFY - Modified trcBuf to have it initialized to NULLP */ @@ -1532,17 +1336,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgGenCfg ( RgGenCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgGenCfg(param, mBuf) -RgGenCfg *param; -Buffer *mBuf; -#endif { @@ -1575,17 +1373,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgGenCfg ( RgGenCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgGenCfg(param, mBuf) -RgGenCfg *param; -Buffer *mBuf; -#endif { @@ -1618,17 +1410,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgUpSapCfg ( RgUpSapCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgUpSapCfg(param, mBuf) -RgUpSapCfg *param; -Buffer *mBuf; -#endif { @@ -1661,17 +1447,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgUpSapCfg ( RgUpSapCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgUpSapCfg(param, mBuf) -RgUpSapCfg *param; -Buffer *mBuf; -#endif { @@ -1704,17 +1484,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgLowSapCfg ( RgLowSapCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgLowSapCfg(param, mBuf) -RgLowSapCfg *param; -Buffer *mBuf; -#endif { @@ -1748,17 +1522,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgLowSapCfg ( RgLowSapCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgLowSapCfg(param, mBuf) -RgLowSapCfg *param; -Buffer *mBuf; -#endif { @@ -1793,17 +1561,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgAckNack ( RgAckNack *param, Buffer *mBuf ) -#else -S16 cmPkRgAckNack (param, mBuf) -RgAckNack *param; -Buffer *mBuf; -#endif { @@ -1830,17 +1592,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSchNackAckStats ( RgSchNackAckStats *param, Buffer *mBuf ) -#else -S16 cmPkRgSchNackAckStats (param, mBuf) -RgSchNackAckStats *param; -Buffer *mBuf; -#endif { S32 i; @@ -1872,17 +1628,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgHqNumRetx ( RgSchHqNumRetx *param, Buffer *mBuf ) -#else -S16 cmPkRgHqNumRetx (param, mBuf) -RgSchHqNumRetx *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt32, param->totalTx, mBuf); @@ -1911,17 +1661,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSchHqRetxStats ( RgSchHqRetxStats *param, Buffer *mBuf ) -#else -S16 cmPkRgSchHqRetxStats (param, mBuf) -RgSchHqRetxStats *param; -Buffer *mBuf; -#endif { S32 i; @@ -1954,17 +1698,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgAckNack ( RgAckNack *param, Buffer *mBuf ) -#else -S16 cmUnpkRgAckNack (param, mBuf) -RgAckNack *param; -Buffer *mBuf; -#endif { @@ -1991,17 +1729,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSchNackAckStats ( RgSchNackAckStats *param, Buffer *mBuf ) -#else -S16 cmUnpkRgSchNackAckStats (param, mBuf) -RgSchNackAckStats *param; -Buffer *mBuf; -#endif { S32 i; @@ -2032,17 +1764,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgHqNumRetx ( RgSchHqNumRetx *param, Buffer *mBuf ) -#else -S16 cmUnpkRgHqNumRetx (param, mBuf) -RgSchHqNumRetx *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); @@ -2071,17 +1797,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSchHqRetxStats ( RgSchHqRetxStats *param, Buffer *mBuf ) -#else -S16 cmUnpkRgSchHqRetxStats (param, mBuf) -RgSchHqRetxStats *param; -Buffer *mBuf; -#endif { S32 i; @@ -2114,20 +1834,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgGenSts ( RgGenSts *param, Buffer *mBuf ) -#else -S16 cmPkRgGenSts(param, mBuf) -RgGenSts *param; -Buffer *mBuf; -#endif { - #ifdef MAC_SCH_STATS CMCHKPK(cmPkRgSchHqRetxStats, ¶m->hqRetxStats, mBuf); CMCHKPK(cmPkRgSchNackAckStats, ¶m->nackAckStats, mBuf); @@ -2155,20 +1868,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgGenSts ( RgGenSts *param, Buffer *mBuf ) -#else -S16 cmUnpkRgGenSts(param, mBuf) -RgGenSts *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt32, ¶m->numHarqFail, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numUeCfg, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->numCellCfg, mBuf); @@ -2196,20 +1902,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSapSts ( RgSapSts *param, Buffer *mBuf ) -#else -S16 cmPkRgSapSts(param, mBuf) -RgSapSts *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->numPduDrop, mBuf); CMCHKPK(oduUnpackUInt32, param->numPduTxmit, mBuf); CMCHKPK(oduUnpackUInt32, param->numPduRcvd, mBuf); @@ -2233,20 +1932,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSapSts ( RgSapSts *param, Buffer *mBuf ) -#else -S16 cmUnpkRgSapSts(param, mBuf) -RgSapSts *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt32, ¶m->numPduRcvd, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numPduTxmit, mBuf); CMCHKUNPK(oduPackUInt32, ¶m->numPduDrop, mBuf); @@ -2270,17 +1962,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSchInstCfg ( RgSchInstCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgSchInstCfg(param, mBuf) -RgSchInstCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2317,17 +2003,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSchInstCfg ( RgSchInstCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgSchInstCfg(param, mBuf) -RgSchInstCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2364,22 +2044,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgCfg ( RgCfg *param, S16 elmnt, Buffer *mBuf ) -#else -S16 cmPkRgCfg(param, elmnt, mBuf) -RgCfg *param; -S16 elmnt; -Buffer *mBuf; -#endif { - switch(elmnt) { case STSCHINST: CMCHKPK(cmPkRgSchInstCfg, ¶m->s.schInstCfg, mBuf); @@ -2419,22 +2091,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgCfg ( RgCfg *param, S16 elmnt, Buffer *mBuf ) -#else -S16 cmUnpkRgCfg(param, elmnt, mBuf) -RgCfg *param; -S16 elmnt; -Buffer *mBuf; -#endif { - switch(elmnt) { case STGEN: CMCHKUNPK(cmUnpkRgGenCfg, ¶m->s.genCfg, mBuf); @@ -2474,20 +2138,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSapSta ( RgSapSta *param, Buffer *mBuf ) -#else -S16 cmPkRgSapSta(param, mBuf) -RgSapSta *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->sapState, mBuf); return ROK; } @@ -2509,20 +2166,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSapSta ( RgSapSta *param, Buffer *mBuf ) -#else -S16 cmUnpkRgSapSta(param, mBuf) -RgSapSta *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->sapState, mBuf); return ROK; } @@ -2544,22 +2194,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSts ( RgSts *param, S16 elmnt, Buffer *mBuf ) -#else -S16 cmPkRgSts(param, elmnt, mBuf) -RgSts *param; -S16 elmnt; -Buffer *mBuf; -#endif { - switch(elmnt) { case STTFUSAP: CMCHKPK(cmPkRgSapSts, ¶m->s.tfuSts, mBuf); @@ -2602,22 +2244,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSts ( RgSts *param, S16 elmnt, Buffer *mBuf ) -#else -S16 cmUnpkRgSts(param, elmnt, mBuf) -RgSts *param; -S16 elmnt; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->sapInst, mBuf); CMCHKUNPK(cmUnpkAction, ¶m->action, mBuf); @@ -2660,7 +2294,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSsta ( Pst *pst, @@ -2671,20 +2304,8 @@ uint8_t eventType, #endif Buffer *mBuf ) -#else -S16 cmPkRgSsta(pst, param, elmnt, eventType, mBuf) -Pst *pst; -RgSsta *param; -S16 elmnt; -/* lrg_c_001.main_3 - ADD - Added the extra parameter eventType to the function */ -#ifdef LRG_V1 -uint8_t eventType; -#endif -Buffer *mBuf; -#endif { - switch(elmnt) { case STTFUSAP: CMCHKPK(cmPkRgSapSta, ¶m->s.tfuSapSta, mBuf); @@ -2744,7 +2365,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSsta ( Pst *pst, @@ -2752,13 +2372,6 @@ RgSsta *param, S16 elmnt, Buffer *mBuf ) -#else -S16 cmUnpkRgSsta(pst, param, elmnt, mBuf) -Pst *pst; -RgSsta *param; -S16 elmnt; -Buffer *mBuf; -#endif { @@ -2823,20 +2436,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgUstaDgn ( RgUstaDgn *param, Buffer *mBuf ) -#else -S16 cmPkRgUstaDgn(param, mBuf) -RgUstaDgn *param; -Buffer *mBuf; -#endif { - switch(param->type) { case LRG_USTA_DGNVAL_MEM: CMCHKPK(cmPkMemoryId, ¶m->u.mem, mBuf); @@ -2865,27 +2471,22 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgUstaDgn ( RgUstaDgn *param, Buffer *mBuf ) -#else -S16 cmUnpkRgUstaDgn(param, mBuf) -RgUstaDgn *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->type, mBuf); - switch(param->type) { - case LRG_USTA_DGNVAL_MEM: - CMCHKUNPK(cmUnpkMemoryId, ¶m->u.mem, mBuf); - break; - default : - break; + switch(param->type) + { + case LRG_USTA_DGNVAL_MEM: + CMCHKUNPK(cmUnpkMemoryId, ¶m->u.mem, mBuf); + break; + default : + break; } return ROK; } @@ -2907,20 +2508,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgUsta ( RgUsta *param, Buffer *mBuf ) -#else -S16 cmPkRgUsta(param, mBuf) -RgUsta *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkRgUstaDgn, ¶m->dgn, mBuf); CMCHKPK(cmPkCmAlarm, ¶m->cmAlarm, mBuf); return ROK; @@ -2943,20 +2537,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgUsta ( RgUsta *param, Buffer *mBuf ) -#else -S16 cmUnpkRgUsta(param, mBuf) -RgUsta *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkCmAlarm, ¶m->cmAlarm, mBuf); CMCHKUNPK(cmUnpkRgUstaDgn, ¶m->dgn, mBuf); return ROK; @@ -2979,20 +2566,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgTrc ( RgTrc *param, Buffer *mBuf ) -#else -S16 cmPkRgTrc(param, mBuf) -RgTrc *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->evnt, mBuf); CMCHKPK(cmPkDateTime, ¶m->dt, mBuf); return ROK; @@ -3015,20 +2595,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgTrc ( RgTrc *param, Buffer *mBuf ) -#else -S16 cmUnpkRgTrc(param, mBuf) -RgTrc *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->evnt, mBuf); return ROK; @@ -3051,20 +2624,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgDbgCntrl ( RgDbgCntrl *param, Buffer *mBuf ) -#else -S16 cmPkRgDbgCntrl(param, mBuf) -RgDbgCntrl *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->dbgMask, mBuf); return ROK; } @@ -3085,17 +2651,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSchUlAllocCntrl ( RgSchUlAllocCntrl *param, Buffer *mBuf ) -#else -S16 cmPkRgSchUlAllocCntrl(param, mBuf) -RgSchUlAllocCntrl *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); @@ -3123,17 +2683,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSchUlAllocCntrl ( RgSchUlAllocCntrl *param, Buffer *mBuf ) -#else -S16 cmUnpkRgSchUlAllocCntrl(param, mBuf) -RgSchUlAllocCntrl *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt16, ¶m->logTime, mBuf); @@ -3164,20 +2718,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgDbgCntrl ( RgDbgCntrl *param, Buffer *mBuf ) -#else -S16 cmUnpkRgDbgCntrl(param, mBuf) -RgDbgCntrl *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt32, ¶m->dbgMask, mBuf); return ROK; } @@ -3199,20 +2746,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgSapCntrl ( RgSapCntrl *param, Buffer *mBuf ) -#else -S16 cmPkRgSapCntrl(param, mBuf) -RgSapCntrl *param; -Buffer *mBuf; -#endif { - CMCHKPK(SPkS16, param->spId, mBuf); CMCHKPK(SPkS16, param->suId, mBuf); return ROK; @@ -3235,20 +2775,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgSapCntrl ( RgSapCntrl *param, Buffer *mBuf ) -#else -S16 cmUnpkRgSapCntrl(param, mBuf) -RgSapCntrl *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(SUnpkS16, ¶m->suId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->spId, mBuf); return ROK; @@ -3271,19 +2804,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgCntrl ( RgCntrl *param, S16 elmnt, Buffer *mBuf ) -#else -S16 cmPkRgCntrl(param, elmnt, mBuf) -RgCntrl *param; -S16 elmnt; -Buffer *mBuf; -#endif { @@ -3348,62 +2874,55 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgCntrl ( RgCntrl *param, S16 elmnt, Buffer *mBuf ) -#else -S16 cmUnpkRgCntrl(param, elmnt, mBuf) -RgCntrl *param; -S16 elmnt; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkDateTime, ¶m->dt, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->subAction, mBuf); - switch(elmnt) { - case STGEN: - switch(param->subAction) { - case SADBG: - CMCHKUNPK(cmUnpkRgDbgCntrl, ¶m->s.rgDbgCntrl, mBuf); - break; - case SATRC: - CMCHKUNPK(SUnpkS16, ¶m->s.trcLen, mBuf); - break; - case SAUSTA: - break; + switch(elmnt) { + case STGEN: + switch(param->subAction) { + case SADBG: + CMCHKUNPK(cmUnpkRgDbgCntrl, ¶m->s.rgDbgCntrl, mBuf); + break; + case SATRC: + CMCHKUNPK(SUnpkS16, ¶m->s.trcLen, mBuf); + break; + case SAUSTA: + break; #ifdef SS_DIAG - case SALOG: - CMCHKUNPK(oduPackUInt32, ¶m->s.logMask, mBuf); - break; + case SALOG: + CMCHKUNPK(oduPackUInt32, ¶m->s.logMask, mBuf); + break; #endif #ifdef PHY_ERROR_LOGING - case SAELMNT: - CMCHKUNPK(cmUnpkRgSchUlAllocCntrl, ¶m->s.rgSchUlAllocCntrl, mBuf); - break; + case SAELMNT: + CMCHKUNPK(cmUnpkRgSchUlAllocCntrl, ¶m->s.rgSchUlAllocCntrl, mBuf); + break; #endif - default : - break; - } - break; - case STTFUSAP: - case STRGUSAP: - case STRGRSAP: - case STCRGSAP: - switch(param->subAction) { - default : - CMCHKUNPK(cmUnpkRgSapCntrl, ¶m->s.rgSapCntrl, mBuf); - break; - } - break; - default : - break; + default : + break; + } + break; + case STTFUSAP: + case STRGUSAP: + case STRGRSAP: + case STCRGSAP: + switch(param->subAction) { + default : + CMCHKUNPK(cmUnpkRgSapCntrl, ¶m->s.rgSapCntrl, mBuf); + break; + } + break; + default : + break; } return ROK; } @@ -3425,7 +2944,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgMngmt ( Pst *pst, @@ -3433,13 +2951,6 @@ RgMngmt *param, uint8_t eventType, Buffer *mBuf ) -#else -S16 cmPkRgMngmt(pst, param, eventType, mBuf) -Pst *pst; -RgMngmt *param; -uint8_t eventType; -Buffer *mBuf; -#endif { @@ -3510,7 +3021,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgMngmt ( Pst *pst, @@ -3518,52 +3028,45 @@ RgMngmt *param, uint8_t eventType, Buffer *mBuf ) -#else -S16 cmUnpkRgMngmt(pst, param, eventType, mBuf) -Pst *pst; -RgMngmt *param; -uint8_t eventType; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkHeader, ¶m->hdr, mBuf); CMCHKUNPK(cmUnpkCmStatus, ¶m->cfm, mBuf); - switch(eventType) { - case EVTLRGCFGREQ: - case EVTLRGCFGCFM: - case EVTMACSCHGENCFGREQ: - case EVTMACSCHGENCFGCFM: - if(cmUnpkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) - return RFAILED; - break; - case EVTLRGSTSREQ: - case EVTLRGSTSCFM: - if(cmUnpkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK) - return RFAILED; - break; - case EVTLRGSSTAREQ: - case EVTLRGSSTACFM: - if(cmUnpkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK) - return RFAILED; - break; - case EVTLRGUSTAIND: - case EVTLRGSCHSTAIND: - CMCHKUNPK(cmUnpkRgUsta, ¶m->t.usta, mBuf); - break; - case EVTLRGTRCIND: - CMCHKUNPK(cmUnpkRgTrc, ¶m->t.trc, mBuf); - break; - case EVTLRGCNTRLREQ: - case EVTLRGCNTRLCFM: - case EVTLRGSCHCNTRLREQ: - case EVTLRGSCHCNTRLCFM: - if(cmUnpkRgCntrl(¶m->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK) - return RFAILED; - break; - default : - return RFAILED; + switch(eventType) { + case EVTLRGCFGREQ: + case EVTLRGCFGCFM: + case EVTMACSCHGENCFGREQ: + case EVTMACSCHGENCFGCFM: + if(cmUnpkRgCfg(¶m->t.cfg, param->hdr.elmId.elmnt, mBuf) != ROK) + return RFAILED; + break; + case EVTLRGSTSREQ: + case EVTLRGSTSCFM: + if(cmUnpkRgSts(¶m->t.sts, param->hdr.elmId.elmnt, mBuf) != ROK) + return RFAILED; + break; + case EVTLRGSSTAREQ: + case EVTLRGSSTACFM: + if(cmUnpkRgSsta(pst, ¶m->t.ssta, param->hdr.elmId.elmnt, mBuf) != ROK) + return RFAILED; + break; + case EVTLRGUSTAIND: + case EVTLRGSCHSTAIND: + CMCHKUNPK(cmUnpkRgUsta, ¶m->t.usta, mBuf); + break; + case EVTLRGTRCIND: + CMCHKUNPK(cmUnpkRgTrc, ¶m->t.trc, mBuf); + break; + case EVTLRGCNTRLREQ: + case EVTLRGCNTRLCFM: + case EVTLRGSCHCNTRLREQ: + case EVTLRGSCHCNTRLCFM: + if(cmUnpkRgCntrl(¶m->t.cntrl, param->hdr.elmId.elmnt, mBuf) != ROK) + return RFAILED; + break; + default : + return RFAILED; } return ROK; } @@ -3584,17 +3087,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 cmPkNmbActvUeQciReq ( LrgNmbActvUeQCI *nmbActvUeQci, Buffer *mBuf ) -#else -static S16 cmPkNmbActvUeQciReq(nmbActvUeQci, mBuf) -LrgNmbActvUeQCI *nmbActvUeQci; -Buffer *mBuf; -#endif { uint8_t idx; @@ -3621,17 +3118,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 cmPkAvgPrbQciReq ( LrgAvgPrbQCI *avgPrbQciReq, Buffer *mBuf ) -#else -static S16 cmPkAvgPrbQciReq(avgPrbQciReq, mBuf) -LrgAvgPrbQCI *avgPrbQciReq; -Buffer *mBuf; -#endif { uint8_t idx; @@ -3657,17 +3148,11 @@ L2 Measurement Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchL2MeasReq ( Pst * pst, LrgSchMeasReqInfo *measInfo ) -#else -S16 cmPkLrgSchL2MeasReq(pst, measInfo) -Pst * pst; -LrgSchMeasReqInfo *measInfo; -#endif { Buffer *mBuf = NULLP; @@ -3716,17 +3201,11 @@ L2 Measurement Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchL2MeasStopReq ( Pst * pst, LrgSchMeasStopReqInfo *measInfo ) -#else -S16 cmPkLrgSchL2MeasStopReq(pst, measInfo) -Pst * pst; -LrgSchMeasStopReqInfo *measInfo; -#endif { Buffer *mBuf = NULLP; @@ -3759,20 +3238,14 @@ L2 Measurement Request from LM to MAC. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchL2MeasSendReq ( Pst * pst, LrgSchMeasSndReqInfo *measInfo ) -#else -S16 cmPkLrgSchL2MeasSendReq(pst, measInfo) -Pst * pst; -LrgSchMeasSndReqInfo *measInfo; -#endif { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { + if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, @@ -3800,17 +3273,11 @@ LrgSchMeasSndReqInfo *measInfo; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 cmUnpkNmbActvUeQciReq ( LrgNmbActvUeQCI *param, Buffer *mBuf ) -#else -static S16 cmUnpkNmbActvUeQciReq(param, mBuf) -LrgNmbActvUeQCI *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -3836,17 +3303,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 cmUnpkAvgPrbQciReq ( LrgAvgPrbQCI *param, Buffer *mBuf ) -#else -static S16 cmUnpkAvgPrbQciReq (param, mBuf) -LrgAvgPrbQCI *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -3874,19 +3335,12 @@ Measurement Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchL2MeasReq ( LrgSchL2MeasReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchL2MeasReq(func, pst, mBuf) -LrgSchL2MeasReq func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasReqInfo measInfo; @@ -3929,19 +3383,12 @@ Measurement Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchL2MeasStopReq ( LrgSchL2MeasStopReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchL2MeasStopReq(func, pst, mBuf) -LrgSchL2MeasStopReq func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasStopReqInfo measInfo; @@ -3967,19 +3414,12 @@ Measurement Request from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchL2MeasSendReq ( LrgSchL2MeasSendReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchL2MeasSendReq(func, pst, mBuf) -LrgSchL2MeasSendReq func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasSndReqInfo measInfo; CMCHKUNPK(cmUnpkHeader, &measInfo.hdr, mBuf); @@ -4003,21 +3443,15 @@ L2 Measurement confirm from MAC to LM * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchL2MeasStopCfm ( Pst * pst, LrgSchMeasCfmInfo *measInfo ) -#else -S16 cmPkLrgSchL2MeasStopCfm(pst, measInfo) -Pst * pst; -LrgSchMeasCfmInfo *measInfo; -#endif { Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { + if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, @@ -4045,19 +3479,12 @@ Measurement Confirm from SCH to LM. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchL2MeasStopCfm ( LrgSchL2MeasStopCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchL2MeasStopCfm(func, pst, mBuf) -LrgSchL2MeasStopCfm func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasCfmInfo measInfo; @@ -4083,17 +3510,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 cmPkNumUeQciCfm ( LrgNumActvUeQCICfm *param, Buffer *mBuf ) -#else -static S16 cmPkNumUeQciCfm(param, mBuf) -LrgNumActvUeQCICfm *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -4121,17 +3542,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 cmPkAvgPrbQciCfm ( LrgAvgPrbQCICfm *param, Buffer *mBuf ) -#else -static S16 cmPkAvgPrbQciCfm(param, mBuf) -LrgAvgPrbQCICfm *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -4158,17 +3573,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 cmPkRaPrmbsCfm ( LrgRaPreamblesCfm *param, Buffer *mBuf ) -#else -static S16 cmPkRaPrmbsCfm(param, mBuf) -LrgRaPreamblesCfm *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->randSelPreHighRange, mBuf); @@ -4189,17 +3598,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI static S16 cmPkAvgPrbCfm ( LrgAvgPrbCfm *param, Buffer *mBuf ) -#else -static S16 cmPkAvgPrbCfm(param, mBuf) -LrgAvgPrbCfm *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->prbPerc, mBuf); @@ -4219,17 +3622,11 @@ L2 Measurement confirm from MAC to LM * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLrgSchL2MeasCfm ( Pst * pst, LrgSchMeasCfmInfo *measInfo ) -#else -S16 cmPkLrgSchL2MeasCfm(pst, measInfo) -Pst * pst; -LrgSchMeasCfmInfo *measInfo; -#endif { Buffer *mBuf = NULLP; @@ -4306,17 +3703,11 @@ LrgSchMeasCfmInfo *measInfo; * @return Void * -# ROK **/ -#ifdef ANSI static S16 cmUnpkNumUeQciCfm ( LrgNumActvUeQCICfm *param, Buffer *mBuf ) -#else -static S16 cmUnpkNumUeQciCfm(param, mBuf) -LrgNumActvUeQCICfm *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -4343,17 +3734,11 @@ Buffer *mBuf; * @return Void * -# ROK **/ -#ifdef ANSI static S16 cmUnpkAvgPrbQciCfm ( LrgAvgPrbQCICfm *param, Buffer *mBuf ) -#else -static S16 cmUnpkAvgPrbQciCfm(param, mBuf) -LrgAvgPrbQCICfm *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -4381,17 +3766,11 @@ Buffer *mBuf; * @return Void * -# ROK **/ -#ifdef ANSI static S16 cmUnpkRaPrmbsCfm ( LrgRaPreamblesCfm *param, Buffer *mBuf ) -#else -static S16 cmUnpkRaPrmbsCfm(param, mBuf) -LrgRaPreamblesCfm *param; -Buffer *mBuf; -#endif { @@ -4413,17 +3792,11 @@ Buffer *mBuf; * @return Void * -# ROK **/ -#ifdef ANSI static S16 cmUnpkAvgPrbCfm ( LrgAvgPrbCfm *param, Buffer *mBuf ) -#else -static S16 cmUnpkAvgPrbCfm(param, mBuf) -LrgAvgPrbCfm *param; -Buffer *mBuf; -#endif { @@ -4444,19 +3817,12 @@ Measurement Confirm from LM to SCH. * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLrgSchL2MeasCfm ( LrgSchL2MeasCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLrgSchL2MeasCfm(func, pst, mBuf) -LrgSchL2MeasCfm func; -Pst *pst; -Buffer *mBuf; -#endif { LrgSchMeasCfmInfo measInfo; diff --git a/src/cm/rgm.c b/src/cm/rgm.c index 0dd9f6848..0471a675b 100755 --- a/src/cm/rgm.c +++ b/src/cm/rgm.c @@ -57,19 +57,12 @@ * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLwLcRgmBndReq ( Pst* pst, SuId suId, SpId spId ) -#else -S16 cmPkLwLcRgmBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { Buffer *mBuf = NULLP; @@ -108,19 +101,12 @@ SpId spId; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLwLcRgmBndReq ( RgmBndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLwLcRgmBndReq(func, pst, mBuf) -RgmBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; SpId spId; @@ -159,19 +145,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLwLcRgmUbndReq ( Pst* pst, SpId spId, Reason reason ) -#else -S16 cmPkLwLcRgmUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif { Buffer *mBuf = NULLP; @@ -208,19 +187,12 @@ Reason reason; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLwLcRgmBndCfm ( Pst* pst, SuId suId, uint8_t status ) -#else -S16 cmPkLwLcRgmBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -260,19 +232,12 @@ uint8_t status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLwLcRgmBndCfm ( RgmBndCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLwLcRgmBndCfm(func, pst, mBuf) -RgmBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; uint8_t status; @@ -307,19 +272,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLwLcRgmCfgPrbRprt ( Pst* pst, SpId spId, RgmPrbRprtCfg * prbRprtCfg ) -#else -S16 cmPkLwLcRgmCfgPrbRprt(pst, spId, prbRprtCfg) -Pst* pst; -SpId spId; -RgmPrbRprtCfg * prbRprtCfg; -#endif { Buffer *mBuf = NULLP; uint32_t len = sizeof(RgmPrbRprtCfg); @@ -362,19 +320,12 @@ RgmPrbRprtCfg * prbRprtCfg; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLwLcRgmCfgPrbRprt ( RgmCfgPrbRprtFptr func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLwLcRgmCfgPrbRprt(func, pst, mBuf) -RgmCfgPrbRprtFptr func; -Pst *pst; -Buffer *mBuf; -#endif { S16 ret; SpId spId; @@ -414,19 +365,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkLwLcRgmPrbRprtInd ( Pst* pst, SuId suId, RgmPrbRprtInd * prbRprtInd ) -#else -S16 cmPkLwLcRgmPrbRprtInd(pst, suId, prbRprtInd) -Pst* pst; -SuId suId; -RgmPrbRprtInd * prbRprtInd; -#endif { Buffer *mBuf = NULLP; @@ -468,19 +412,12 @@ RgmPrbRprtInd * prbRprtInd; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkLwLcRgmPrbRprtInd ( RgmPrbRprtIndFptr func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkLwLcRgmPrbRprtInd(func, pst, mBuf) -RgmPrbRprtIndFptr func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgmPrbRprtInd *prbRprtInd; @@ -523,19 +460,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRgmBndReq ( Pst* pst, SuId suId, SpId spId ) -#else -S16 cmPkRgmBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { Buffer *mBuf = NULLP; @@ -574,19 +504,12 @@ SpId spId; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRgmBndReq ( RgmBndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgmBndReq(func, pst, mBuf) -RgmBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; SpId spId; @@ -625,19 +548,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRgmUbndReq ( Pst* pst, SpId spId, Reason reason ) -#else -S16 cmPkRgmUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif { Buffer *mBuf = NULLP; @@ -675,19 +591,12 @@ Reason reason; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRgmUbndReq ( RgmUbndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgmUbndReq(func, pst, mBuf) -RgmUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; Reason reason; @@ -722,19 +631,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRgmBndCfm ( Pst* pst, SuId suId, uint8_t status ) -#else -S16 cmPkRgmBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -774,19 +676,12 @@ uint8_t status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRgmBndCfm ( RgmBndCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgmBndCfm(func, pst, mBuf) -RgmBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; uint8_t status; @@ -822,17 +717,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkCfgPrbRprt ( RgmPrbRprtCfg * prbRprtCfg, Buffer *mBuf ) -#else -S16 cmPkCfgPrbRprt(prbRprtCfg, mBuf) -RgmPrbRprtCfg * prbRprtCfg; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, prbRprtCfg->usPrbAvgPeriodicty, mBuf); CMCHKPK(oduUnpackUInt8, prbRprtCfg->bConfigType, mBuf); @@ -851,17 +740,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnPkCfgPrbRprt ( RgmPrbRprtCfg * prbRprtCfg, Buffer *mBuf ) -#else -S16 cmUnPkCfgPrbRprt(prbRprtCfg, mBuf) -RgmPrbRprtCfg * prbRprtCfg; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bCellId, mBuf); CMCHKUNPK(oduPackUInt8, &prbRprtCfg->bConfigType, mBuf); @@ -885,19 +768,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRgmCfgPrbRprt ( Pst* pst, SpId spId, RgmPrbRprtCfg * prbRprtCfg ) -#else -S16 cmPkRgmCfgPrbRprt(pst, spId, prbRprtCfg) -Pst* pst; -SpId spId; -RgmPrbRprtCfg * prbRprtCfg; -#endif { Buffer *mBuf = NULLP; uint32_t len = sizeof(RgmPrbRprtCfg); @@ -943,19 +819,12 @@ RgmPrbRprtCfg * prbRprtCfg; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRgmCfgPrbRprt ( RgmCfgPrbRprtFptr func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgmCfgPrbRprt(func, pst, mBuf) -RgmCfgPrbRprtFptr func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; RgmPrbRprtCfg *prbRprtCfg; @@ -996,17 +865,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRgmPrbQciRpt ( - RgmPrbRptPerQci *qciPrbRprt, - Buffer *mBuf - ) -#else -S16 cmPkRgmPrbQciRpt(qciPrbRprt, mBuf) -RgmPrbRptPerQci *qciPrbRprt; -Buffer *mBuf = NULLP; -#endif +RgmPrbRptPerQci *qciPrbRprt, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt8, qciPrbRprt->bQci, mBuf); CMCHKPK(oduUnpackUInt8, qciPrbRprt->bAvgPrbUlUsage, mBuf); @@ -1027,17 +890,11 @@ Buffer *mBuf = NULLP; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRgmPrbQciRpt ( - RgmPrbRptPerQci *qciPrbRprt, - Buffer *mBuf - ) -#else -S16 cmUnpkRgmPrbQciRpt(qciPrbRprt, mBuf) -RgmPrbRptPerQci *qciPrbRprt; -Buffer *mBuf = NULLP; -#endif +RgmPrbRptPerQci *qciPrbRprt, +Buffer *mBuf +) { CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbDlUsage, mBuf); CMCHKUNPK(oduPackUInt8, &qciPrbRprt->bAvgPrbUlUsage, mBuf); @@ -1059,17 +916,11 @@ Buffer *mBuf = NULLP; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkPrbRprtInd ( - RgmPrbRprtInd * prbRprtInd, - Buffer *mBuf - ) -#else -S16 cmPkPrbRprtInd(prbRprtInd, mBuf) - RgmPrbRprtInd * prbRprtInd; - Buffer *mBuf = NULLP; -#endif +RgmPrbRprtInd * prbRprtInd, +Buffer *mBuf +) { S32 idx = 0; @@ -1097,17 +948,11 @@ S16 cmPkPrbRprtInd(prbRprtInd, mBuf) * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkPrbRprtInd ( - RgmPrbRprtInd * prbRprtInd, - Buffer *mBuf - ) -#else -S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf) - RgmPrbRprtInd * prbRprtInd; - Buffer *mBuf; -#endif +RgmPrbRprtInd * prbRprtInd, +Buffer *mBuf +) { uint32_t idx = 0; @@ -1139,19 +984,12 @@ S16 cmUnpkPrbRprtInd(prbRprtInd, mBuf) * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRgmPrbRprtInd ( Pst* pst, SuId suId, RgmPrbRprtInd * prbRprtInd ) -#else -S16 cmPkRgmPrbRprtInd(pst, suId, prbRprtInd) -Pst* pst; -SuId suId; -RgmPrbRprtInd * prbRprtInd; -#endif { Buffer *mBuf = NULLP; @@ -1193,19 +1031,12 @@ RgmPrbRprtInd * prbRprtInd; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRgmPrbRprtInd ( RgmPrbRprtIndFptr func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgmPrbRprtInd(func, pst, mBuf) -RgmPrbRprtIndFptr func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgmPrbRprtInd prbRprtInd; @@ -1239,17 +1070,11 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkTransModeInd ( - RgmTransModeInd *transModeInd, - Buffer *mBuf - ) -#else -S16 cmPkTransModeInd(transModeInd, mBuf) - RgmTransModeInd *transModeInd; - Buffer *mBuf; -#endif +RgmTransModeInd *transModeInd, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt32, transModeInd->eMode, mBuf); CMCHKPK(oduUnpackUInt16, transModeInd->usCrnti, mBuf); @@ -1269,17 +1094,11 @@ S16 cmPkTransModeInd(transModeInd, mBuf) * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkTransModeInd ( - RgmTransModeInd *transModeInd, - Buffer *mBuf - ) -#else -S16 cmUnpkTransModeInd(transModeInd, mBuf) - RgmTransModeInd *transModeInd; - Buffer *mBuf; -#endif +RgmTransModeInd *transModeInd, +Buffer *mBuf +) { uint32_t tmpModeEnum; CMCHKUNPK(oduPackUInt8, &transModeInd->bCellId, mBuf); @@ -1301,19 +1120,13 @@ S16 cmUnpkTransModeInd(transModeInd, mBuf) * @return S16 * -# ROK **/ -#ifdef ANSI + S16 cmPkRgmTransModeInd ( Pst* pst, SuId suId, RgmTransModeInd *transModeInd ) -#else -S16 cmPkRgmTransModeInd(pst, suId, transModeInd) -Pst* pst; -SuId suId; -RgmTransModeInd *transModeInd; -#endif { Buffer *mBuf = NULLP; @@ -1355,19 +1168,12 @@ RgmTransModeInd *transModeInd; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRgmTransModeInd ( RgmTransModeIndFptr func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgmTransModeInd(func, pst, mBuf) -RgmTransModeIndFptr func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgmTransModeInd transModeInd; diff --git a/src/cm/rgr.c b/src/cm/rgr.c index 743f07ca7..c3c6cd1e1 100755 --- a/src/cm/rgr.c +++ b/src/cm/rgr.c @@ -57,19 +57,12 @@ * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrBndReq ( Pst* pst, SuId suId, SpId spId ) -#else -S16 cmPkRgrBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { Buffer *mBuf = NULLP; @@ -119,19 +112,12 @@ SpId spId; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrBndReq ( RgrBndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrBndReq(func, pst, mBuf) -RgrBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; SpId spId; @@ -176,19 +162,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrBndCfm ( Pst* pst, SuId suId, uint8_t status ) -#else -S16 cmPkRgrBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -239,19 +218,12 @@ uint8_t status; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrBndCfm ( RgrBndCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrBndCfm(func, pst, mBuf) -RgrBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; uint8_t status; @@ -295,19 +267,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUbndReq ( Pst* pst, SpId spId, Reason reason ) -#else -S16 cmPkRgrUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif { Buffer *mBuf = NULLP; @@ -357,19 +322,12 @@ Reason reason; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUbndReq ( RgrUbndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrUbndReq(func, pst, mBuf) -RgrUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; Reason reason; @@ -414,19 +372,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCfgReq ( RgrCfgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgReq(func, pst, mBuf) -RgrCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { RgrCfgTransId transId; RgrCfgReqInfo *cfgReqInfo; @@ -494,17 +445,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTtiIndInfo ( RgrTtiIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrTtiIndInfo(param, mBuf) -RgrTtiIndInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->sfn, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -525,17 +470,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTtiIndInfo ( RgrTtiIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTtiIndInfo(param, mBuf) -RgrTtiIndInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); @@ -559,19 +498,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTtiInd ( Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd ) -#else -S16 cmPkRgrTtiInd(pst, suId, ttiInd) -Pst* pst; -SuId suId; -RgrTtiIndInfo *ttiInd; -#endif { Buffer *mBuf = NULLP; @@ -624,19 +556,12 @@ RgrTtiIndInfo *ttiInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTtiInd ( RgrTtiInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrTtiInd(func, pst, mBuf) -RgrTtiInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrTtiIndInfo *ttiInd; @@ -695,19 +620,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCfgCfm ( Pst* pst, RgrCfgTransId transId, uint8_t status ) -#else -S16 cmPkRgrCfgCfm(pst, transId, status) -Pst* pst; -RgrCfgTransId transId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -757,19 +675,12 @@ uint8_t status; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCfgCfm ( RgrCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgCfm(func, pst, mBuf) -RgrCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { RgrCfgTransId transId; uint8_t status; @@ -814,7 +725,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSiCfgCfm ( Pst* pst, @@ -822,13 +732,6 @@ SuId suId, RgrCfgTransId transId, uint8_t status ) -#else -S16 cmPkRgrSiCfgCfm(pst, suId, transId, status) -Pst* pst; -SuId suId; -RgrCfgTransId transId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -889,19 +792,12 @@ uint8_t status; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSiCfgCfm ( RgrSiCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfgCfm(func, pst, mBuf) -RgrSiCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrCfgTransId transId; @@ -956,17 +852,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCfgTransId ( RgrCfgTransId *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfgTransId(param, mBuf) -RgrCfgTransId *param; -Buffer *mBuf; -#endif { S32 i; @@ -994,17 +884,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCfgTransId ( RgrCfgTransId *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgTransId(param, mBuf) -RgrCfgTransId *param; -Buffer *mBuf; -#endif { S32 i; @@ -1032,17 +916,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDlHqCfg ( RgrDlHqCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlHqCfg(param, mBuf) -RgrDlHqCfg *param; -Buffer *mBuf; -#endif { @@ -1068,17 +946,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDlHqCfg ( RgrDlHqCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlHqCfg(param, mBuf) -RgrDlHqCfg *param; -Buffer *mBuf; -#endif { @@ -1104,20 +976,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrRntiCfg ( RgrRntiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRntiCfg(param, mBuf) -RgrRntiCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt16, param->size, mBuf); CMCHKPK(cmPkLteRnti, param->startRnti, mBuf); return ROK; @@ -1140,17 +1005,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrRntiCfg ( RgrRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRntiCfg(param, mBuf) -RgrRntiCfg *param; -Buffer *mBuf; -#endif { @@ -1175,17 +1034,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrEmtcRntiCfg ( RgrEmtcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcRntiCfg(param, mBuf) -RgrEmtcRntiCfg *param; -Buffer *mBuf; -#endif { @@ -1214,17 +1067,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrEmtcRntiCfg ( RgrEmtcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcRntiCfg(param, mBuf) -RgrEmtcRntiCfg *param; -Buffer *mBuf; -#endif { @@ -1254,17 +1101,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDlCmnCodeRateCfg ( RgrDlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlCmnCodeRateCfg(param, mBuf) -RgrDlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); @@ -1290,17 +1131,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDlCmnCodeRateCfg ( RgrDlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlCmnCodeRateCfg(param, mBuf) -RgrDlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt16, ¶m->bcchPchRaCodeRate, mBuf); @@ -1326,19 +1161,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCfiCfg ( RgrCfiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfiCfg(param, mBuf) -RgrCfiCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); return ROK; } @@ -1360,17 +1188,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCfiCfg ( RgrCfiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfiCfg(param, mBuf) -RgrCfiCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); @@ -1394,17 +1216,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPuschSubBandCfg ( RgrPuschSubBandCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPuschSubBandCfg(param, mBuf) -RgrPuschSubBandCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -1435,21 +1251,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPuschSubBandCfg ( RgrPuschSubBandCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPuschSubBandCfg(param, mBuf) -RgrPuschSubBandCfg *param; -Buffer *mBuf; -#endif { S32 i; - CMCHKUNPK(oduPackUInt8, ¶m->subbandStart, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->numSubbands, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->size, mBuf); @@ -1476,19 +1285,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlCmnCodeRateCfg ( RgrUlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlCmnCodeRateCfg(param, mBuf) -RgrUlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->ccchCqi, mBuf); return ROK; } @@ -1510,17 +1312,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlCmnCodeRateCfg ( RgrUlCmnCodeRateCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlCmnCodeRateCfg(param, mBuf) -RgrUlCmnCodeRateCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->ccchCqi, mBuf); @@ -1544,19 +1340,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlTrgCqiCfg ( RgrUlTrgCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlTrgCqiCfg(param, mBuf) -RgrUlTrgCqiCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->trgCqi, mBuf); return ROK; } @@ -1578,17 +1367,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlTrgCqiCfg ( RgrUlTrgCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlTrgCqiCfg(param, mBuf) -RgrUlTrgCqiCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->trgCqi, mBuf); @@ -1612,17 +1395,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrBwCfg ( RgrBwCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrBwCfg(param, mBuf) -RgrBwCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); @@ -1634,17 +1411,11 @@ Buffer *mBuf; #ifdef EMTC_ENABLE /* EMTC related pack changes start*/ -#ifdef ANSI S16 cmPkRgrEmtcSiCfg ( RgrEmtcSiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcSiCfg(param, mBuf) -RgrEmtcSiCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -1690,17 +1461,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmPkRgrEmtcRachCfg ( RgrEmtcRachCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcRachCfg(param, mBuf) -RgrEmtcRachCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -1720,17 +1485,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmPkRgrEmtcPdschCfg ( RgrEmtcPdschCfg*param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcPdschCfg(param, mBuf) -RgrEmtcPdschCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); @@ -1739,17 +1498,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmPkRgrEmtcPuschCfg ( RgrEmtcPuschCfg*param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcPuschCfg(param, mBuf) -RgrEmtcPuschCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeA, mBuf); CMCHKPK(oduUnpackUInt16, param->emtcMaxRepCeModeB, mBuf); @@ -1759,24 +1512,18 @@ Buffer *mBuf; -#ifdef ANSI S16 cmPkRgrEmtcPucchCfg ( RgrEmtcPucchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcPucchCfg(param, mBuf) -RgrEmtcPucchCfg *param; -Buffer *mBuf; -#endif { S32 i; - - for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) { + for (i=RGR_MAX_CE_LEVEL-1; i >= 0; i--) + { CMCHKPK(oduUnpackUInt16, param->emtcN1pucchAnInfoLst[i], mBuf); - } + } CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl0, mBuf); CMCHKPK(oduUnpackUInt8, param->emtcPucchNumRepCEMsg4Lvl1, mBuf); @@ -1787,17 +1534,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmPkRgrEmtcPrachCeParamCfg ( RgrEmtcPrachCEParamLst *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcPrachCeParamCfg(param, mBuf) -RgrEmtcPrachCEParamLst *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->emtcPrachCfgIdx, mBuf); CMCHKPK(oduUnpackUInt8, param->emtcPrachFreqOffset, mBuf); @@ -1814,17 +1555,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmPkRgrEmtcPrachCfg ( RgrEmtcPrachCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcPrachCfg(param, mBuf) -RgrEmtcPrachCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -1841,17 +1576,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmPkRgrEmtcCfg ( RgrEmtcCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrEmtcCfg(param, mBuf) -RgrEmtcCellCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->pci, mBuf); CMCHKPK(oduUnpackUInt32, param->emtcT300Tmr, mBuf); @@ -1874,17 +1603,11 @@ Buffer *mBuf; /* EMTC related unpack changes start*/ -#ifdef ANSI S16 cmUnpkRgrEmtcSiCfg ( RgrEmtcSiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcSiCfg(param, mBuf) -RgrEmtcSiCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -1930,17 +1653,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmUnpkRgrEmtcRachCfg ( RgrEmtcRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcRachCfg(param, mBuf) -RgrEmtcRachCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -1957,17 +1674,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkRgrEmtcPdschCfg ( RgrEmtcPdschCfg*param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPdschCfg(param, mBuf) -RgrEmtcPdschCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); @@ -1975,17 +1686,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcPuschCfg ( RgrEmtcPuschCfg*param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPuschCfg(param, mBuf) -RgrEmtcPuschCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->emtcHoppingOffset, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMaxRepCeModeB, mBuf); @@ -1995,17 +1700,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmUnpkRgrEmtcPucchCfg ( RgrEmtcPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPucchCfg(param, mBuf) -RgrEmtcPucchCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2023,17 +1722,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkRgrEmtcPrachCeParamCfg ( RgrEmtcPrachCEParamLst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPrachCeParamCfg(param, mBuf) -RgrEmtcPrachCEParamLst *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->emtcPrachHoppingCfg, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->emtcMpdcchNumRep, mBuf); @@ -2050,17 +1743,11 @@ Buffer *mBuf; -#ifdef ANSI S16 cmUnpkRgrEmtcPrachCfg ( RgrEmtcPrachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcPrachCfg(param, mBuf) -RgrEmtcPrachCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2074,17 +1761,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkRgrEmtcCfg ( RgrEmtcCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcCfg(param, mBuf) -RgrEmtcCellCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->emtcPuschNbIdx, mBuf); @@ -2129,17 +1810,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrBwCfg ( RgrBwCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrBwCfg(param, mBuf) -RgrBwCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); @@ -2164,17 +1839,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPhichCfg ( RgrPhichCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPhichCfg(param, mBuf) -RgrPhichCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->isDurExtend, mBuf); @@ -2199,17 +1868,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPhichCfg ( RgrPhichCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPhichCfg(param, mBuf) -RgrPhichCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -2237,17 +1900,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPucchCfg ( RgrPucchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPucchCfg(param, mBuf) -RgrPucchCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->maxPucchRb, mBuf); @@ -2276,20 +1933,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPucchCfg ( RgrPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPucchCfg(param, mBuf) -RgrPucchCfg *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(oduPackUInt8, ¶m->resourceSize, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->n1PucchAn, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->deltaShift, mBuf); @@ -2316,17 +1966,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSrsCfg ( RgrSrsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSrsCfg(param, mBuf) -RgrSrsCfg *param; -Buffer *mBuf; -#endif { @@ -2354,21 +1998,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSrsCfg ( RgrSrsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSrsCfg(param, mBuf) -RgrSrsCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; - CMCHKUNPK(oduPackUInt8, ¶m->isSrsCfgSetup, mBuf); CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->srsCfgPrdEnum = (RgrSrsCfgPrd) tmpEnum; @@ -2395,17 +2032,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrRachCfg ( RgrRachCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRachCfg(param, mBuf) -RgrRachCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2447,17 +2078,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrRachCfg ( RgrRachCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRachCfg(param, mBuf) -RgrRachCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -2500,17 +2125,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSiCfg ( RgrSiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSiCfg(param, mBuf) -RgrSiCfg *param; -Buffer *mBuf; -#endif { /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ #ifdef RGR_SI_SCH @@ -2554,17 +2173,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSiCfg ( RgrSiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfg(param, mBuf) -RgrSiCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; /* rgr_c_001.main_4:MOD-Modified for SI Enhancement. */ @@ -2613,17 +2226,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTpcRntiCfg ( RgrTpcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrTpcRntiCfg(param, mBuf) -RgrTpcRntiCfg *param; -Buffer *mBuf; -#endif { @@ -2649,17 +2256,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTpcRntiCfg ( RgrTpcRntiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTpcRntiCfg(param, mBuf) -RgrTpcRntiCfg *param; -Buffer *mBuf; -#endif { @@ -2685,20 +2286,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlPwrCfg ( RgrUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlPwrCfg(param, mBuf) -RgrUlPwrCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3a, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->puschPwrFmt3, mBuf); CMCHKPK(cmPkRgrTpcRntiCfg, ¶m->pucchPwrFmt3a, mBuf); @@ -2727,17 +2321,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlPwrCfg ( RgrUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlPwrCfg(param, mBuf) -RgrUlPwrCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -2771,17 +2359,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPuschCfg ( RgrPuschCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPuschCfg(param, mBuf) -RgrPuschCfg *param; -Buffer *mBuf; -#endif { @@ -2808,17 +2390,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPuschCfg ( RgrPuschCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPuschCfg(param, mBuf) -RgrPuschCfg *param; -Buffer *mBuf; -#endif { @@ -2845,17 +2421,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCodeBookRstCfg ( RgrCodeBookRstCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCodeBookRstCfg(param, mBuf) -RgrCodeBookRstCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2884,17 +2454,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCodeBookRstCfg ( RgrCodeBookRstCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCodeBookRstCfg(param, mBuf) -RgrCodeBookRstCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -2923,17 +2487,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrPreambleSetCfg ( RgrPreambleSetCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrPreambleSetCfg(param, mBuf) -RgrPreambleSetCfg *param; -Buffer *mBuf; -#endif { @@ -2960,17 +2518,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrPreambleSetCfg ( RgrPreambleSetCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrPreambleSetCfg(param, mBuf) -RgrPreambleSetCfg *param; -Buffer *mBuf; -#endif { @@ -2997,20 +2549,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCmnLchCfg ( RgrCmnLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCmnLchCfg(param, mBuf) -RgrCmnLchCfg *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); CMCHKPK(oduUnpackUInt8, param->dir, mBuf); @@ -3036,17 +2581,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCmnLchCfg ( RgrCmnLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCmnLchCfg(param, mBuf) -RgrCmnLchCfg *param; -Buffer *mBuf; -#endif { @@ -3075,17 +2614,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDlfsCfg ( RgrDlfsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlfsCfg(param, mBuf) -RgrDlfsCfg *param; -Buffer *mBuf; -#endif { @@ -3111,17 +2644,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDlfsCfg ( RgrDlfsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlfsCfg(param, mBuf) -RgrDlfsCfg *param; -Buffer *mBuf; -#endif { @@ -3151,17 +2678,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTddPrachInfo ( RgrTddPrachInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrTddPrachInfo(param, mBuf) -RgrTddPrachInfo *param; -Buffer *mBuf; -#endif { @@ -3189,17 +2710,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTddPrachInfo ( RgrTddPrachInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTddPrachInfo(param, mBuf) -RgrTddPrachInfo *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -3229,17 +2744,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrTddPrachRscInfo ( RgrTddPrachRscInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrTddPrachRscInfo(param, mBuf) -RgrTddPrachRscInfo *param; -Buffer *mBuf; -#endif { S32 i; @@ -3268,17 +2777,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrTddPrachRscInfo ( RgrTddPrachRscInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrTddPrachRscInfo(param, mBuf) -RgrTddPrachRscInfo *param; -Buffer *mBuf; -#endif { S32 i; @@ -3311,17 +2814,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrEnbPfs ( RgrEnbPfs *param, Buffer *mBuf ) -#else -S16 cmPkRgrEnbPfs(param, mBuf) -RgrEnbPfs *param; -Buffer *mBuf; -#endif { S32 idx; for(idx = RGR_MAX_NUM_QCI-1; idx >= 0; idx--) @@ -3351,17 +2848,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrEnbPfs ( RgrEnbPfs *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEnbPfs(param, mBuf) -RgrEnbPfs *param; -Buffer *mBuf; -#endif { S32 idx; @@ -3392,17 +2883,11 @@ TODO: Check if this is to be added to re-configuration as well * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSpsCellCfg ( RgrSpsCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSpsCellCfg(param, mBuf) -RgrSpsCellCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->maxSpsUePerUlSf, mBuf); @@ -3430,17 +2915,11 @@ TODO: Check if this is to be added to re-configuration as well * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSpsDlCellCfg ( RgrSpsCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSpsDlCellCfg(param, mBuf) -RgrSpsCellCfg *param; -Buffer *mBuf; -#endif { @@ -3513,17 +2992,11 @@ Buffer *mBuf * File : * **********************************************************/ -#ifdef ANSI static S16 cmPkRgrLteUCellCfg ( RgrLteUCfg *param, Buffer *mBuf ) -#else -static S16 cmPkRgrLteUCellCfg(param, mBuf) -RgrLteUCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->isLaaCell, mBuf); @@ -3546,17 +3019,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmUnpkRgrLteUCellCfg ( RgrLteUCfg *param, Buffer *mBuf ) -#else -static S16 cmUnpkRgrLteUCellCfg(param, mBuf) -RgrLteUCfg *param; -Buffer *mBuf; -#endif { @@ -3581,17 +3048,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLteAdvancedUeConfig ( - RgrLteAdvancedUeConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) - RgrLteAdvancedUeConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedUeConfig *param, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt8, param->isUeCellEdge, mBuf); @@ -3615,17 +3076,11 @@ S16 cmPkRgrLteAdvancedUeConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLteAdvancedUeConfig ( - RgrLteAdvancedUeConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) - RgrLteAdvancedUeConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedUeConfig *param, +Buffer *mBuf +) { CMCHKUNPK(oduPackUInt32, ¶m->pres, mBuf); @@ -3649,17 +3104,11 @@ S16 cmUnpkRgrLteAdvancedUeConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrAbsConfig ( - RgrAbsConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrAbsConfig(param, mBuf) - RgrAbsConfig *param; - Buffer *mBuf; -#endif +RgrAbsConfig *param, +Buffer *mBuf +) { S8 indx = 0; @@ -3690,17 +3139,11 @@ S16 cmPkRgrAbsConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSfrConfig ( - RgrSfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrSfrConfig(param, mBuf) - RgrSfrConfig *param; - Buffer *mBuf; -#endif +RgrSfrConfig *param, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf); @@ -3731,17 +3174,11 @@ S16 cmPkRgrSfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDsfrConfig ( - RgrDsfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrDsfrConfig(param, mBuf) - RgrDsfrConfig *param; - Buffer *mBuf; -#endif +RgrDsfrConfig *param, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt32, (uint32_t)param->status, mBuf); @@ -3766,17 +3203,11 @@ S16 cmPkRgrDsfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDsfrConfig ( - RgrDsfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrDsfrConfig(param, mBuf) - RgrDsfrConfig *param; - Buffer *mBuf; -#endif +RgrDsfrConfig *param, +Buffer *mBuf +) { CMCHKUNPK(oduPackUInt32, (uint32_t *)¶m->status, mBuf); @@ -3800,17 +3231,12 @@ S16 cmUnpkRgrDsfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI + S16 cmPkRgrCellLteAdvancedFeatureCfg ( - RgrLteAdvancedCellConfig *param, - Buffer *mBuf - ) -#else -S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) - RgrLteAdvancedCellConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedCellConfig *param, +Buffer *mBuf +) { CMCHKPK(oduUnpackUInt32, param->pres, mBuf); @@ -3838,17 +3264,11 @@ S16 cmPkRgrCellLteAdvancedFeatureCfg(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrAbsConfig ( - RgrAbsConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrAbsConfig(param, mBuf) - RgrAbsConfig *param; - Buffer *mBuf; -#endif +RgrAbsConfig *param, +Buffer *mBuf +) { S8 indx = 0; @@ -3880,17 +3300,11 @@ S16 cmUnpkRgrAbsConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSfrConfig ( - RgrSfrConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrSfrConfig(param, mBuf) - RgrSfrConfig *param; - Buffer *mBuf; -#endif +RgrSfrConfig *param, +Buffer *mBuf +) { @@ -3920,17 +3334,11 @@ S16 cmUnpkRgrSfrConfig(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellLteAdvancedFeatureCfg ( - RgrLteAdvancedCellConfig *param, - Buffer *mBuf - ) -#else -S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) - RgrLteAdvancedCellConfig *param; - Buffer *mBuf; -#endif +RgrLteAdvancedCellConfig *param, +Buffer *mBuf +) { CMCHKUNPK(cmUnpkRgrAbsConfig, ¶m->absCfg, mBuf); @@ -3956,17 +3364,11 @@ S16 cmUnpkRgrCellLteAdvancedFeatureCfg(param, mBuf) * File : * **********************************************************/ -#ifdef ANSI S16 cmPkMacSchedGnbCfg ( MacSchedGnbCfg *param, Buffer *mBuf ) -#else -S16 cmPkMacSchedGnbCfg(param, mBuf) -RgrSchedEnbCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->maxDlUePerTti, mBuf); @@ -3993,17 +3395,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkMacSchedGnbCfg ( MacSchedGnbCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkMacSchedGnbCfg(param, mBuf) -MacSchedGnbCfg *param; -Buffer *mBuf; -#endif { @@ -4032,17 +3428,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCfg ( RgrCellCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCfg(param, mBuf) -RgrCellCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -4156,17 +3546,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCfg ( RgrCellCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCfg(param, mBuf) -RgrCellCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -4271,17 +3655,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeAprdDlCqiCfg ( RgrUeAprdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeAprdDlCqiCfg(param, mBuf) -RgrUeAprdDlCqiCfg *param; -Buffer *mBuf; -#endif { /*Pack Aperiodic Trigger List only for Pcell */ @@ -4312,17 +3690,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeAprdDlCqiCfg ( RgrUeAprdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeAprdDlCqiCfg(param, mBuf) -RgrUeAprdDlCqiCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4359,17 +3731,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4400,17 +3766,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4447,17 +3807,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDlPCqiSetup ( RgrUeDlPCqiSetup *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDlPCqiSetup(param, mBuf) -RgrUeDlPCqiSetup *param; -Buffer *mBuf; -#endif { @@ -4490,17 +3844,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDlPCqiSetup ( RgrUeDlPCqiSetup *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDlPCqiSetup(param, mBuf) -RgrUeDlPCqiSetup *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4535,17 +3883,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4571,17 +3913,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePrdDlCqiCfg ( RgrUePrdDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePrdDlCqiCfg(param, mBuf) -RgrUePrdDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4608,17 +3944,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlSrsSetupCfg ( RgrUeUlSrsSetupCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlSrsSetupCfg(param, mBuf) -RgrUeUlSrsSetupCfg *param; -Buffer *mBuf; -#endif { @@ -4652,17 +3982,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlSrsSetupCfg ( RgrUeUlSrsSetupCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlSrsSetupCfg(param, mBuf) -RgrUeUlSrsSetupCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -4699,17 +4023,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSrSetupCfg ( RgrUeSrSetupCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSrSetupCfg(param, mBuf) -RgrUeSrSetupCfg *param; -Buffer *mBuf; -#endif { @@ -4737,17 +4055,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSrSetupCfg ( RgrUeSrSetupCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSrSetupCfg(param, mBuf) -RgrUeSrSetupCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt16, ¶m->srResIdx, mBuf); @@ -4774,17 +4086,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSrCfg ( RgrUeSrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSrCfg(param, mBuf) -RgrUeSrCfg *param; -Buffer *mBuf; -#endif { @@ -4810,17 +4116,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSrCfg ( RgrUeSrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSrCfg(param, mBuf) -RgrUeSrCfg *param; -Buffer *mBuf; -#endif { @@ -4847,17 +4147,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlSrsCfg ( RgrUeUlSrsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlSrsCfg(param, mBuf) -RgrUeUlSrsCfg *param; -Buffer *mBuf; -#endif { @@ -4885,17 +4179,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlSrsCfg ( RgrUeUlSrsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlSrsCfg(param, mBuf) -RgrUeUlSrsCfg *param; -Buffer *mBuf; -#endif { @@ -4924,17 +4212,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDlCqiCfg ( RgrUeDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDlCqiCfg(param, mBuf) -RgrUeDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -4969,17 +4251,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDlCqiCfg ( RgrUeDlCqiCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDlCqiCfg(param, mBuf) -RgrUeDlCqiCfg *param; -Buffer *mBuf; -#endif { @@ -5005,17 +4281,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeMeasGapCfg ( RgrUeMeasGapCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeMeasGapCfg(param, mBuf) -RgrUeMeasGapCfg *param; -Buffer *mBuf; -#endif { @@ -5042,17 +4312,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeMeasGapCfg ( RgrUeMeasGapCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeMeasGapCfg(param, mBuf) -RgrUeMeasGapCfg *param; -Buffer *mBuf; -#endif { @@ -5079,17 +4343,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDrxLongCycleOffst ( RgrDrxLongCycleOffst *param, Buffer *mBuf ) -#else -S16 cmPkRgrDrxLongCycleOffst(param, mBuf) -RgrDrxLongCycleOffst *param; -Buffer *mBuf; -#endif { @@ -5115,17 +4373,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDrxLongCycleOffst ( RgrDrxLongCycleOffst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDrxLongCycleOffst(param, mBuf) -RgrDrxLongCycleOffst *param; -Buffer *mBuf; -#endif { @@ -5151,17 +4403,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDrxShortDrx ( RgrDrxShortDrx *param, Buffer *mBuf ) -#else -S16 cmPkRgrDrxShortDrx(param, mBuf) -RgrDrxShortDrx *param; -Buffer *mBuf; -#endif { @@ -5188,17 +4434,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDrxShortDrx ( RgrDrxShortDrx *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDrxShortDrx(param, mBuf) -RgrDrxShortDrx *param; -Buffer *mBuf; -#endif { @@ -5223,17 +4463,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDrxCfg ( RgrUeDrxCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeDrxCfg(param, mBuf) -RgrUeDrxCfg *param; -Buffer *mBuf; -#endif { @@ -5272,17 +4506,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDrxCfg ( RgrUeDrxCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeDrxCfg(param, mBuf) -RgrUeDrxCfg *param; -Buffer *mBuf; -#endif { @@ -5321,17 +4549,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCapCfg ( RgrUeCapCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCapCfg(param, mBuf) -RgrUeCapCfg *param; -Buffer *mBuf; -#endif { @@ -5360,17 +4582,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCapCfg ( RgrUeCapCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCapCfg(param, mBuf) -RgrUeCapCfg *param; -Buffer *mBuf; -#endif { @@ -5399,17 +4615,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeAckNackRepCfg ( RgrUeAckNackRepCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeAckNackRepCfg(param, mBuf) -RgrUeAckNackRepCfg *param; -Buffer *mBuf; -#endif { @@ -5436,17 +4646,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeAckNackRepCfg ( RgrUeAckNackRepCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeAckNackRepCfg(param, mBuf) -RgrUeAckNackRepCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5475,17 +4679,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeTxModeCfg ( RgrUeTxModeCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeTxModeCfg(param, mBuf) -RgrUeTxModeCfg *param; -Buffer *mBuf; -#endif { @@ -5513,17 +4711,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeTxModeCfg ( RgrUeTxModeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeTxModeCfg(param, mBuf) -RgrUeTxModeCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5554,17 +4746,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlHqCfg ( RgrUeUlHqCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlHqCfg(param, mBuf) -RgrUeUlHqCfg *param; -Buffer *mBuf; -#endif { @@ -5590,17 +4776,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlHqCfg ( RgrUeUlHqCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlHqCfg(param, mBuf) -RgrUeUlHqCfg *param; -Buffer *mBuf; -#endif { @@ -5626,17 +4806,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeGrpPwrCfg ( RgrUeGrpPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeGrpPwrCfg(param, mBuf) -RgrUeGrpPwrCfg *param; -Buffer *mBuf; -#endif { @@ -5663,17 +4837,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeGrpPwrCfg ( RgrUeGrpPwrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeGrpPwrCfg(param, mBuf) -RgrUeGrpPwrCfg *param; -Buffer *mBuf; -#endif { @@ -5701,17 +4869,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsDlCfg ( RgrUeSpsDlCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsDlCfg(param, mBuf) -RgrUeSpsDlCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -5743,17 +4905,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsDlCfg ( RgrUeSpsDlCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsDlCfg(param, mBuf) -RgrUeSpsDlCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5788,17 +4944,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsUlCfg ( RgrUeSpsUlCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsUlCfg(param, mBuf) -RgrUeSpsUlCfg *param; -Buffer *mBuf; -#endif { S32 i; @@ -5842,17 +4992,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsUlCfg ( RgrUeSpsUlCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsUlCfg(param, mBuf) -RgrUeSpsUlCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -5897,17 +5041,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSpsCfg ( RgrUeSpsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSpsCfg(param, mBuf) -RgrUeSpsCfg *param; -Buffer *mBuf; -#endif { @@ -5934,17 +5072,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSpsCfg ( RgrUeSpsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSpsCfg(param, mBuf) -RgrUeSpsCfg *param; -Buffer *mBuf; -#endif { @@ -5970,17 +5102,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeUlPwrCfg ( RgrUeUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeUlPwrCfg(param, mBuf) -RgrUeUlPwrCfg *param; -Buffer *mBuf; -#endif { @@ -6012,17 +5138,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeUlPwrCfg ( RgrUeUlPwrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeUlPwrCfg(param, mBuf) -RgrUeUlPwrCfg *param; -Buffer *mBuf; -#endif { @@ -6054,17 +5174,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeQosCfg ( RgrUeQosCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeQosCfg(param, mBuf) -RgrUeQosCfg *param; -Buffer *mBuf; -#endif { @@ -6091,17 +5205,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeQosCfg ( RgrUeQosCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeQosCfg(param, mBuf) -RgrUeQosCfg *param; -Buffer *mBuf; -#endif { @@ -6126,17 +5234,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePuschDedCfg ( RgrUePuschDedCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePuschDedCfg(param, mBuf) -RgrUePuschDedCfg *param; -Buffer *mBuf; -#endif { @@ -6164,17 +5266,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePuschDedCfg ( RgrUePuschDedCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePuschDedCfg(param, mBuf) -RgrUePuschDedCfg *param; -Buffer *mBuf; -#endif { @@ -6200,17 +5296,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeTxAntSelCfg ( RgrUeTxAntSelCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeTxAntSelCfg(param, mBuf) -RgrUeTxAntSelCfg *param; -Buffer *mBuf; -#endif { @@ -6236,17 +5326,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeTxAntSelCfg ( RgrUeTxAntSelCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeTxAntSelCfg(param, mBuf) -RgrUeTxAntSelCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -6273,17 +5357,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeTaTmrCfg ( RgrUeTaTmrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeTaTmrCfg(param, mBuf) -RgrUeTaTmrCfg *param; -Buffer *mBuf; -#endif { @@ -6309,17 +5387,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeTaTmrCfg ( RgrUeTaTmrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeTaTmrCfg(param, mBuf) -RgrUeTaTmrCfg *param; -Buffer *mBuf; -#endif { @@ -6330,17 +5402,11 @@ Buffer *mBuf; #ifdef EMTC_ENABLE -#ifdef ANSI S16 cmUnpkRgrEmtcUeCfg ( RgrUeEmtcCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrEmtcUeCfg(param, mBuf) -RgrUeEmtcCfg *param; -Buffer *mBuf; -#endif { S32 indx=0; S32 idx=0; @@ -6572,17 +5638,11 @@ S16 cmPkRgr5gtfUeCfg * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCfg ( RgrUeCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCfg(param, mBuf) -RgrUeCfg *param; -Buffer *mBuf; -#endif { #ifdef RG_5GTF @@ -6678,17 +5738,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCfg ( RgrUeCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCfg(param, mBuf) -RgrUeCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -6784,17 +5838,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLchQosCfg ( RgrLchQosCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchQosCfg(param, mBuf) -RgrLchQosCfg *param; -Buffer *mBuf; -#endif { @@ -6821,17 +5869,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLchQosCfg ( RgrLchQosCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchQosCfg(param, mBuf) -RgrLchQosCfg *param; -Buffer *mBuf; -#endif { @@ -6858,17 +5900,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLchSpsCfg ( RgrLchSpsCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchSpsCfg(param, mBuf) -RgrLchSpsCfg *param; -Buffer *mBuf; -#endif { @@ -6894,17 +5930,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLchSpsCfg ( RgrLchSpsCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchSpsCfg(param, mBuf) -RgrLchSpsCfg *param; -Buffer *mBuf; -#endif { @@ -6929,17 +5959,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDlLchCfg ( RgrDlLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrDlLchCfg(param, mBuf) -RgrDlLchCfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_7 - Added support for SPS*/ @@ -6968,17 +5992,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDlLchCfg ( RgrDlLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDlLchCfg(param, mBuf) -RgrDlLchCfg *param; -Buffer *mBuf; -#endif { @@ -7011,17 +6029,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlLchCfg ( RgrUlLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlLchCfg(param, mBuf) -RgrUlLchCfg *param; -Buffer *mBuf; -#endif { @@ -7048,17 +6060,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlLchCfg ( RgrUlLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlLchCfg(param, mBuf) -RgrUlLchCfg *param; -Buffer *mBuf; -#endif { @@ -7085,17 +6091,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUlLcgCfg ( RgrUlLcgCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlLcgCfg(param, mBuf) -RgrUlLcgCfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ @@ -7134,17 +6134,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUlLcgCfg ( RgrUlLcgCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlLcgCfg(param, mBuf) -RgrUlLcgCfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_9 ADD added changes for L2 measurements*/ @@ -7167,34 +6161,22 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmPkRgrUlLchQciCfg ( RgrUlLchQciCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUlLchQciCfg (param, mBuf) -RgrUlLchQciCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->lcId, mBuf); CMCHKPK(oduUnpackUInt8, param->qci, mBuf); CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); return ROK; } -#ifdef ANSI S16 cmUnpkRgrUlLchQciCfg ( RgrUlLchQciCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUlLchQciCfg (param, mBuf) -RgrUlLchQciCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->qci, mBuf); @@ -7218,17 +6200,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLchCfg ( RgrLchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchCfg(param, mBuf) -RgrLchCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); @@ -7258,17 +6234,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLchCfg ( RgrLchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchCfg(param, mBuf) -RgrLchCfg *param; -Buffer *mBuf; -#endif { @@ -7283,17 +6253,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmPkRgrLcgCfg ( RgrLcgCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLcgCfg(param, mBuf) -RgrLcgCfg *param; -Buffer *mBuf; -#endif { @@ -7304,17 +6268,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkRgrLcgCfg ( RgrLcgCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLcgCfg(param, mBuf) -RgrLcgCfg *param; -Buffer *mBuf; -#endif { @@ -7341,17 +6299,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCfg ( RgrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfg(param, mBuf) -RgrCfg *param; -Buffer *mBuf; -#endif { @@ -7395,17 +6347,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCfg ( RgrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfg(param, mBuf) -RgrCfg *param; -Buffer *mBuf; -#endif { @@ -7449,17 +6395,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrActvTime ( RgrActvTime *param, Buffer *mBuf ) -#else -S16 cmPkRgrActvTime(param, mBuf) -RgrActvTime *param; -Buffer *mBuf; -#endif { @@ -7485,17 +6425,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrActvTime ( RgrActvTime *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrActvTime(param, mBuf) -RgrActvTime *param; -Buffer *mBuf; -#endif { @@ -7521,17 +6455,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellRecfg ( RgrCellRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellRecfg(param, mBuf) -RgrCellRecfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrCellCntrlCmdCfg, ¶m->cntrlCmdCfg, mBuf); @@ -7579,17 +6507,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellRecfg ( RgrCellRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellRecfg(param, mBuf) -RgrCellRecfg *param; -Buffer *mBuf; -#endif { @@ -7639,17 +6561,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeRecfg ( RgrUeRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeRecfg(param, mBuf) -RgrUeRecfg *param; -Buffer *mBuf; -#endif { #ifdef EMTC_ENABLE @@ -7759,17 +6675,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeRecfg ( RgrUeRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeRecfg(param, mBuf) -RgrUeRecfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -7879,17 +6789,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLchRecfg ( RgrLchRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLchRecfg(param, mBuf) -RgrLchRecfg *param; -Buffer *mBuf; -#endif { /*rgr_c_001.main_7 - Added support for SPS*/ @@ -7922,17 +6826,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLchRecfg ( RgrLchRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLchRecfg(param, mBuf) -RgrLchRecfg *param; -Buffer *mBuf; -#endif { @@ -7949,17 +6847,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmPkRgrLcgRecfg ( RgrLcgRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrLcgRecfg(param, mBuf) -RgrLcgRecfg *param; -Buffer *mBuf; -#endif { #ifdef RG_UNUSED S32 i; @@ -7981,17 +6873,11 @@ Buffer *mBuf; } -#ifdef ANSI S16 cmUnpkRgrLcgRecfg ( RgrLcgRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLcgRecfg(param, mBuf) -RgrLcgRecfg *param; -Buffer *mBuf; -#endif { #ifdef RG_UNUSED S32 i; @@ -8031,17 +6917,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrRecfg ( RgrRecfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrRecfg(param, mBuf) -RgrRecfg *param; -Buffer *mBuf; -#endif { @@ -8082,17 +6962,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrRecfg ( RgrRecfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRecfg(param, mBuf) -RgrRecfg *param; -Buffer *mBuf; -#endif { @@ -8132,17 +7006,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeDlSecCellRelInfo ( RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) -#else -static S16 cmPkRgrUeDlSecCellRelInfo(param, mBuf) -RgrUeDlSecCellRelInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt16, param->sCellId, mBuf); CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); @@ -8164,17 +7032,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSecCellRelInfo ( RgrUeSecCellRelInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSecCellRelInfo(param, mBuf) -RgrUeSecCellRelInfo *param; -Buffer *mBuf; -#endif { S8 idx; for(idx = param->numSCells - 1; idx >= 0; idx--) @@ -8203,17 +7065,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrDel ( RgrDel *param, Buffer *mBuf ) -#else -S16 cmPkRgrDel(param, mBuf) -RgrDel *param; -Buffer *mBuf; -#endif { @@ -8269,17 +7125,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeDlSecCellRelInfo ( RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) -#else -static S16 cmUnpkRgrUeDlSecCellRelInfo(param, mBuf) -RgrUeDlSecCellRelInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); @@ -8302,17 +7152,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSecCellRelInfo ( RgrUeSecCellRelInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSecCellRelInfo(param, mBuf) -RgrUeSecCellRelInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -8341,17 +7185,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrDel ( RgrDel *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrDel(param, mBuf) -RgrDel *param; -Buffer *mBuf; -#endif { @@ -8403,17 +7241,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSonPrbCfg ( RgrPrbCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSonPrbCfg(param, mBuf) -RgrPrbCfg *param; -Buffer *mBuf; -#endif { S32 count; for(count = RGR_SCH_MAX_PA_PER_PRB - 1; count >= 0; count --) @@ -8449,17 +7281,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSonPrbCfg ( RgrPrbCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSonPrbCfg(param, mBuf) -RgrPrbCfg *param; -Buffer *mBuf; -#endif { S32 count; CMCHKUNPK(oduPackUInt8, ¶m->isSonIcicEnable, mBuf); @@ -8494,17 +7320,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSonCfg ( RgrSonCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrSonCfg(param, mBuf) -RgrSonCfg *param; -Buffer *mBuf; -#endif { switch(param->cfgType) @@ -8534,17 +7354,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSonCfg ( RgrSonCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSonCfg(param, mBuf) -RgrSonCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt32, (uint32_t *)¶m->cfgType, mBuf); @@ -8577,17 +7391,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrRst ( RgrRst *param, Buffer *mBuf ) -#else -S16 cmPkRgrRst(param, mBuf) -RgrRst *param; -Buffer *mBuf; -#endif { @@ -8613,17 +7421,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrRst ( RgrRst *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrRst(param, mBuf) -RgrRst *param; -Buffer *mBuf; -#endif { @@ -8647,17 +7449,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmUnPkRgrSCellActDeactInfo ( RgrSCellActDeactInfo *param, Buffer *mBuf ) -#else -static S16 cmUnPkRgrSCellActInfo(param, mBuf) -RgrSCellActDeactInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); @@ -8679,17 +7475,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnPkRgrSCellActDeactEvnt ( RgrSCellActDeactEvnt *param, Buffer *mBuf ) -#else -S16 cmUnPkRgrSCellActDeactEvnt(param, mBuf) -RgrSCellActDeactEvnt *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -8721,17 +7511,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmPkRgrSCellActDeactInfo ( RgrSCellActDeactInfo *param, Buffer *mBuf ) -#else -static S16 cmPkRgrSCellActDeactInfo(param, mBuf) -RgrSCellActDeactInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->sCellIdx, mBuf); @@ -8754,17 +7538,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSCellActDeactEvnt ( RgrSCellActDeactEvnt *param, Buffer *mBuf ) -#else -S16 cmPkRgrSCellActDeactEvnt(param, mBuf) -RgrSCellActDeactEvnt *param; -Buffer *mBuf; -#endif { @@ -8798,17 +7576,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCfgReqInfo ( RgrCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrCfgReqInfo(param, mBuf) -RgrCfgReqInfo *param; -Buffer *mBuf; -#endif { @@ -8859,17 +7631,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCfgReqInfo ( RgrCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCfgReqInfo(param, mBuf) -RgrCfgReqInfo *param; -Buffer *mBuf; -#endif { @@ -8920,17 +7686,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeBsrTmrCfg ( RgrUeBsrTmrCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeBsrTmrCfg(param, mBuf) -RgrUeBsrTmrCfg *param; -Buffer *mBuf; -#endif { @@ -8955,17 +7715,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeBsrTmrCfg ( RgrUeBsrTmrCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeBsrTmrCfg(param, mBuf) -RgrUeBsrTmrCfg *param; -Buffer *mBuf; -#endif { @@ -8993,7 +7747,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSiCfgReq ( Pst* pst, @@ -9001,13 +7754,6 @@ SpId spId, RgrCfgTransId transId, RgrSiCfgReqInfo * cfgReqInfo ) -#else -S16 cmPkRgrSiCfgReq(pst, spId, transId, cfgReqInfo) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrSiCfgReqInfo * cfgReqInfo; -#endif { Buffer *mBuf = NULLP; @@ -9087,19 +7833,12 @@ RgrSiCfgReqInfo * cfgReqInfo; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSiCfgReq ( RgrSiCfgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfgReq(func, pst, mBuf) -RgrSiCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; RgrCfgTransId transId; @@ -9167,17 +7906,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSiCfgReqInfo ( RgrSiCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrSiCfgReqInfo(param, mBuf) -RgrSiCfgReqInfo *param; -Buffer *mBuf; -#endif { /* ccpu00111328: S16 is renamed as MsgLen */ MsgLen msgLen; @@ -9220,17 +7953,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSiCfgReqInfo ( RgrSiCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSiCfgReqInfo(param, mBuf) -RgrSiCfgReqInfo *param; -Buffer *mBuf; -#endif { MsgLen msgLen, totalMsgLen; /*Merge from Mohit Changes*/ @@ -9283,7 +8010,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrWarningSiCfgReq ( Pst* pst, @@ -9291,13 +8017,6 @@ SpId spId, RgrCfgTransId transId, RgrWarningSiCfgReqInfo * warningSiCfgReqInfo ) -#else -S16 cmPkRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; -#endif { Buffer *mBuf = NULLP; @@ -9388,19 +8107,12 @@ RgrWarningSiCfgReqInfo * warningSiCfgReqInfo; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrWarningSiCfgReq ( RgrWarningSiCfgReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgReq(func, pst, mBuf) -RgrWarningSiCfgReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; RgrCfgTransId transId; @@ -9479,19 +8191,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrWarningSiCfgReqInfo ( Pst *pst, RgrWarningSiCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrWarningSiCfgReqInfo(pst, param, mBuf) -Pst *pst; -RgrWarningSiCfgReqInfo *param; -Buffer *mBuf; -#endif { MsgLen msgLen; uint32_t count; @@ -9545,19 +8250,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrWarningSiCfgReqInfo ( Pst *pst, RgrWarningSiCfgReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgReqInfo(pst, param, mBuf) -Pst *pst; -RgrWarningSiCfgReqInfo *param; -Buffer *mBuf; -#endif { MsgLen msgLen, totalMsgLen; uint32_t count, loopCnt; @@ -9617,7 +8315,6 @@ Buffer *mBuf; * * File : **********************************************************/ -#ifdef ANSI S16 cmPkRgrWarningSiStopReq ( Pst *pst, @@ -9625,13 +8322,6 @@ SpId spId, RgrCfgTransId transId, uint8_t siId ) -#else -S16 cmPkRgrWarningSiStopReq(pst,spId, transId, siId) -Pst *pst; -SpId spId; -RgrCfgTransId transId; -uint8_t siId; -#endif { Buffer *mBuf = NULLP; @@ -9689,19 +8379,12 @@ uint8_t siId; * * File : **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrWarningSiStopReq ( RgrWarningSiStopReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiStopReq(param, mBuf) -RgrWarningSiStopReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; uint8_t siId; @@ -9753,7 +8436,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrWarningSiCfgCfm ( Pst* pst, @@ -9762,14 +8444,6 @@ RgrCfgTransId transId, uint8_t siId, uint8_t status ) -#else -S16 cmPkRgrWarningSiCfgCfm(pst, suId, transId, siId, status) -Pst* pst; -SuId suId; -RgrCfgTransId transId; -uint8_t siId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -9848,19 +8522,12 @@ uint8_t status; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrWarningSiCfgCfm ( RgrWarningSiCfgCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrWarningSiCfgCfm(func, pst, mBuf) -RgrWarningSiCfgCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; uint8_t siId; @@ -9933,7 +8600,6 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLoadInfReq ( Pst* pst, @@ -9941,13 +8607,6 @@ SpId spId, RgrCfgTransId transId, RgrLoadInfReqInfo * loadInfReq ) -#else -S16 cmPkRgrLoadInfReq(pst, spId, transId, loadInfReq) -Pst* pst; -SpId spId; -RgrCfgTransId transId; -RgrLoadInfReqInfo * loadInfReq; -#endif { Buffer *mBuf = NULLP; @@ -10027,19 +8686,12 @@ RgrLoadInfReqInfo * loadInfReq; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLoadInfReq ( RgrLoadInfReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfReq(func, pst, mBuf) -RgrLoadInfReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; RgrCfgTransId transId; @@ -10111,17 +8763,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLoadInfReqInfo ( RgrLoadInfReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrLoadInfReqInfo(param, mBuf) -RgrLoadInfReqInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -10146,17 +8792,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLoadInfReqInfo ( RgrLoadInfReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfReqInfo(param, mBuf) -RgrLoadInfReqInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->rgrCcPHighEndRb, mBuf); @@ -10186,17 +8826,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiReptCfg ( RgrUeCqiReptCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiReptCfg(param, mBuf) -RgrUeCqiReptCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->numColltdCqiRept, mBuf); @@ -10221,17 +8855,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiReptCfg ( RgrUeCqiReptCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiReptCfg(param, mBuf) -RgrUeCqiReptCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->numColltdCqiRept, mBuf); @@ -10256,19 +8884,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrStaInd ( Pst* pst, SuId suId, RgrStaIndInfo* staInd ) -#else -S16 cmPkRgrStaInd(pst, suId, staInd) -Pst* pst; -SuId suId; -RgrStaIndInfo* staInd; -#endif { Buffer *mBuf = NULLP; @@ -10340,19 +8961,12 @@ RgrStaIndInfo* staInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrStaInd ( RgrStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrStaInd(func, pst, mBuf) -RgrStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrStaIndInfo *staInd; @@ -10413,17 +9027,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrStaIndInfo ( RgrStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrStaIndInfo(param, mBuf) -RgrStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -10448,17 +9056,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrStaIndInfo ( RgrStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrStaIndInfo(param, mBuf) -RgrStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -10483,17 +9085,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiInfo ( RgrUeCqiInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiInfo(param, mBuf) -RgrUeCqiInfo *param; -Buffer *mBuf; -#endif { S16 idx; @@ -10522,17 +9118,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiInfo ( RgrUeCqiInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiInfo(param, mBuf) -RgrUeCqiInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -10560,17 +9150,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrSubBandCqiInfo ( RgrSubBandCqiInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrSubBandCqiInfo(param, mBuf) -RgrSubBandCqiInfo *param; -Buffer *mBuf; -#endif { @@ -10596,17 +9180,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeCqiRept ( RgrUeCqiRept *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeCqiRept(param, mBuf) -RgrUeCqiRept *param; -Buffer *mBuf; -#endif { S8 idx; uint8_t count; @@ -10638,17 +9216,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrSubBandCqiInfo ( RgrSubBandCqiInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrSubBandCqiInfo(param, mBuf) -RgrSubBandCqiInfo *param; -Buffer *mBuf; -#endif { @@ -10674,17 +9246,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeCqiRept ( RgrUeCqiRept *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeCqiRept(param, mBuf) -RgrUeCqiRept *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -10717,19 +9283,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLoadInfInd ( Pst* pst, SuId suId, RgrLoadInfIndInfo* loadInfInd ) -#else -S16 cmPkRgrLoadInfInd(pst, suId, loadInfInd) -Pst* pst; -SuId suId; -RgrLoadInfIndInfo* loadInfInd; -#endif { Buffer *mBuf = NULLP; @@ -10802,19 +9361,12 @@ RgrLoadInfIndInfo* loadInfInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLoadInfInd ( RgrLoadInfInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfInd(func, pst, mBuf) -RgrLoadInfInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrLoadInfIndInfo *loadInfInd = NULLP; /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ @@ -10876,17 +9428,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrLoadInfIndInfo ( RgrLoadInfIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrLoadInfIndInfo(param, mBuf) -RgrLoadInfIndInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -10923,19 +9469,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrLoadInfIndInfo ( RgrLoadInfIndInfo *param, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrLoadInfIndInfo(param, pst, mBuf) -RgrLoadInfIndInfo *param; -Pst *pst; -Buffer *mBuf; -#endif { S8 idx; @@ -11010,17 +9549,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUepACfg ( RgrUepACfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUepACfg(param, mBuf) -RgrUepACfg *param; -Buffer *mBuf; -#endif { if(param->pAPrsnt) @@ -11049,17 +9582,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUepACfg ( RgrUepACfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUepACfg(param, mBuf) -RgrUepACfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; @@ -11089,17 +9616,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUePdschDedCfg ( RgrUePdschDedCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUePdschDedCfg(param, mBuf) -RgrUePdschDedCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11124,17 +9645,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUePdschDedCfg ( RgrUePdschDedCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUePdschDedCfg(param, mBuf) -RgrUePdschDedCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkRgrUepACfg, ¶m->uepACfg, mBuf); @@ -11161,17 +9676,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmPkRgrUeUlPwrDedSCellCfg ( RgrUeUlPwrDedSCellCfg *param, Buffer *mBuf ) -#else -static S16 cmPkRgrUeUlPwrDedSCellCfg(param, mBuf) -RgrUeUlPwrDedSCellCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt8, param->pSRSOffset, mBuf); CMCHKPK(SPkS8, param->p0UePusch, mBuf); @@ -11196,17 +9705,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmUnpkRgrUeUlPwrDedSCellCfg ( RgrUeUlPwrDedSCellCfg *param, Buffer *mBuf ) -#else -static S16 cmUnpkRgrUeUlPwrDedSCellCfg(param, mBuf) -RgrUeUlPwrDedSCellCfg *param; -Buffer *mBuf; -#endif { @@ -11235,17 +9738,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmPkRgrUeSecCellCfg ( RgrUeSecCellCfg *param, Buffer *mBuf ) -#else -static S16 cmPkRgrUeSecCellCfg(param, mBuf) -RgrUeSecCellCfg *param; -Buffer *mBuf; -#endif { CMCHKPK(cmPkRgrUeUlPwrDedSCellCfg,¶m->ueSCellUlDedPwrCfg, mBuf); CMCHKPK(oduUnpackUInt8, param->isUlCaEnabled, mBuf); @@ -11279,17 +9776,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSecCellInfo ( RgrUeSecCellInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSecCellInfo(param, mBuf) -RgrUeSecCellInfo *param; -Buffer *mBuf; -#endif { S8 idx; for(idx = param->numSCells - 1; idx >= 0; idx--) @@ -11320,17 +9811,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI static S16 cmUnpkRgrUeSecCellCfg ( RgrUeSecCellCfg *param, Buffer *mBuf ) -#else -static S16 cmUnpkRgrUeSecCellCfg(param, mBuf) -RgrUeSecCellCfg *param; -Buffer *mBuf; -#endif { CMCHKUNPK(oduPackUInt8, ¶m->sCellIdx, mBuf); CMCHKUNPK(oduPackUInt16, ¶m->sCellId, mBuf); @@ -11364,17 +9849,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSecCellInfo ( RgrUeSecCellInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSecCellInfo(param, mBuf) -RgrUeSecCellInfo *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -11404,17 +9883,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeSCellAckPucchCfg ( RgrUeSCellAckPucchCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeSCellAckPucchCfg(param, mBuf) -RgrUeSCellAckPucchCfg *param; -Buffer *mBuf; -#endif { S8 idx; @@ -11470,17 +9943,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeSCellAckPucchCfg ( RgrUeSCellAckPucchCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeSCellAckPucchCfg(param, mBuf) -RgrUeSCellAckPucchCfg *param; -Buffer *mBuf; -#endif { uint8_t idx; @@ -11544,19 +10011,12 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeStaInd ( Pst* pst, SuId suId, RgrUeStaIndInfo* ueStaInd ) -#else -S16 cmPkRgrUeStaInd(pst, suId, ueStaInd) -Pst* pst; -SuId suId; -RgrUeStaIndInfo* ueStaInd; -#endif { Buffer *mBuf = NULLP; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) @@ -11628,19 +10088,12 @@ RgrUeStaIndInfo* ueStaInd; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeStaInd ( RgrUeStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeStaInd(func, pst, mBuf) -RgrUeStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RgrUeStaIndInfo *ueStaInd; @@ -11700,17 +10153,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrUeStaIndInfo ( RgrUeStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRgrUeStaIndInfo(param, mBuf) -RgrUeStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -11734,17 +10181,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrUeStaIndInfo ( RgrUeStaIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrUeStaIndInfo(param, mBuf) -RgrUeStaIndInfo *param; -Buffer *mBuf; -#endif { @@ -11771,17 +10212,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCsgParamCfg ( RgrCellCsgParamCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCsgParamCfg(param, mBuf) -RgrCellCsgParamCfg *param; -Buffer *mBuf; -#endif { @@ -11805,17 +10240,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCsgParamCfg ( RgrCellCsgParamCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCsgParamCfg(param, mBuf) -RgrCellCsgParamCfg *param; -Buffer *mBuf; -#endif { @@ -11839,17 +10268,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRgrCellCntrlCmdCfg ( RgrCellCntrlCmdCfg *param, Buffer *mBuf ) -#else -S16 cmPkRgrCellCntrlCmdCfg(param, mBuf) -RgrCellCntrlCmdCfg *param; -Buffer *mBuf; -#endif { switch(param->cmdType) @@ -11882,17 +10305,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRgrCellCntrlCmdCfg ( RgrCellCntrlCmdCfg *param, Buffer *mBuf ) -#else -S16 cmUnpkRgrCellCntrlCmdCfg(param, mBuf) -RgrCellCntrlCmdCfg *param; -Buffer *mBuf; -#endif { uint32_t tmpEnum; diff --git a/src/cm/rgu.c b/src/cm/rgu.c index f9bfe692d..604f955a9 100755 --- a/src/cm/rgu.c +++ b/src/cm/rgu.c @@ -62,19 +62,12 @@ * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRguBndReq ( Pst* pst, SuId suId, SpId spId ) -#else -S16 cmPkRguBndReq(pst, suId, spId) -Pst* pst; -SuId suId; -SpId spId; -#endif { Buffer *mBuf = NULLP; @@ -122,23 +115,15 @@ SpId spId; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRguBndReq ( RguBndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRguBndReq(func, pst, mBuf) -RguBndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; SpId spId; - if (SUnpkS16(&suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -176,19 +161,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRguUbndReq ( Pst* pst, SpId spId, Reason reason ) -#else -S16 cmPkRguUbndReq(pst, spId, reason) -Pst* pst; -SpId spId; -Reason reason; -#endif { Buffer *mBuf = NULLP; @@ -236,19 +214,12 @@ Reason reason; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRguUbndReq ( RguUbndReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRguUbndReq(func, pst, mBuf) -RguUbndReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; Reason reason; @@ -291,19 +262,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRguBndCfm ( Pst* pst, SuId suId, uint8_t status ) -#else -S16 cmPkRguBndCfm(pst, suId, status) -Pst* pst; -SuId suId; -uint8_t status; -#endif { Buffer *mBuf = NULLP; @@ -352,23 +316,15 @@ uint8_t status; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRguBndCfm ( RguBndCfm func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRguBndCfm(func, pst, mBuf) -RguBndCfm func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; uint8_t status; - if (SUnpkS16(&suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -411,17 +367,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguL2MUlThrpMeasReqInfo ( RguL2MUlThrpMeasReqInfo* param, Buffer *mBuf ) -#else -S16 cmPkRguL2MUlThrpMeasReqInfo(param, mBuf) -RguL2MUlThrpMeasReqInfo* param; -Buffer *mBuf; -#endif { S32 loop; @@ -454,17 +404,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguL2MUlThrpMeasReqInfo ( RguL2MUlThrpMeasReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRguL2MUlThrpMeasReqInfo(param, mBuf) -RguL2MUlThrpMeasReqInfo *param; -Buffer *mBuf; -#endif { uint8_t loop; @@ -494,19 +438,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRguL2MUlThrpMeasReq ( Pst* pst, SpId spId, RguL2MUlThrpMeasReqInfo* measReq ) -#else -S16 cmPkRguL2MUlThrpMeasReq(pst, spId, measReq) -Pst* pst; -SpId spId; -RguL2MUlThrpMeasReqInfo* measReq; -#endif { Buffer *mBuf = NULLP; @@ -584,19 +521,12 @@ RguL2MUlThrpMeasReqInfo* measReq; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRguL2MUlThrpMeasReq ( RguL2MUlThrpMeasReq func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRguL2MUlThrpMeasReq(func, pst, mBuf) -RguL2MUlThrpMeasReq func; -Pst *pst; -Buffer *mBuf; -#endif { SpId spId; RguL2MUlThrpMeasReqInfo* measReq; @@ -662,23 +592,16 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRguHqStaInd ( Pst* pst, SuId suId, RguHarqStatusInd *harqStatusInd ) -#else -S16 cmPkRguHqStaInd(pst, suId, harqStatusInd) -Pst* pst; -SuId suId; -RguHarqStatusInd *harqStatusInd; -#endif { Buffer *mBuf; - uint8_t idx; + uint8_t idx; RguHarqStatusInd *harqStaInd = NULL; #ifdef XEON_SPECIFIC_CHANGES @@ -785,24 +708,16 @@ RguHarqStatusInd *harqStatusInd; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRguHqStaInd ( RguHqStaInd func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRguHqStaInd(func, pst, mBuf) -RguHqStaInd func; -Pst *pst; -Buffer *mBuf; -#endif { RguHarqStatusInd *hqStaInd; - SuId suId; - uint8_t idx; - + SuId suId; + uint8_t idx; if (SUnpkS16(&suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -860,17 +775,11 @@ Buffer *mBuf; } #endif /* LTE_L2_MEAS */ -#ifdef ANSI S16 cmPkRguLcFlowCntrlInfo ( RguLcFlowCntrlInfo *param, Buffer *mBuf ) -#else -S16 cmPkRguLcFlowCntrlInfo (param,mBuf) -RguLcFlowCntrlInfo *param; -Buffer *mBuf; -#endif { CMCHKPK(oduUnpackUInt32, param->maxBo4FlowCtrl, mBuf); CMCHKPK(oduUnpackUInt32, param->pktAdmitCnt, mBuf); @@ -879,17 +788,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmPkRguUeFlowCntrlInfo ( RguUeFlowCntrlInfo *param, Buffer *mBuf ) -#else -S16 cmPkRguUeFlowCntrlInfo (param,mBuf) -RguUeFlowCntrlInfo *param; -Buffer *mBuf; -#endif { uint32_t idx; @@ -903,21 +806,14 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmPkRguFlowCntrlInfo ( RguFlowCntrlInd *param, Buffer *mBuf ) -#else -S16 cmPkRguFlowCntrlInfo(flowCntrlInd, mBuf) -RguFlowCntrlInd *param; -Buffer *mBuf; -#endif { uint32_t idx; - for (idx=(param->numUes - 1); idx >= 0; idx--) { cmPkRguUeFlowCntrlInfo(¶m->ueFlowCntrlInfo[idx],mBuf); @@ -942,19 +838,12 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmPkRguFlowCntrlInd ( Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd ) -#else -S16 cmPkRguFlowCntrlInd(pst, suId, flowCntrlInd) -Pst* pst; -SuId suId; -RguFlowCntrlInd *flowCntrlInd; -#endif { Buffer *mBuf = NULLP; @@ -996,17 +885,11 @@ RguFlowCntrlInd *flowCntrlInd; return (SPstTsk(pst,mBuf)); } -#ifdef ANSI S16 cmUnpkRguLcFlowCntrlInfo ( RguLcFlowCntrlInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRguLcFlowCntrlInfo (param,mBuf) -RguLcFlowCntrlInfo *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); @@ -1015,17 +898,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkRguUeFlowCntrlInfo ( RguUeFlowCntrlInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRguUeFlowCntrlInfo (param,mBuf) -RguUeFlowCntrlInfo *param; -Buffer *mBuf; -#endif { uint32_t idx; CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); @@ -1037,17 +914,11 @@ Buffer *mBuf; return ROK; } -#ifdef ANSI S16 cmUnpkRguFlowCntrlInfo ( RguFlowCntrlInd *param, Buffer *mBuf ) -#else -S16 cmUnpkRguFlowCntrlInfo(flowCntrlInfo, mBuf) -RguFlowCntrlInd *param; -Buffer *mBuf; -#endif { uint32_t idx; @@ -1076,23 +947,15 @@ Buffer *mBuf; * @return S16 * -# ROK **/ -#ifdef ANSI S16 cmUnpkRguFlowCntrlInd ( RguFlowCntrlIndInfo func, Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkRguFlowCntrlInd(func, pst, mBuf) -RguFlowCntrlIndInfo func; -Pst *pst; -Buffer *mBuf; -#endif { SuId suId; RguFlowCntrlInd *flowCntrlInd; - if (SUnpkS16(&suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -1149,21 +1012,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguPduInfo ( RguPduInfo *param, Buffer *mBuf ) -#else -S16 cmPkRguPduInfo(param, mBuf) -RguPduInfo *param; -Buffer *mBuf; -#endif { S32 i; - for (i=param->numPdu-1; i >= 0; i--) { /* rgu_c_001.main_3: ccpu00111328: S16 is renamed as MsgLen */ MsgLen msgLen = 0; @@ -1196,17 +1052,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguPduInfo ( RguPduInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRguPduInfo(param, mBuf) -RguPduInfo *param; -Buffer *mBuf; -#endif { S32 i; @@ -1241,20 +1091,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguDBoReport ( RguDBoReport *param, Buffer *mBuf ) -#else -S16 cmPkRguDBoReport(param, mBuf) -RguDBoReport *param; -Buffer *mBuf; -#endif { - CMCHKPK(oduUnpackUInt32, param->oldestSduArrTime, mBuf); CMCHKPK(oduUnpackUInt32, param->staPduBo, mBuf); #ifdef CCPU_OPT @@ -1283,17 +1126,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguDBoReport ( RguDBoReport *param, Buffer *mBuf ) -#else -S16 cmUnpkRguDBoReport(param, mBuf) -RguDBoReport *param; -Buffer *mBuf; -#endif { @@ -1325,21 +1162,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguCDatReqInfo ( RguCDatReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkRguCDatReqInfo(param, mBuf) -RguCDatReqInfo *param; -Buffer *mBuf; -#endif { MsgLen msgLen; - if (param->pdu != NULLP) { if (SFndLenMsg(param->pdu, &msgLen) != ROK) @@ -1388,17 +1218,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguCDatReqInfo ( RguCDatReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRguCDatReqInfo(param, mBuf) -RguCDatReqInfo *param; -Buffer *mBuf; -#endif { MsgLen msgLen, totalMsgLen; @@ -1451,20 +1275,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguLchDatReq ( RguLchDatReq *param, Buffer *mBuf ) -#else -S16 cmPkRguLchDatReq(param, mBuf) -RguLchDatReq *param; -Buffer *mBuf; -#endif { - #ifdef L2_OPTMZ CMCHKPK(oduUnpackUInt8, param->freeBuff, mBuf); #endif @@ -1493,20 +1310,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguLchDatReq ( RguLchDatReq *param, Buffer *mBuf ) -#else -S16 cmUnpkRguLchDatReq(param, mBuf) -RguLchDatReq *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(cmUnpkRguDBoReport, ¶m->boReport, mBuf); CMCHKUNPK(cmUnpkRguPduInfo, ¶m->pdu, mBuf); @@ -1534,17 +1344,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguDatReqTb ( RguDatReqTb *param, Buffer *mBuf ) -#else -S16 cmPkRguDatReqTb(param, mBuf) -RguDatReqTb *param; -Buffer *mBuf; -#endif { S32 i; @@ -1578,7 +1382,6 @@ Buffer *mBuf; * **********************************************************/ #ifdef LTE_L2_MEAS -#ifdef ANSI S16 cmUnpkRguDatReqTb ( Pst *pst, @@ -1586,23 +1389,11 @@ RguDatReqTb *param, Buffer *mBuf ) #else -S16 cmUnpkRguDatReqTb(pst, param, mBuf) -Pst *pst; -RguDatReqTb *param; -Buffer *mBuf; -#endif -#else -#ifdef ANSI S16 cmUnpkRguDatReqTb ( RguDatReqTb *param, Buffer *mBuf ) -#else -S16 cmUnpkRguDatReqTb(param, mBuf) -RguDatReqTb *param; -Buffer *mBuf; -#endif #endif { S32 i; @@ -1638,7 +1429,6 @@ Buffer *mBuf; **********************************************************/ /*rgu_c_001.main_5 - ADD - L2M Support */ #ifdef LTE_L2_MEAS -#ifdef ANSI S16 cmPkRguDDatReqInfo ( Pst *pst, @@ -1646,23 +1436,11 @@ RguDDatReqInfo *param, Buffer *mBuf ) #else -S16 cmPkRguDDatReqInfo(pst, param, mBuf) -Pst *pst; -RguDDatReqInfo *param; -Buffer *mBuf; -#endif -#else -#ifdef ANSI S16 cmPkRguDDatReqInfo ( RguDDatReqInfo *param, Buffer *mBuf ) -#else -S16 cmPkRguDDatReqInfo(param, mBuf) -RguDDatReqInfo *param; -Buffer *mBuf; -#endif #endif { S32 i; @@ -1704,7 +1482,6 @@ Buffer *mBuf; * **********************************************************/ #ifdef LTE_L2_MEAS -#ifdef ANSI S16 cmUnpkRguDDatReqInfo ( Pst *pst, @@ -1712,23 +1489,11 @@ RguDDatReqInfo *param, Buffer *mBuf ) #else -S16 cmUnpkRguDDatReqInfo(pst, param, mBuf) -Pst *pst; -RguDDatReqInfo *param; -Buffer *mBuf; -#endif -#else -#ifdef ANSI S16 cmUnpkRguDDatReqInfo ( RguDDatReqInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRguDDatReqInfo(param, mBuf) -RguDDatReqInfo *param; -Buffer *mBuf; -#endif #endif { S32 i; @@ -1790,21 +1555,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguCDatIndInfo ( RguCDatIndInfo *param, Buffer *mBuf ) -#else -S16 cmPkRguCDatIndInfo(param, mBuf) -RguCDatIndInfo *param; -Buffer *mBuf; -#endif { MsgLen msgLen; - if (SFndLenMsg(param->pdu, &msgLen) != ROK) return RFAILED; if (SCatMsg(mBuf, param->pdu, M1M2) != ROK) @@ -1835,17 +1593,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguCDatIndInfo ( RguCDatIndInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRguCDatIndInfo(param, mBuf) -RguCDatIndInfo *param; -Buffer *mBuf; -#endif { MsgLen msgLen, totalMsgLen; @@ -1879,20 +1631,14 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguLchDatInd ( RguLchDatInd *param, Buffer *mBuf ) -#else -S16 cmPkRguLchDatInd(param, mBuf) -RguLchDatInd *param; -Buffer *mBuf; -#endif { - CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf); + CMCHKPK(cmPkRguPduInfo, ¶m->pdu, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); return ROK; } @@ -1915,17 +1661,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguLchDatInd ( RguLchDatInd *param, Buffer *mBuf ) -#else -S16 cmUnpkRguLchDatInd(param, mBuf) -RguLchDatInd *param; -Buffer *mBuf; -#endif { CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); @@ -1950,17 +1690,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguCStaRspInfo ( RguCStaRspInfo *param, Buffer *mBuf ) -#else -S16 cmPkRguCStaRspInfo(param, mBuf) -RguCStaRspInfo *param; -Buffer *mBuf; -#endif { @@ -2004,17 +1738,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguCStaRspInfo ( RguCStaRspInfo *param, Buffer *mBuf ) -#else -S16 cmUnpkRguCStaRspInfo(param, mBuf) -RguCStaRspInfo *param; -Buffer *mBuf; -#endif { @@ -2057,17 +1785,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguLchStaInd ( RguLchStaInd *param, Buffer *mBuf ) -#else -S16 cmPkRguLchStaInd(param, mBuf) -RguLchStaInd *param; -Buffer *mBuf; -#endif { @@ -2094,20 +1816,13 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguLchStaInd ( RguLchStaInd *param, Buffer *mBuf ) -#else -S16 cmUnpkRguLchStaInd(param, mBuf) -RguLchStaInd *param; -Buffer *mBuf; -#endif { - CMCHKUNPK(cmUnpkLteLcId, ¶m->lcId, mBuf); CMCHKUNPK(SUnpkS16, ¶m->totBufSize, mBuf); return ROK; @@ -2130,17 +1845,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmPkRguStaIndTb ( RguStaIndTb *param, Buffer *mBuf ) -#else -S16 cmPkRguStaIndTb(param, mBuf) -RguStaIndTb *param; -Buffer *mBuf; -#endif { S32 i; @@ -2174,17 +1883,11 @@ Buffer *mBuf; * File : * **********************************************************/ -#ifdef ANSI S16 cmUnpkRguStaIndTb ( RguStaIndTb *param, Buffer *mBuf ) -#else -S16 cmUnpkRguStaIndTb(param, mBuf) -RguStaIndTb *param; -Buffer *mBuf; -#endif { S32 i; -- 2.16.6