X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Ftfu.c;h=99c4792ef8ed9b1e4d79ca06945d641a7680e48d;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=d24f3fd7888573533bcda44e7de0a49d728a7335;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git diff --git a/src/cm/tfu.c b/src/cm/tfu.c index d24f3fd78..99c4792ef 100755 --- a/src/cm/tfu.c +++ b/src/cm/tfu.c @@ -35,29 +35,15 @@ */ /* header include files (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general */ -#include "ssi.h" /* system services */ -#include "cm_tkns.h" /* Common Token Defines */ -#include "cm_llist.h" /* Common Link List Defines */ -#include "cm_hash.h" /* Common Hash List Defines */ -#include "cm_lte.h" /* Common LTE Defines */ -#include "cm_mblk.h" /* Common LTE Defines */ +#include "common_def.h" #include "tfu.h" /* RGU Interface defines */ /* header/extern include files (.x) */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services */ -#include "cm_tkns.x" /* Common Token Definitions */ -#include "cm_llist.x" /* Common Link List Definitions */ -#include "cm_lib.x" /* Common Library Definitions */ -#include "cm_hash.x" /* Common Hash List Definitions */ -#include "cm_lte.x" /* Common LTE Defines */ -#include "cm_mblk.x" /* Common LTE Defines */ #include "tfu.x" /* RGU Interface includes */ +#include "du_app_mac_inf.h" +//#include "mac_sch_interface.h" + #if (defined(LCTFU)) @@ -103,7 +89,7 @@ SpId spId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU001, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -112,7 +98,7 @@ SpId spId; (ErrVal)ETFU002, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -121,10 +107,10 @@ SpId spId; (ErrVal)ETFU003, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -173,7 +159,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU004, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -182,10 +168,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU005, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -231,16 +217,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU006, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU007, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -249,10 +235,10 @@ U8 status; (ErrVal)ETFU008, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -301,19 +287,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU009, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { TFU_FREE_MSG(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU010, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -359,7 +345,7 @@ Reason reason; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU011, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -368,7 +354,7 @@ Reason reason; (ErrVal)ETFU012, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -377,10 +363,10 @@ Reason reason; (ErrVal)ETFU013, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -429,7 +415,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU014, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -438,10 +424,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU015, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -487,7 +473,7 @@ SpId spId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU016, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -496,7 +482,7 @@ SpId spId; (ErrVal)ETFU017, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -505,10 +491,10 @@ SpId spId; (ErrVal)ETFU018, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUSCHBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -557,7 +543,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU019, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&spId, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -566,10 +552,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU020, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, spId)); + return ((*func)(pst, suId, spId)); } @@ -615,16 +601,16 @@ U8 status; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU021, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SPkU8(status, mBuf) != ROK) { + if (oduUnpackUInt8(status, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU022, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -633,10 +619,10 @@ U8 status; (ErrVal)ETFU023, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUSCHBNDCFM; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -685,19 +671,19 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU024, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (SUnpkU8(&status, mBuf) != ROK) { + if (oduPackUInt8(&status, mBuf) != ROK) { TFU_FREE_MSG(mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU025, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, status)); + return ((*func)(pst, suId, status)); } @@ -743,7 +729,7 @@ Reason reason; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU026, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(reason, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -752,7 +738,7 @@ Reason reason; (ErrVal)ETFU027, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(spId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -761,10 +747,10 @@ Reason reason; (ErrVal)ETFU028, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUSCHUBNDREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -813,7 +799,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU029, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SUnpkS16(&reason, mBuf) != ROK) { TFU_FREE_MSG(mBuf); @@ -822,10 +808,10 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU030, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, reason)); + return ((*func)(pst, spId, reason)); } @@ -876,9 +862,9 @@ TfuRaReqIndInfo * raReqInd; (ErrVal)ETFU031, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(raReqInd); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuRaReqIndInfo(raReqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -887,12 +873,12 @@ TfuRaReqIndInfo * raReqInd; #endif TFU_FREE_MEM(raReqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)raReqInd, mBuf) != ROK) + if (oduPackPointer((PTR)raReqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -901,7 +887,7 @@ TfuRaReqIndInfo * raReqInd; #endif TFU_FREE_MEM(raReqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -913,14 +899,14 @@ TfuRaReqIndInfo * raReqInd; #endif TFU_FREE_MEM(raReqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(raReqInd); } pst->event = (Event) EVTTFURAREQIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -973,9 +959,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU034, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -986,12 +972,12 @@ Buffer *mBuf; (ErrVal)ETFU035, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuRaReqIndInfo(raReqInd, mBuf) != ROK) { TFU_FREE_MEM(raReqInd); @@ -1001,12 +987,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU036, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&raReqInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&raReqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1015,11 +1001,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(raReqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, raReqInd)); + return ((*func)(pst, suId, raReqInd)); } @@ -1080,9 +1066,9 @@ TfuRecpReqInfo * recpReq; (ErrVal)ETFU037, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(recpReq); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuRecpReqInfo(recpReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1091,12 +1077,12 @@ TfuRecpReqInfo * recpReq; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)recpReq, mBuf) != ROK) + if (oduPackPointer((PTR)recpReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1105,7 +1091,7 @@ TfuRecpReqInfo * recpReq; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1118,14 +1104,14 @@ TfuRecpReqInfo * recpReq; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(recpReq); } pst->event = (Event) EVTTFURECPREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1188,9 +1174,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU040, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -1201,12 +1187,12 @@ Buffer *mBuf; (ErrVal)ETFU041, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&recpReq, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&recpReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1215,11 +1201,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuRecpReqInfo(recpReq, (Ptr)&recpReq->memCp, mBuf) != ROK) { TFU_FREE_MEM(recpReq); @@ -1229,12 +1215,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU042, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR*)&recpReq, mBuf) != ROK) + if (oduUnpackPointer((PTR*)&recpReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1243,12 +1229,12 @@ Buffer *mBuf; #endif TFU_FREE_MEM(recpReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, recpReq)); + return ((*func)(pst, spId, recpReq)); } @@ -1300,9 +1286,9 @@ TfuUlCqiIndInfo * ulCqiInd; (ErrVal)ETFU043, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(ulCqiInd); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuUlCqiIndInfo(ulCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1311,12 +1297,12 @@ TfuUlCqiIndInfo * ulCqiInd; #endif TFU_FREE_MEM(ulCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)ulCqiInd, mBuf) != ROK) + if (oduPackPointer((PTR)ulCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1325,7 +1311,7 @@ TfuUlCqiIndInfo * ulCqiInd; #endif TFU_FREE_MEM(ulCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1337,14 +1323,14 @@ TfuUlCqiIndInfo * ulCqiInd; #endif TFU_FREE_MEM(ulCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(ulCqiInd); } pst->event = (Event) EVTTFUULCQIIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1398,9 +1384,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU046, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -1411,12 +1397,12 @@ Buffer *mBuf; (ErrVal)ETFU047, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuUlCqiIndInfo(ulCqiInd, (Ptr)&ulCqiInd->memCp, mBuf) != ROK) { TFU_FREE_MEM(ulCqiInd); @@ -1426,12 +1412,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU048, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&ulCqiInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&ulCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1440,11 +1426,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(ulCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, ulCqiInd)); + return ((*func)(pst, suId, ulCqiInd)); } @@ -1495,9 +1481,9 @@ TfuHqIndInfo * hqInd; (ErrVal)ETFU049, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(hqInd); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuHqIndInfo(hqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1506,12 +1492,12 @@ TfuHqIndInfo * hqInd; #endif TFU_FREE_MEM(hqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)hqInd, mBuf) != ROK) + if (oduPackPointer((PTR)hqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1520,7 +1506,7 @@ TfuHqIndInfo * hqInd; #endif TFU_FREE_MEM(hqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1532,14 +1518,14 @@ TfuHqIndInfo * hqInd; #endif TFU_FREE_MEM(hqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(hqInd); } pst->event = (Event) EVTTFUHQIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1592,9 +1578,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU052, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -1605,12 +1591,12 @@ Buffer *mBuf; (ErrVal)ETFU053, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuHqIndInfo(hqInd, (Ptr)&hqInd->memCp, mBuf) != ROK) { TFU_FREE_MEM(hqInd); @@ -1620,12 +1606,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU054, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&hqInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&hqInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1634,11 +1620,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(hqInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, hqInd)); + return ((*func)(pst, spId, hqInd)); } @@ -1688,9 +1674,9 @@ TfuSrIndInfo * srInd; (ErrVal)ETFU055, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(srInd); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuSrIndInfo(srInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1699,12 +1685,12 @@ TfuSrIndInfo * srInd; #endif TFU_FREE_MEM(srInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)srInd, mBuf) != ROK) + if (oduPackPointer((PTR)srInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1713,7 +1699,7 @@ TfuSrIndInfo * srInd; #endif TFU_FREE_MEM(srInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1725,14 +1711,14 @@ TfuSrIndInfo * srInd; #endif TFU_FREE_MEM(srInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(srInd); } pst->event = (Event) EVTTFUSRIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1784,9 +1770,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU058, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -1797,12 +1783,12 @@ Buffer *mBuf; (ErrVal)ETFU059, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuSrIndInfo(srInd, (Ptr)&srInd->memCp, mBuf) != ROK) { TFU_FREE_MEM(srInd); @@ -1812,12 +1798,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU060, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&srInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&srInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1826,11 +1812,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(srInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, srInd)); + return ((*func)(pst, spId, srInd)); } @@ -1878,9 +1864,9 @@ TfuDlCqiIndInfo * dlCqiInd; (ErrVal)ETFU061, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(dlCqiInd); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuDlCqiIndInfo(dlCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1889,12 +1875,12 @@ TfuDlCqiIndInfo * dlCqiInd; #endif TFU_FREE_MEM(dlCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)dlCqiInd, mBuf) != ROK) + if (oduPackPointer((PTR)dlCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -1903,7 +1889,7 @@ TfuDlCqiIndInfo * dlCqiInd; #endif TFU_FREE_MEM(dlCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -1915,13 +1901,13 @@ TfuDlCqiIndInfo * dlCqiInd; #endif TFU_FREE_MEM(dlCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(dlCqiInd); } pst->event = (Event) EVTTFUDLCQIIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -1971,9 +1957,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU064, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -1984,12 +1970,12 @@ Buffer *mBuf; (ErrVal)ETFU065, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuDlCqiIndInfo(dlCqiInd, (Ptr)&dlCqiInd->memCp, mBuf) != ROK) { TFU_FREE_MEM(dlCqiInd); @@ -1999,12 +1985,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU066, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&dlCqiInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&dlCqiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2013,11 +1999,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(dlCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, dlCqiInd)); + return ((*func)(pst, suId, dlCqiInd)); } @@ -2072,7 +2058,7 @@ TfuRawCqiIndInfo * rawCqiInd; (ErrVal)ETFU067, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(rawCqiInd); - RETVALUE(RFAILED); + return RFAILED; } cmPkTfuRawCqiIndInfo(rawCqiInd, mBuf); if (SPkS16(suId, mBuf) != ROK) { @@ -2083,11 +2069,11 @@ TfuRawCqiIndInfo * rawCqiInd; #endif TFU_FREE_MEM(rawCqiInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MEM(rawCqiInd); pst->event = (Event) EVTTFURAWCQIIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2141,7 +2127,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU069, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } { Mem sMem; @@ -2154,12 +2140,12 @@ Buffer *mBuf; (ErrVal)ETFU070, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } cmUnpkTfuRawCqiIndInfo(rawCqiInd, (Ptr)&rawCqiInd->memCp, mBuf); TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, rawCqiInd)); + return ((*func)(pst, suId, rawCqiInd)); } @@ -2210,7 +2196,7 @@ TfuSrsIndInfo * srsInd; (ErrVal)ETFU071, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(srsInd); - RETVALUE(RFAILED); + return RFAILED; } cmPkTfuSrsIndInfo(srsInd, mBuf); if (SPkS16(suId, mBuf) != ROK) { @@ -2221,11 +2207,11 @@ TfuSrsIndInfo * srsInd; #endif TFU_FREE_MEM(srsInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MEM(srsInd); pst->event = (Event) EVTTFUSRSIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2278,7 +2264,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU073, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } { Mem sMem; @@ -2291,12 +2277,12 @@ Buffer *mBuf; (ErrVal)ETFU074, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } cmUnpkTfuSrsIndInfo(srsInd, (Ptr)&srsInd->memCp, mBuf); TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, srsInd)); + return ((*func)(pst, suId, srsInd)); } #endif @@ -2348,9 +2334,9 @@ TfuDatIndInfo * datInd; (ErrVal)ETFU075, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(datInd); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuDatIndInfo(datInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2359,12 +2345,12 @@ TfuDatIndInfo * datInd; #endif TFU_FREE_MEM(datInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if(cmPkPtr((PTR)datInd, mBuf) != ROK) + if(oduPackPointer((PTR)datInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2373,7 +2359,7 @@ TfuDatIndInfo * datInd; #endif TFU_FREE_MEM(datInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2385,14 +2371,14 @@ TfuDatIndInfo * datInd; #endif TFU_FREE_MEM(datInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(datInd); } pst->event = (Event) EVTTFUDATIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2444,9 +2430,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU078, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -2457,12 +2443,12 @@ Buffer *mBuf; (ErrVal)ETFU079, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuDatIndInfo(datInd, (Ptr)&datInd->memCp, mBuf) != ROK) { TFU_FREE_MEM(datInd); @@ -2472,12 +2458,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU080, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if(cmUnpkPtr((PTR *)&datInd, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&datInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2486,11 +2472,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(datInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, datInd)); + return ((*func)(pst, spId, datInd)); } @@ -2544,9 +2530,9 @@ TfuCrcIndInfo * crcIndInfo; (ErrVal)ETFU081, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(crcIndInfo); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuCrcIndInfo(crcIndInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2555,12 +2541,12 @@ TfuCrcIndInfo * crcIndInfo; #endif TFU_FREE_MEM(crcIndInfo); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)crcIndInfo, mBuf) != ROK) + if (oduPackPointer((PTR)crcIndInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2569,7 +2555,7 @@ TfuCrcIndInfo * crcIndInfo; #endif TFU_FREE_MEM(crcIndInfo); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2582,14 +2568,14 @@ TfuCrcIndInfo * crcIndInfo; #endif TFU_FREE_MEM(crcIndInfo); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(crcIndInfo); } pst->event = (Event) EVTTFUCRCIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2645,9 +2631,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU084, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -2658,12 +2644,12 @@ Buffer *mBuf; (ErrVal)ETFU085, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuCrcIndInfo(crcIndInfo, (Ptr)&crcIndInfo->memCp, mBuf) != ROK) { TFU_FREE_MEM(crcIndInfo); @@ -2673,12 +2659,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU086, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&crcIndInfo, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&crcIndInfo, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2687,11 +2673,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(crcIndInfo); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, crcIndInfo)); + return ((*func)(pst, suId, crcIndInfo)); } @@ -2742,9 +2728,9 @@ TfuTimingAdvIndInfo * timingAdvInd; (ErrVal)ETFU087, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(timingAdvInd); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuTimingAdvIndInfo(timingAdvInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2753,12 +2739,12 @@ TfuTimingAdvIndInfo * timingAdvInd; #endif TFU_FREE_MEM(timingAdvInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)timingAdvInd, mBuf) != ROK) + if (oduPackPointer((PTR)timingAdvInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2767,7 +2753,7 @@ TfuTimingAdvIndInfo * timingAdvInd; #endif TFU_FREE_MEM(timingAdvInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2779,14 +2765,14 @@ TfuTimingAdvIndInfo * timingAdvInd; #endif TFU_FREE_MEM(timingAdvInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(timingAdvInd); } pst->event = (Event) EVTTFUTIMINGADVIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -2839,9 +2825,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU090, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -2852,12 +2838,12 @@ Buffer *mBuf; (ErrVal)ETFU091, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuTimingAdvIndInfo(timingAdvInd, (Ptr)&timingAdvInd->memCp, mBuf) != ROK) { TFU_FREE_MEM(timingAdvInd); @@ -2867,12 +2853,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU092, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&timingAdvInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&timingAdvInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2881,11 +2867,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(timingAdvInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, timingAdvInd)); + return ((*func)(pst, suId, timingAdvInd)); } @@ -2938,9 +2924,9 @@ TfuDatReqInfo * datReq; (ErrVal)ETFU093, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(datReq); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuDatReqInfo(datReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2949,12 +2935,12 @@ TfuDatReqInfo * datReq; #endif TFU_FREE_MEM(datReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if(cmPkPtr((PTR)datReq, mBuf) != ROK) + if(oduPackPointer((PTR)datReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -2963,7 +2949,7 @@ TfuDatReqInfo * datReq; #endif TFU_FREE_MEM(datReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2975,14 +2961,14 @@ TfuDatReqInfo * datReq; #endif TFU_FREE_MEM(datReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(datReq); } pst->event = (Event) EVTTFUDATREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3037,9 +3023,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU096, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -3050,12 +3036,12 @@ Buffer *mBuf; (ErrVal)ETFU097, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuDatReqInfo(datReq, (Ptr)&datReq->memCp, mBuf) != ROK) { TFU_FREE_MEM(datReq); @@ -3065,12 +3051,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU098, (ErrVal)0, "Unpacking failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if (pst->selector == TFU_SEL_LWLC) + else if (pst->selector == ODU_SELECTOR_LWLC) { - if(cmUnpkPtr((PTR *)&datReq, mBuf) != ROK) + if(oduUnpackPointer((PTR *)&datReq, mBuf) != ROK) { TFU_FREE_MEM(datReq); TFU_FREE_MSG(mBuf); @@ -3079,11 +3065,11 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFUXXX, (ErrVal)0, "LWLC Un-Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, datReq)); + return ((*func)(pst, spId, datReq)); } @@ -3137,9 +3123,9 @@ TfuCntrlReqInfo * cntrlReq; (ErrVal)ETFU099, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MEM(cntrlReq); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuCntrlReqInfo(cntrlReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3148,12 +3134,12 @@ TfuCntrlReqInfo * cntrlReq; #endif TFU_FREE_MEM(cntrlReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)cntrlReq, mBuf) != ROK) + if (oduPackPointer((PTR)cntrlReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3162,7 +3148,7 @@ TfuCntrlReqInfo * cntrlReq; #endif TFU_FREE_MEM(cntrlReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3175,14 +3161,14 @@ TfuCntrlReqInfo * cntrlReq; #endif TFU_FREE_MEM(cntrlReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(cntrlReq); } pst->event = (Event) EVTTFUCNTRLREQ; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3238,9 +3224,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU102, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -3251,12 +3237,12 @@ Buffer *mBuf; (ErrVal)ETFU103, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuCntrlReqInfo(cntrlReq, (Ptr)&cntrlReq->memCp, mBuf) != ROK) { TFU_FREE_MEM(cntrlReq); @@ -3266,12 +3252,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU104, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&cntrlReq, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&cntrlReq, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3280,11 +3266,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(cntrlReq); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, spId, cntrlReq)); + return ((*func)(pst, spId, cntrlReq)); } @@ -3334,9 +3320,9 @@ TfuTtiIndInfo * ttiInd; (ErrVal)ETFU105, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuTtiIndInfo(ttiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3345,12 +3331,12 @@ TfuTtiIndInfo * ttiInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)ttiInd, mBuf) != ROK) + if (oduPackPointer((PTR)ttiInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3361,7 +3347,7 @@ TfuTtiIndInfo * ttiInd; /*MS_FIX:71858:Changed to SPutSBuf as being allocated with SGetSBuf*/ SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3373,9 +3359,9 @@ TfuTtiIndInfo * ttiInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if (SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3383,109 +3369,12 @@ TfuTtiIndInfo * ttiInd; (ErrVal)ETFU108, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); - } - } - - pst->event = (Event) EVTTFUTTIIND; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/*********************************************************** -* -* Func : cmUnpkTfuTtiInd -* -* -* Desc : This API is the TTI indication from PHY to MAC . - * @details This primitive provides the timing information (SFN and subframe) - * which is currently running on the physical layer. - * @param pst Pointer to the post structure. - * @param suId SAP ID of the service user. - * @param ttiInd Pointer to the TfuTtiIndInfo. - * @return ROK/RFAILED -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkTfuTtiInd -( -TfuTtiInd func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkTfuTtiInd(func, pst, mBuf) -TfuTtiInd func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SuId suId; - TfuTtiIndInfo *ttiInd; - - TRC3(cmUnpkTfuTtiInd) - - if (SUnpkS16(&suId, mBuf) != ROK) { - TFU_FREE_MSG(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU109, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (pst->selector != TFU_SEL_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&ttiInd, sizeof(TfuTtiIndInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU110, (ErrVal)0, "Packing failed"); -#endif - TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); - } - } - - if (pst->selector == TFU_SEL_LC) - { - if (cmUnpkTfuTtiIndInfo(ttiInd, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - TFU_FREE_MSG(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU111, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - } - else if(pst->selector == TFU_SEL_LWLC) - { - if (cmUnpkPtr((PTR *)&ttiInd, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFUXXX, (ErrVal)0, "LWLC un-Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - TFU_FREE_MSG(mBuf); - /* [ccpu00141698]-MOD- MAC/SCH does not free the TTI ind anymore */ - (*func)(pst, suId, ttiInd); - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - RETVALUE((*func)(pst, suId, ttiInd)); + //pst->event = (Event) EVENT_SLOT_IND_TO_MAC; + return (SPstTsk(pst,mBuf)); } #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD) @@ -3528,7 +3417,7 @@ SuId suId; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU105, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } if (SPkS16(suId, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -3537,10 +3426,10 @@ SuId suId; (ErrVal)ETFU107, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } pst->event = (Event) EVTTFUNONRTIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } /*********************************************************** @@ -3585,210 +3474,14 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU109, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId)); + return ((*func)(pst, suId)); } #endif -/*********************************************************** -* -* Func : cmPkTfuSchTtiInd -* -* -* Desc : This API is the TTI indication from PHY to scheduler. - * @details This primitive provides the timing information (SFN and subframe) - * which is currently running on the physical layer. - * @param pst Pointer to the post structure. - * @param suId SAP ID of the service user. - * @param ttiInd Pointer to the TfuTtiIndInfo. - * @return ROK/RFAILED -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmPkTfuSchTtiInd -( -Pst * pst, -SuId suId, -TfuTtiIndInfo * ttiInd -) -#else -PUBLIC S16 cmPkTfuSchTtiInd(pst, suId, ttiInd) -Pst * pst; -SuId suId; -TfuTtiIndInfo * ttiInd; -#endif -{ - Buffer *mBuf = NULLP; - TRC3(cmPkTfuSchTtiInd) - - 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, - (ErrVal)ETFU112, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - RETVALUE(RFAILED); - } - if (pst->selector == TFU_SEL_LC) { - if (cmPkTfuTtiIndInfo(ttiInd, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU113, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); - } - } - else if(pst->selector == TFU_SEL_LWLC) - { - if (cmPkPtr((PTR)ttiInd, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFUXXX, (ErrVal)0, "LWLC Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); - } - } - - if (SPkS16(suId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU114, (ErrVal)0, "Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); - } - if (pst->selector != TFU_SEL_LWLC) { - if (SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU115, (ErrVal)0, "Packing failed"); -#endif - TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); - } - } - pst->event = (Event) EVTTFUSCHTTIIND; - RETVALUE(SPstTsk(pst,mBuf)); -} - - -/*********************************************************** -* -* Func : cmUnpkTfuSchTtiInd -* -* -* Desc : This API is the TTI indication from PHY to scheduler. - * @details This primitive provides the timing information (SFN and subframe) - * which is currently running on the physical layer. - * @param pst Pointer to the post structure. - * @param suId SAP ID of the service user. - * @param ttiInd Pointer to the TfuTtiIndInfo. - * @return ROK/RFAILED -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkTfuSchTtiInd -( -TfuSchTtiInd func, -Pst *pst, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkTfuSchTtiInd(func, pst, mBuf) -TfuSchTtiInd func; -Pst *pst; -Buffer *mBuf; -#endif -{ - SuId suId; - TfuTtiIndInfo *ttiInd; - - TRC3(cmUnpkTfuSchTtiInd) - - if (SUnpkS16(&suId, mBuf) != ROK) { - TFU_FREE_MSG(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU116, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - if (pst->selector != TFU_SEL_LWLC) { - if ((SGetSBuf(pst->region, pst->pool, (Data **)&ttiInd, sizeof(TfuTtiIndInfo))) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU117, (ErrVal)0, "Packing failed"); -#endif - TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); - } - } - - if (pst->selector == TFU_SEL_LC) - { - if (cmUnpkTfuTtiIndInfo(ttiInd, mBuf) != ROK) { - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - TFU_FREE_MSG(mBuf); -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFU118, (ErrVal)0, "Packing failed"); -#endif - RETVALUE(RFAILED); - } - } - else if(pst->selector == TFU_SEL_LWLC) - { - if (cmUnpkPtr((PTR *)&ttiInd, mBuf) != ROK) - { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ETFUXXX, (ErrVal)0, "LWLC un-Packing failed"); -#endif - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); - } - } - TFU_FREE_MSG(mBuf); - /* [ccpu00141698]-MOD- MAC/SCH does not free the TTI ind anymore */ - (*func)(pst, suId, ttiInd); - SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)); - - RETVALUE(ROK); -} - /*********************************************************** * @@ -3835,9 +3528,9 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; (ErrVal)ETFU119, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)pucchDeltaPwr, sizeof(TfuPucchDeltaPwrIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuPucchDeltaPwrIndInfo(pucchDeltaPwr, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3846,12 +3539,12 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; #endif TFU_FREE_MEM(pucchDeltaPwr); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)pucchDeltaPwr, mBuf) != ROK) + if (oduPackPointer((PTR)pucchDeltaPwr, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3860,7 +3553,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; #endif TFU_FREE_MEM(pucchDeltaPwr); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -3872,13 +3565,13 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr; #endif TFU_FREE_MEM(pucchDeltaPwr); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { TFU_FREE_MEM(pucchDeltaPwr); } pst->event = (Event) EVTTFUPUCCHDELPWR; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -3929,9 +3622,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU122, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { Mem sMem; sMem.region = pst->region; sMem.pool = pst->pool; @@ -3942,11 +3635,11 @@ Buffer *mBuf; (ErrVal)ETFU123, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuPucchDeltaPwrIndInfo(pucchDeltaPwr, (Ptr)&pucchDeltaPwr->memCp, mBuf) != ROK) { TFU_FREE_MEM(pucchDeltaPwr); @@ -3956,12 +3649,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU124, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&pucchDeltaPwr, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&pucchDeltaPwr, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -3970,11 +3663,11 @@ Buffer *mBuf; #endif TFU_FREE_MEM(pucchDeltaPwr); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, pucchDeltaPwr)); + return ((*func)(pst, suId, pucchDeltaPwr)); } #ifdef TFU_5GTF @@ -4009,13 +3702,13 @@ Buffer *mBuf; TRC3(cmPkTfuRbAssignA1Val324) - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->hqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); #ifdef UL_ADPT_DBG printf("cmPkTfuRbAssignA1Val324 param->ndi %d mcs %d param->hqProcId %d \n",param->ndi,param->mcs,param->hqProcId); #endif - RETVALUE(ROK); + return ROK; } @@ -4049,12 +3742,12 @@ Buffer *mBuf; TRC3(cmPkTfuRbAssignB1Val324) - CMCHKPK(SPkU8, param->bmiHqAckNack, mBuf); - CMCHKPK(SPkU8, param->RV, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->hqProcId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->bmiHqAckNack, mBuf); + CMCHKPK(oduUnpackUInt8, param->RV, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); + return ROK; } @@ -4088,10 +3781,10 @@ Buffer *mBuf; TRC3(cmPkTfuRbAssignVal326) - CMCHKPK(SPkU8, param->CyclicShiftInd, mBuf); - CMCHKPK(SPkU8, param->OCCInd, mBuf); - CMCHKPK(SPkU8, param->FreqBandIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->CyclicShiftInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->OCCInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->FreqBandIdx, mBuf); + return ROK; } @@ -4125,10 +3818,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuRbAssignA1Val324) - CMCHKUNPK(SUnpkU8, ¶m->hqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + return ROK; } @@ -4162,12 +3855,12 @@ Buffer *mBuf; TRC3(cmUnpkTfuRbAssignB1Val324) - CMCHKUNPK(SUnpkU8, ¶m->hqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->RV, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->bmiHqAckNack, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->RV, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bmiHqAckNack, mBuf); + return ROK; } @@ -4201,10 +3894,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuRbAssignVal326) - CMCHKUNPK(SUnpkU8, ¶m->FreqBandIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->OCCInd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CyclicShiftInd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->FreqBandIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->OCCInd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CyclicShiftInd, mBuf); + return ROK; } @@ -4240,23 +3933,23 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormatA1A2Info) //printf("5GTF_DBG: cmPkTfuDciFormatA1Info() called by eNB\n"); - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->UL_PCRS, mBuf); - CMCHKPK(SPkU8, param->PMI, mBuf); - CMCHKPK(SPkU8, param->SCID, mBuf); - - CMCHKPK(SPkU8, param->REMapIdx_DMRS_PCRS_numLayers, mBuf); - CMCHKPK(SPkU8, param->SRS_Symbol, mBuf); - CMCHKPK(SPkU8, param->SRS_Config, mBuf); - CMCHKPK(SPkU8, param->beamSwitch, mBuf); - CMCHKPK(SPkU8, param->uciOnxPUSCH, mBuf); - - CMCHKPK(SPkU8, param->numBSI_Reports, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_ProcInd, mBuf); - CMCHKPK(SPkU8, param->CSI_BRRS_Indicator, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_SymbIdx, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_TxTiming, mBuf); - CMCHKPK(SPkU8, param->CSI_BSI_BRI_Req, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->UL_PCRS, mBuf); + CMCHKPK(oduUnpackUInt8, param->PMI, mBuf); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); + + CMCHKPK(oduUnpackUInt8, param->REMapIdx_DMRS_PCRS_numLayers, mBuf); + CMCHKPK(oduUnpackUInt8, param->SRS_Symbol, mBuf); + CMCHKPK(oduUnpackUInt8, param->SRS_Config, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamSwitch, mBuf); + CMCHKPK(oduUnpackUInt8, param->uciOnxPUSCH, mBuf); + + CMCHKPK(oduUnpackUInt8, param->numBSI_Reports, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_ProcInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSI_BRRS_Indicator, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_SymbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_TxTiming, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSI_BSI_BRI_Req, mBuf); if(param->RBAssign <= TFU_RIV_324) { @@ -4267,14 +3960,14 @@ Buffer *mBuf; CMCHKPK(cmPkTfuRbAssignVal326, ¶m->u.rbAssignVal326, mBuf); } - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->symbIdx, mBuf); - CMCHKPK(SPkU8, param->beamIndex, mBuf); - CMCHKPK(SPkU16, param->RBAssign, mBuf); - CMCHKPK(SPkU8, param->xPUSCH_TxTiming, mBuf); - CMCHKPK(SPkU8, param->xPUSCHRange, mBuf); - CMCHKPK(SPkU8, param->formatType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->symbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamIndex, mBuf); + CMCHKPK(oduUnpackUInt16, param->RBAssign, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPUSCH_TxTiming, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPUSCHRange, mBuf); + CMCHKPK(oduUnpackUInt8, param->formatType, mBuf); + return ROK; } @@ -4308,24 +4001,24 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormatB1B2Info) - CMCHKPK(SPkU8, param->DL_PCRS, mBuf); - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->SCID, mBuf); + CMCHKPK(oduUnpackUInt8, param->DL_PCRS, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); - CMCHKPK(SPkU8, param->AntPorts_numLayers, mBuf); - CMCHKPK(SPkU8, param->SRS_Symbol, mBuf); - CMCHKPK(SPkU8, param->SRS_Config, mBuf); - CMCHKPK(SPkU8, param->beamSwitch, mBuf); - CMCHKPK(SPkU8, param->freqResIdx_xPUCCH, mBuf); + CMCHKPK(oduUnpackUInt8, param->AntPorts_numLayers, mBuf); + CMCHKPK(oduUnpackUInt8, param->SRS_Symbol, mBuf); + CMCHKPK(oduUnpackUInt8, param->SRS_Config, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamSwitch, mBuf); + CMCHKPK(oduUnpackUInt8, param->freqResIdx_xPUCCH, mBuf); - CMCHKPK(SPkU8, param->xPUCCH_TxTiming, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPUCCH_TxTiming, mBuf); - CMCHKPK(SPkU8, param->numBSI_Reports, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_ProcInd, mBuf); - CMCHKPK(SPkU8, param->CSI_BRRS_Indicator, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_SymbIdx, mBuf); - CMCHKPK(SPkU8, param->CSIRS_BRRS_TxTiming, mBuf); - CMCHKPK(SPkU8, param->CSI_BSI_BRI_Req, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBSI_Reports, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_ProcInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSI_BRRS_Indicator, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_SymbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSIRS_BRRS_TxTiming, mBuf); + CMCHKPK(oduUnpackUInt8, param->CSI_BSI_BRI_Req, mBuf); if(param->RBAssign <= TFU_RIV_324) { @@ -4336,12 +4029,12 @@ Buffer *mBuf; CMCHKPK(cmPkTfuRbAssignVal326, ¶m->u.rbAssignVal326, mBuf); } - CMCHKPK(SPkU8, param->symbIdx, mBuf); - CMCHKPK(SPkU8, param->beamIndex, mBuf); - CMCHKPK(SPkU16, param->RBAssign, mBuf); - CMCHKPK(SPkU8, param->xPDSCHRange, mBuf); - CMCHKPK(SPkU8, param->formatType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->symbIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamIndex, mBuf); + CMCHKPK(oduUnpackUInt16, param->RBAssign, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPDSCHRange, mBuf); + CMCHKPK(oduUnpackUInt8, param->formatType, mBuf); + return ROK; } @@ -4376,13 +4069,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormatA1A2Info) - CMCHKUNPK(SUnpkU8, ¶m->formatType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPUSCHRange, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPUSCH_TxTiming, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->RBAssign, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->symbIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->formatType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPUSCHRange, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPUSCH_TxTiming, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->RBAssign, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->symbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); if(param->RBAssign <= TFU_RIV_324) { @@ -4393,25 +4086,25 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuRbAssignVal326, ¶m->u.rbAssignVal326, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->CSI_BSI_BRI_Req, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_TxTiming, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_SymbIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSI_BRRS_Indicator, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_ProcInd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numBSI_Reports, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSI_BSI_BRI_Req, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_TxTiming, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_SymbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSI_BRRS_Indicator, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_ProcInd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBSI_Reports, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->uciOnxPUSCH, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamSwitch, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SRS_Config, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SRS_Symbol, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->REMapIdx_DMRS_PCRS_numLayers, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->uciOnxPUSCH, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamSwitch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SRS_Config, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SRS_Symbol, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->REMapIdx_DMRS_PCRS_numLayers, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->PMI, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->UL_PCRS, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->PMI, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->UL_PCRS, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4445,11 +4138,11 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormatB1B2Info) - CMCHKUNPK(SUnpkU8, ¶m->formatType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPDSCHRange, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->RBAssign, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->symbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->formatType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPDSCHRange, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->RBAssign, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->symbIdx, mBuf); if(param->RBAssign <= TFU_RIV_324) { @@ -4460,24 +4153,24 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuRbAssignVal326, ¶m->u.rbAssignVal326, mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->CSI_BSI_BRI_Req, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_TxTiming, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_SymbIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSI_BRRS_Indicator, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->CSIRS_BRRS_ProcInd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numBSI_Reports, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSI_BSI_BRI_Req, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_TxTiming, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_SymbIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSI_BRRS_Indicator, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->CSIRS_BRRS_ProcInd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBSI_Reports, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPUCCH_TxTiming, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->freqResIdx_xPUCCH, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamSwitch, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SRS_Config, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SRS_Symbol, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->AntPorts_numLayers, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->DL_PCRS, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPUCCH_TxTiming, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->freqResIdx_xPUCCH, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamSwitch, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SRS_Config, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SRS_Symbol, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->AntPorts_numLayers, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->DL_PCRS, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4515,29 +4208,29 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat0Info) /* tfu_c_001.main_3: Adding pack for hqProcId */ - CMCHKPK(SPkU8, param->hqProcId, mBuf); - CMCHKPK(SPkU8, param->txAntenna, mBuf); - CMCHKPK(SPkU8, param->numCqiBit, mBuf); - CMCHKPK(SPkU8, param->cqiReq, mBuf); - CMCHKPK(SPkU8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->txAntenna, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCqiBit, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiReq, mBuf); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); - CMCHKPK(SPkU8, param->ulIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulIdx, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->hoppingBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingBits, mBuf); /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKPK(SPkU32, param->riv, mBuf); + CMCHKPK(oduUnpackUInt32, param->riv, mBuf); #endif - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + return ROK; } @@ -4572,30 +4265,30 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat0Info) - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); #ifdef TFU_UPGRADE - CMCHKUNPK(SUnpkU32, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); #endif /* TFU_UPGRADE */ - CMCHKUNPK(SUnpkU8, ¶m->hoppingBits, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->ulIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiReq, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numCqiBit, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txAntenna, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiReq, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numCqiBit, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txAntenna, mBuf); /* tfu_c_001.main_3: Adding unpack for hqProcId */ - CMCHKUNPK(SUnpkU8, ¶m->hqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4645,19 +4338,19 @@ Buffer *mBuf; #ifndef TFU_RESMAP_CHANGE case TFU_ALLOC_TYPE_MAP: for (i=TFU_MAX_ALLOC_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->u.resAllocMap[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->u.resAllocMap[i], mBuf); } break; #endif case TFU_ALLOC_TYPE_RIV: - CMCHKPK(SPkU32, param->u.riv, mBuf); + CMCHKPK(oduUnpackUInt32, param->u.riv, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -4694,17 +4387,17 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuAllocMapOrRiv) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_ALLOC_TYPE_RIV: - CMCHKUNPK(SUnpkU32, ¶m->u.riv, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->u.riv, mBuf); break; /*tfu_c_001.main_7 - ADD - TFU_RESMAP_CHANGE support */ #ifndef TFU_RESMAP_CHANGE case TFU_ALLOC_TYPE_MAP: for (i=0; iu.resAllocMap[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.resAllocMap[i], mBuf); } break; @@ -4718,9 +4411,9 @@ Buffer *mBuf; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -4761,15 +4454,15 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuDciFormat1AllocInfo) - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); for (i=TFU_MAX_ALLOC_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->resAllocMap[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->resAllocMap[i], mBuf); } - CMCHKPK(SPkU8, param->isAllocType0, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isAllocType0, mBuf); + return ROK; } @@ -4810,15 +4503,15 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuDciFormat1AllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->isAllocType0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAllocType0, mBuf); for (i=0; iresAllocMap[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->resAllocMap[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + return ROK; } @@ -4856,14 +4549,14 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1Info) - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif CMCHKPK(cmPkTfuDciFormat1AllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -4905,11 +4598,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDciFormat1AllocInfo, ¶m->allocInfo, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + return ROK; } @@ -4950,21 +4643,21 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuDciFormat2AAllocInfo) - CMCHKPK(SPkU8, param->transSwap, mBuf); - CMCHKPK(SPkU8, param->precoding, mBuf); + CMCHKPK(oduUnpackUInt8, param->transSwap, mBuf); + CMCHKPK(oduUnpackUInt8, param->precoding, mBuf); for (i=1; i >= 0; i--) { CMCHKPK(cmPkTfuDciFormatTbInfo, ¶m->tbInfo[i], mBuf); } - CMCHKPK(SPkU8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); for (i=TFU_MAX_ALLOC_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->resAllocMap[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->resAllocMap[i], mBuf); } - CMCHKPK(SPkU8, param->isAllocType0, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAllocType0, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5008,15 +4701,15 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->isAllocType0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAllocType0, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ for (i=0; iresAllocMap[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->resAllocMap[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ @@ -5027,9 +4720,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDciFormatTbInfo, ¶m->tbInfo[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->precoding, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->transSwap, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->precoding, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->transSwap, mBuf); + return ROK; } #ifdef EMTC_ENABLE @@ -5068,13 +4761,13 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat6AAllocInfo) - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU32, param->riv, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt32, param->riv, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5114,13 +4807,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat6AAllocInfo) - CMCHKUNPK(SUnpkU32, ¶m->riv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); printf("In cmUnpkTfuDciFormat6AAllocInfo :: Passed \n"); - RETVALUE(ROK); + return ROK; } #endif @@ -5157,14 +4850,14 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat2AInfo) - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif CMCHKPK(cmPkTfuDciFormat2AAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5203,11 +4896,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDciFormat2AAllocInfo, ¶m->allocInfo, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + return ROK; } @@ -5254,20 +4947,20 @@ Buffer *mBuf; for (i=1; i >= 0; i--) { CMCHKPK(cmPkTfuDciFormatTbInfo, ¶m->tbInfo[i], mBuf); } - CMCHKPK(SPkU8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->precoding, mBuf); - CMCHKPK(SPkU8, param->transSwap, mBuf); + CMCHKPK(oduUnpackUInt8, param->precoding, mBuf); + CMCHKPK(oduUnpackUInt8, param->transSwap, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif for (i=TFU_MAX_ALLOC_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->resAllocMap[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->resAllocMap[i], mBuf); } /* tfu_c_001.main_4 - Changes for MIMO feature addition */ @@ -5275,9 +4968,9 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKPK(SPkU8, param->isAllocType0, mBuf); + CMCHKPK(oduUnpackUInt8, param->isAllocType0, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5321,33 +5014,33 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->isAllocType0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAllocType0, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ for (i=0; iresAllocMap[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->resAllocMap[i], mBuf); } #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->transSwap, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->precoding, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->transSwap, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->precoding, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); for (i=0; i<=1; i++) { CMCHKUNPK(cmUnpkTfuDciFormatTbInfo, ¶m->tbInfo[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -5391,16 +5084,16 @@ Buffer *mBuf; /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ CMCHKPK(cmPkTfuDciFormat2AllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5443,17 +5136,17 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -5489,11 +5182,11 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuDciFormat3Info) - CMCHKPK(SPkU8, param->isPucch, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPucch, mBuf); for (i=TFU_MAX_2BIT_TPC-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->tpcCmd[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -5530,10 +5223,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat3Info) for (i=0; itpcCmd[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isPucch, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isPucch, mBuf); + return ROK; } @@ -5568,11 +5261,11 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuDciFormat3AInfo) - CMCHKPK(SPkU8, param->isPucch, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPucch, mBuf); for (i=TFU_MAX_2BIT_TPC-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->tpcCmd[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -5609,10 +5302,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat3AInfo) for (i=0; itpcCmd[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isPucch, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isPucch, mBuf); + return ROK; } #ifdef EMTC_ENABLE @@ -5650,22 +5343,22 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat60aInfo) - CMCHKPK(SPkU8, param->dciRep, mBuf); - CMCHKPK(SPkU8, param->isSrs, mBuf); - CMCHKPK(SPkU8, param->cqiReq, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciRep, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiReq, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); - CMCHKPK(SPkU8, param->ulIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulIdx, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->hqProcId, mBuf); - CMCHKPK(SPkU8, param->rep, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU32, param->riv, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rep, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt32, param->riv, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + return ROK; } /*********************************************************** * @@ -5698,11 +5391,11 @@ Buffer *mBuf; TRC3(cmPkTfuPdcchOrderInfoEmtc) - CMCHKPK(SPkU8, param->ceLevel, mBuf); - CMCHKPK(SPkU8, param->prachMaskIdx, mBuf); - CMCHKPK(SPkU8, param->preambleIdx, mBuf); - CMCHKPK(SPkU32, param->riv, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->ceLevel, mBuf); + CMCHKPK(oduUnpackUInt8, param->prachMaskIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->preambleIdx, mBuf); + CMCHKPK(oduUnpackUInt32, param->riv, mBuf); + return ROK; } /*********************************************************** @@ -5736,22 +5429,22 @@ Buffer *mBuf; TRC3(cmPkTfudciformat61aPdsch) - CMCHKPK(SPkU8, param->isTBMsg4, mBuf); - CMCHKPK(SPkU8, param->dciRep, mBuf); - CMCHKPK(SPkU8, param->harqAckOffst, mBuf); - CMCHKPK(SPkU8, param->pmiCfm, mBuf); - CMCHKPK(SPkU8, param->tPmi, mBuf); - CMCHKPK(SPkU8, param->isSrs, mBuf); - CMCHKPK(SPkU8, param->antPortAndScrId, mBuf); + CMCHKPK(oduUnpackUInt8, param->isTBMsg4, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciRep, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqAckOffst, mBuf); + CMCHKPK(oduUnpackUInt8, param->pmiCfm, mBuf); + CMCHKPK(oduUnpackUInt8, param->tPmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->antPortAndScrId, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->rep, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->rep, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); CMCHKPK(cmPkTfuDciFormat6AAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -5796,11 +5489,11 @@ Buffer *mBuf; CMCHKPK(cmPkTfuPdcchOrderInfoEmtc, ¶m->t.pdcchOrder, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isPdcchOrder, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPdcchOrder, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5836,23 +5529,23 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat60aInfo) printf("In cmUnpkTfuDciFormat60aInfo :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->riv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rep, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->ulIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->cqiReq, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isSrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciRep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiReq, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciRep, mBuf); printf("In cmUnpkTfuDciFormat60aInfo :: Exit \n"); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -5886,12 +5579,12 @@ Buffer *mBuf; TRC3(cmUnpkTfuPdcchOrderInfoEmtc) printf("In cmUnpkTfuPdcchOrderInfoEmtc :: Entry \n"); - CMCHKUNPK(SUnpkU32, ¶m->riv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->preambleIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachMaskIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ceLevel, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->preambleIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachMaskIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ceLevel, mBuf); printf("In cmUnpkTfuPdcchOrderInfoEmtc :: Passed \n"); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -5924,7 +5617,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat61aInfo) - CMCHKUNPK(SUnpkU8, ¶m->isPdcchOrder, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPdcchOrder, mBuf); printf("1. cmUnpkTfuDciFormat61aInfo :: isPdcchOrder %d \n", param->isPdcchOrder); switch(param->isPdcchOrder) { case TRUE: @@ -5934,9 +5627,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfudciformat61aPdsch, ¶m->t.pdschInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif @@ -5975,13 +5668,13 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1dAllocInfo) - CMCHKPK(SPkU8, param->tPmi, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->tPmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); CMCHKPK(cmPkTknU8, ¶m->nGap2, mBuf); - CMCHKPK(SPkU8, param->isLocal, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isLocal, mBuf); + return ROK; } @@ -6021,13 +5714,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1dAllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->isLocal, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tPmi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tPmi, mBuf); + return ROK; } @@ -6066,17 +5759,17 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1dInfo) - CMCHKPK(SPkU8, param->dlPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlPwrOffset, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif - CMCHKPK(SPkU8, param->tpcCmd, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); CMCHKPK(cmPkTfuDciFormat1dAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6116,16 +5809,16 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1dInfo) CMCHKUNPK(cmUnpkTfuDciFormat1dAllocInfo, ¶m->allocInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->dlPwrOffset, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->dlPwrOffset, mBuf); + return ROK; } @@ -6165,10 +5858,10 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1cInfo) - CMCHKPK(SPkU8, param->iTbs, mBuf); + CMCHKPK(oduUnpackUInt8, param->iTbs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); CMCHKPK(cmPkTknU8, ¶m->nGap2, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6210,8 +5903,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->iTbs, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->iTbs, mBuf); + return ROK; } @@ -6251,16 +5944,16 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1bAllocInfo) - CMCHKPK(SPkU8, param->pmiCfm, mBuf); - CMCHKPK(SPkU8, param->tPmi, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->pmiCfm, mBuf); + CMCHKPK(oduUnpackUInt8, param->tPmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); CMCHKPK(cmPkTknU8, ¶m->nGap2, mBuf); - CMCHKPK(SPkU8, param->isLocal, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isLocal, mBuf); + return ROK; } @@ -6300,16 +5993,16 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1bAllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->isLocal, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tPmi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pmiCfm, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tPmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmiCfm, mBuf); + return ROK; } @@ -6345,9 +6038,9 @@ Buffer *mBuf; TRC3(cmPkTfuPdcchOrderInfo) - CMCHKPK(SPkU8, param->prachMaskIdx, mBuf); - CMCHKPK(SPkU8, param->preambleIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->prachMaskIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->preambleIdx, mBuf); + return ROK; } @@ -6383,9 +6076,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuPdcchOrderInfo) - CMCHKUNPK(SUnpkU8, ¶m->preambleIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->prachMaskIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->preambleIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->prachMaskIdx, mBuf); + return ROK; } @@ -6425,14 +6118,14 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1aAllocInfo) - CMCHKPK(SPkU8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); CMCHKPK(cmPkTknU8, ¶m->harqProcId, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); CMCHKPK(cmPkTfuAllocMapOrRiv, ¶m->alloc, mBuf); CMCHKPK(cmPkTknU8, ¶m->nGap2, mBuf); - CMCHKPK(SPkU8, param->isLocal, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isLocal, mBuf); + return ROK; } @@ -6472,14 +6165,14 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1aAllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->isLocal, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isLocal, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->nGap2, mBuf); CMCHKUNPK(cmUnpkTfuAllocMapOrRiv, ¶m->alloc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + return ROK; } @@ -6515,14 +6208,14 @@ Buffer *mBuf; TRC3(cmPkTfudciformat1aPdsch) - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); #ifdef TFU_TDD CMCHKPK(cmPkTknU8, ¶m->dai, mBuf); #endif CMCHKPK(cmPkTfuDciFormat1aAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6564,8 +6257,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTknU8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + return ROK; } #ifdef EMTC_ENABLE @@ -6605,31 +6298,31 @@ Buffer *mBuf; printf("1. cmUnpkTfudciformat61aPdsch :: Entry \n"); CMCHKUNPK(cmUnpkTfuDciFormat6AAllocInfo, ¶m->allocInfo, mBuf); printf("2. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); printf("3. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->rep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rep, mBuf); printf("4. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); printf("5. cmUnpkTfudciformat61aPdsch :: Entry \n"); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); printf("6. cmUnpkTfudciformat61aPdsch :: Entry \n"); #endif - CMCHKUNPK(SUnpkU8, ¶m->antPortAndScrId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->antPortAndScrId, mBuf); printf("7. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->isSrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSrs, mBuf); printf("8. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->tPmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tPmi, mBuf); printf("9. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->pmiCfm, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmiCfm, mBuf); printf("10. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->harqAckOffst, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqAckOffst, mBuf); printf("11. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->dciRep, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciRep, mBuf); printf("12. cmUnpkTfudciformat61aPdsch :: Entry \n"); - CMCHKUNPK(SUnpkU8, ¶m->isTBMsg4, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isTBMsg4, mBuf); printf("1. cmUnpkTfudciformat61aPdsch :: Passed \n"); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -6661,11 +6354,11 @@ PRIVATE S16 cmUnpkTfuDirectIndication(param, mBuf) { TRC3(cmUnpkTfuDirectIndication) - CMCHKUNPK(SUnpkU8, ¶m->directInd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->directInd, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -6700,11 +6393,11 @@ PUBLIC S16 cmUnpkTfuDciFormat62AllocInfo(param, mBuf) #endif { TRC3(cmUnpkTfuDciFormat62AllocInfo) - CMCHKUNPK(SUnpkU8, ¶m->riv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->riv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -6740,9 +6433,9 @@ PRIVATE S16 cmUnpkTfudciformat62Pdsch(param, mBuf) CMCHKUNPK(cmUnpkTfuDciFormat62AllocInfo, ¶m->format62AllocInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->repNum, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciSubRepNum, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->repNum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciSubRepNum, mBuf); + return ROK; } @@ -6778,7 +6471,7 @@ PUBLIC S16 cmUnpkTfuDciFormat62Info(param, mBuf) { TRC3(cmUnpkTfuDciFormat62Info) - CMCHKUNPK(SUnpkU8, ¶m->isPaging, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPaging, mBuf); switch(param->isPaging) { case FALSE: CMCHKUNPK(cmUnpkTfuDirectIndication, ¶m->t.directIndication, mBuf); @@ -6787,11 +6480,11 @@ PUBLIC S16 cmUnpkTfuDciFormat62Info(param, mBuf) CMCHKUNPK(cmUnpkTfudciformat62Pdsch, ¶m->t.pdschInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -6835,10 +6528,10 @@ PRIVATE S16 cmPkTfuDirectIndication(param, mBuf) { TRC3(cmPkTfuDirectIndication) - CMCHKPK(SPkU8, param->directInd, mBuf); + CMCHKPK(oduUnpackUInt8, param->directInd, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6878,11 +6571,11 @@ PUBLIC S16 cmPkTfuDciFormat62AllocInfo(param, mBuf) TRC3(cmPkTfuDciFormat6AAllocInfo) - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->riv, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->riv, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6917,10 +6610,10 @@ PRIVATE S16 cmPkTfudciformat62Pdsch(param, mBuf) { TRC3(cmPkTfudciformat62Pdsch) - CMCHKPK(SPkU8, param->dciSubRepNum, mBuf); - CMCHKPK(SPkU8, param->repNum, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciSubRepNum, mBuf); + CMCHKPK(oduUnpackUInt8, param->repNum, mBuf); CMCHKPK(cmPkTfuDciFormat62AllocInfo, ¶m->format62AllocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -6967,11 +6660,11 @@ PUBLIC S16 cmPkTfuDciFormat62Info(param, mBuf) CMCHKPK(cmPkTfuDirectIndication, ¶m->t.directIndication, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isPaging, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPaging, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7023,11 +6716,11 @@ Buffer *mBuf; CMCHKPK(cmPkTfuPdcchOrderInfo, ¶m->t.pdcchOrder, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isPdcchOrder, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPdcchOrder, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7065,7 +6758,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormat1aInfo) - CMCHKUNPK(SUnpkU8, ¶m->isPdcchOrder, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPdcchOrder, mBuf); switch(param->isPdcchOrder) { case TRUE: CMCHKUNPK(cmUnpkTfuPdcchOrderInfo, ¶m->t.pdcchOrder, mBuf); @@ -7074,9 +6767,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfudciformat1aPdsch, ¶m->t.pdschInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7115,14 +6808,14 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormat1bInfo) - CMCHKPK(SPkU8, param->tpcCmd, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpcCmd, mBuf); #ifdef TFU_TDD - CMCHKPK(SPkU8, param->dai, mBuf); + CMCHKPK(oduUnpackUInt8, param->dai, mBuf); #endif CMCHKPK(cmPkTfuDciFormat1bAllocInfo, ¶m->allocInfo, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7164,11 +6857,11 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDciFormat1bAllocInfo, ¶m->allocInfo, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->dai, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dai, mBuf); #endif - CMCHKUNPK(SUnpkU8, ¶m->tpcCmd, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->tpcCmd, mBuf); + return ROK; } @@ -7274,10 +6967,10 @@ Buffer *mBuf; CMCHKPK(cmPkTfuDciFormat0Info, ¶m->u.format0Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->dciFormat, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->dciFormat, mBuf); + return ROK; } @@ -7327,7 +7020,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->dciFormat, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->dciFormat, mBuf); switch(param->dciFormat) { case TFU_DCI_FORMAT_0: CMCHKUNPK(cmUnpkTfuDciFormat0Info, ¶m->u.format0Info, mBuf); @@ -7388,9 +7081,9 @@ Buffer *mBuf; break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7426,9 +7119,9 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandInfo) - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + return ROK; } @@ -7464,9 +7157,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandInfo) - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); + return ROK; } @@ -7502,9 +7195,9 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandCqiInfo) - CMCHKPK(SPkU8, param->cqiIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiIdx, mBuf); CMCHKPK(cmPkTfuSubbandInfo, ¶m->subband, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7540,8 +7233,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandCqiInfo) CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subband, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx, mBuf); + return ROK; } @@ -7577,8 +7270,8 @@ Buffer *mBuf; TRC3(cmPkTfuPdcchCceInfo) CMCHKPK(cmPkLteAggrLvl, param->aggrLvl, mBuf); - CMCHKPK(SPkU8, param->cceIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cceIdx, mBuf); + return ROK; } @@ -7613,9 +7306,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuPdcchCceInfo) - CMCHKUNPK(SUnpkU8, ¶m->cceIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cceIdx, mBuf); CMCHKUNPK(cmUnpkLteAggrLvl,(U32 *)¶m->aggrLvl, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7653,16 +7346,16 @@ Buffer *mBuf; switch(param->type) { case TFU_RPT_CQI: - CMCHKPK(SPkU8, param->u.cqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.cqi, mBuf); break; case TFU_RPT_RI: - CMCHKPK(SPkU8, param->u.ri, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.ri, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -7698,18 +7391,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPucchMode10) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RPT_RI: - CMCHKUNPK(SUnpkU8, ¶m->u.ri, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.ri, mBuf); break; case TFU_RPT_CQI: - CMCHKUNPK(SUnpkU8, ¶m->u.cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.cqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7746,9 +7439,9 @@ Buffer *mBuf; TRC3(cmPkTfuCqiMode11Cqi) CMCHKPK(cmPkTknU8, ¶m->wideDiffCqi, mBuf); - CMCHKPK(SPkU8, param->pmi, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -7784,10 +7477,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode11Cqi) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->wideDiffCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -7828,13 +7521,13 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode11Cqi, ¶m->u.cqi, mBuf); break; case TFU_RPT_RI: - CMCHKPK(SPkU8, param->u.ri, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.ri, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -7870,18 +7563,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPucchMode11) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RPT_RI: - CMCHKUNPK(SUnpkU8, ¶m->u.ri, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.ri, mBuf); break; case TFU_RPT_CQI: CMCHKUNPK(cmUnpkTfuCqiMode11Cqi, ¶m->u.cqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -7916,9 +7609,9 @@ Buffer *mBuf; TRC3(cmPkTfuCqiMode20SubCqi) - CMCHKPK(SPkU8, param->l, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->l, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -7953,9 +7646,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode20SubCqi) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->l, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->l, mBuf); + return ROK; } @@ -7996,13 +7689,13 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode20SubCqi, ¶m->u.subCqi, mBuf); break; case TRUE: - CMCHKPK(SPkU8, param->u.wideCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.wideCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isWideband, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isWideband, mBuf); + return ROK; } @@ -8038,18 +7731,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode20Cqi) - CMCHKUNPK(SUnpkU8, ¶m->isWideband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isWideband, mBuf); switch(param->isWideband) { case TRUE: - CMCHKUNPK(SUnpkU8, ¶m->u.wideCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.wideCqi, mBuf); break; case FALSE: CMCHKUNPK(cmUnpkTfuCqiMode20SubCqi, ¶m->u.subCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8090,13 +7783,13 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode20Cqi, ¶m->u.cqi, mBuf); break; case TFU_RPT_RI: - CMCHKPK(SPkU8, param->u.ri, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.ri, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -8132,18 +7825,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPucchMode20) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RPT_RI: - CMCHKUNPK(SUnpkU8, ¶m->u.ri, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.ri, mBuf); break; case TFU_RPT_CQI: CMCHKUNPK(cmUnpkTfuCqiMode20Cqi, ¶m->u.cqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8180,9 +7873,9 @@ Buffer *mBuf; TRC3(cmPkTfuCqiMode21SubCqi) CMCHKPK(cmPkTknU8, ¶m->diffCqi, mBuf); - CMCHKPK(SPkU8, param->l, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->l, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -8218,10 +7911,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode21SubCqi) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->l, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->l, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->diffCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8258,9 +7951,9 @@ Buffer *mBuf; TRC3(cmPkTfuCqiMode21WideCqi) CMCHKPK(cmPkTknU8, ¶m->diffCqi, mBuf); - CMCHKPK(SPkU8, param->pmi, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -8296,10 +7989,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode21WideCqi) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->diffCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8343,10 +8036,10 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode21WideCqi, ¶m->u.wideCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU8, param->isWideband, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isWideband, mBuf); + return ROK; } @@ -8382,7 +8075,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiMode21Cqi) - CMCHKUNPK(SUnpkU8, ¶m->isWideband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isWideband, mBuf); switch(param->isWideband) { case TRUE: CMCHKUNPK(cmUnpkTfuCqiMode21WideCqi, ¶m->u.wideCqi, mBuf); @@ -8391,9 +8084,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuCqiMode21SubCqi, ¶m->u.subCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8434,13 +8127,13 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiMode21Cqi, ¶m->u.cqi, mBuf); break; case TFU_RPT_RI: - CMCHKPK(SPkU8, param->u.ri, mBuf); + CMCHKPK(oduUnpackUInt8, param->u.ri, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); + return ROK; } @@ -8476,18 +8169,18 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPucchMode21) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RPT_RI: - CMCHKUNPK(SUnpkU8, ¶m->u.ri, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->u.ri, mBuf); break; case TFU_RPT_CQI: CMCHKUNPK(cmUnpkTfuCqiMode21Cqi, ¶m->u.cqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8536,11 +8229,11 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiPucchMode10, ¶m->u.mode10Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->mode, mBuf); - CMCHKPK(SPkU8, param->cellIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->mode, mBuf); + CMCHKPK(oduUnpackUInt8, param->cellIdx, mBuf); + return ROK; } @@ -8575,8 +8268,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuDlCqiPucch) - CMCHKUNPK(SUnpkU8, ¶m->cellIdx, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->mode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellIdx, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); switch(param->mode) { case TFU_PUCCH_CQI_MODE10: CMCHKUNPK(cmUnpkTfuCqiPucchMode10, ¶m->u.mode10Info, mBuf); @@ -8591,9 +8284,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuCqiPucchMode21, ¶m->u.mode21Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -8630,8 +8323,8 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandMode12) CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); - CMCHKPK(SPkU8, param->pmi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); + return ROK; } @@ -8667,9 +8360,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandMode12) - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subBand, mBuf); - RETVALUE(ROK); + return ROK; } @@ -8710,10 +8403,10 @@ Buffer *mBuf; CMCHKPK(cmPkTfuSubbandMode12, ¶m->subbandArr[i], mBuf); } for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqiIdx[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiIdx[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + return ROK; } @@ -8750,14 +8443,14 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuCqiPuschMode12) - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; icqiIdx[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx[i], mBuf); } for (i=0; isubbandArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8797,10 +8490,10 @@ Buffer *mBuf; for (i=TFU_MAX_DL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuSubbandInfo, ¶m->subbandArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - CMCHKPK(SPkU8, param->wideBandCqi, mBuf); - CMCHKPK(SPkU8, param->cqiIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiIdx, mBuf); + return ROK; } @@ -8837,13 +8530,13 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuCqiPuschMode20) - CMCHKUNPK(SUnpkU8, ¶m->cqiIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->wideBandCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; isubbandArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8884,16 +8577,16 @@ Buffer *mBuf; CMCHKPK(cmPkTfuSubbandInfo, ¶m->subbandArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - CMCHKPK(SPkU8, param->wideBandPmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandPmi, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->wideBandCqi[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandCqi[i], mBuf); } - CMCHKPK(SPkU8, param->pmi, mBuf); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqi[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8931,20 +8624,20 @@ Buffer *mBuf; TRC3(cmUnpkTfuCqiPuschMode22) for (i=0; icqi[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); for (i=0; iwideBandCqi[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->wideBandPmi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandPmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; isubbandArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -8964,8 +8657,8 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandMode30) CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); - CMCHKPK(SPkU8, param->cqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cqi, mBuf); + return ROK; } @@ -8984,9 +8677,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandMode30) - CMCHKUNPK(SUnpkU8, ¶m->cqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi, mBuf); CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subBand, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9026,9 +8719,9 @@ Buffer *mBuf; for (i=TFU_MAX_DL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuSubbandMode30, ¶m->subbandArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - CMCHKPK(SPkU8, param->wideBandCqi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandCqi, mBuf); + return ROK; } @@ -9065,12 +8758,12 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuCqiPuschMode30) - CMCHKUNPK(SUnpkU8, ¶m->wideBandCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; isubbandArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -9092,9 +8785,9 @@ Buffer *mBuf; CMCHKPK(cmPkTfuSubbandInfo, ¶m->subBand, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqi[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqi[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -9115,10 +8808,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuSubbandMode31) for (i=0; icqi[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqi[i], mBuf); } CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subBand, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9165,12 +8858,12 @@ Buffer *mBuf; CMCHKPK(cmPkTfuSubbandDlCqiInfo, ¶m->subbandCqiArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->wideBandCqi[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->wideBandCqi[i], mBuf); } - CMCHKPK(SPkU8, param->pmi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pmi, mBuf); + return ROK; } @@ -9207,11 +8900,11 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuCqiPuschMode31) - CMCHKUNPK(SUnpkU8, ¶m->pmi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pmi, mBuf); for (i=0; iwideBandCqi[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideBandCqi[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ @@ -9223,7 +8916,7 @@ Buffer *mBuf; /* tfu_c_001.main_4 - Changes for MIMO feature addition */ /* tfu_c_001.main_5 - Removed dependency on MIMO compile-time flag */ - RETVALUE(ROK); + return ROK; } @@ -9276,14 +8969,14 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiPuschMode12, ¶m->u.mode12Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } CMCHKPK(cmPkTknU8, ¶m->ri, mBuf); - CMCHKPK(SPkU32, param->mode, mBuf); + CMCHKPK(oduUnpackUInt32, param->mode, mBuf); - CMCHKPK(SPkU8, param->cellIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cellIdx, mBuf); + return ROK; } @@ -9319,8 +9012,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuDlCqiPusch) - CMCHKUNPK(SUnpkU8, ¶m->cellIdx, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->mode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cellIdx, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->ri, mBuf); switch(param->mode) { case TFU_PUSCH_CQI_MODE_12: @@ -9339,9 +9032,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuCqiPuschMode31, ¶m->u.mode31Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9384,15 +9077,15 @@ Buffer *mBuf; { CMCHKPK(cmPkTfuDlCqiPusch, ¶m->pusch.puschCqi[idx], mBuf); } - CMCHKPK(SPkU8, param->pusch.numOfCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->pusch.numOfCells, mBuf); break; case TRUE: CMCHKPK(cmPkTfuDlCqiPucch, ¶m->pucchCqi, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9435,16 +9128,16 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuDlCqiPucch, ¶m->pucchCqi, mBuf); break; case FALSE: - CMCHKUNPK(SUnpkU8, ¶m->pusch.numOfCells, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pusch.numOfCells, mBuf); for (idx = param->pusch.numOfCells; idx > 0; idx--) { CMCHKUNPK(cmUnpkTfuDlCqiPusch, ¶m->pusch.puschCqi[idx-1], mBuf); } break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -9492,7 +9185,7 @@ Buffer *mBuf; /*ccpu00116923 - ADD - SRS present support*/ /*tfu_c_001.main_7 - ADD - SRS present field inclusion */ #ifdef TFU_UPGRADE - CMCHKPK(SPkU8, param->srsPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->srsPres, mBuf); #endif count = param->ueRecpReqLst.count; node = param->ueRecpReqLst.last; @@ -9503,10 +9196,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->ueRecpReqLst, &tfuUeRecpReqInfo->lnk); tfuUeRecpReqInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9556,7 +9249,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->ueRecpReqLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntsrsPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->srsPres, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -9604,20 +9297,20 @@ Buffer *mBuf; TRC3(cmPkTfuPdcchInfo) #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->grpId, mBuf); - CMCHKPK(SPkU8, param->sccIdx, mBuf); - CMCHKPK(SPkU8, param->sectorId, mBuf); + CMCHKPK(oduUnpackUInt8, param->grpId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->sectorId, mBuf); #endif /* TFU_5GTF */ CMCHKPK(cmPkTfuDciInfo, ¶m->dci, mBuf); - CMCHKPK(SPkU8, param->dciNumOfBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->dciNumOfBits, mBuf); CMCHKPK(cmPkLteAggrLvl, param->aggrLvl, mBuf); - CMCHKPK(SPkU16, param->nCce, mBuf); + CMCHKPK(oduUnpackUInt16, param->nCce, mBuf); #ifdef LTEMAC_SPS CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - CMCHKPK(SPkU8, param->isSpsRnti, mBuf); + CMCHKPK(oduUnpackUInt8, param->isSpsRnti, mBuf); #endif CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9655,19 +9348,19 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); #ifdef LTEMAC_SPS - CMCHKUNPK(SUnpkU8, ¶m->isSpsRnti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isSpsRnti, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); #endif - CMCHKUNPK(SUnpkU16, ¶m->nCce, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->nCce, mBuf); CMCHKUNPK(cmUnpkLteAggrLvl, (U32*)¶m->aggrLvl, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dciNumOfBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dciNumOfBits, mBuf); CMCHKUNPK(cmUnpkTfuDciInfo, ¶m->dci, mBuf); #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->sectorId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sccIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->grpId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sectorId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sccIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->grpId, mBuf); #endif /* TFU_5GTF */ - RETVALUE(ROK); + return ROK; } @@ -9707,15 +9400,15 @@ Buffer *mBuf; TRC3(cmPkTfuPhichInfo) /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKPK(SPkU16, param->txPower, mBuf); + CMCHKPK(oduUnpackUInt16, param->txPower, mBuf); #endif #ifdef TFU_TDD - CMCHKPK(SPkU8, param->iPhich, mBuf); + CMCHKPK(oduUnpackUInt8, param->iPhich, mBuf); #endif - CMCHKPK(SPkU8, param->isAck, mBuf); - CMCHKPK(SPkU8, param->nDmrs, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->isAck, mBuf); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + return ROK; } @@ -9754,17 +9447,17 @@ Buffer *mBuf; TRC3(cmUnpkTfuPhichInfo) - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isAck, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isAck, mBuf); /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->iPhich, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->iPhich, mBuf); #endif #ifdef TFU_UPGRADE - CMCHKUNPK(SUnpkU16, ¶m->txPower, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->txPower, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -9817,7 +9510,7 @@ Buffer *mBuf; cmLListDelFrm(¶m->dlMpdcchLst, &tfuPdcchInfo->lnk); tfuPdcchInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); count = param->ulMpdcchLst.count; node = param->ulMpdcchLst.last; while (node) { @@ -9827,10 +9520,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->ulMpdcchLst, &tfuPdcchInfo->lnk); tfuPdcchInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); #endif #ifdef LTEMAC_SPS /* SPS_NEW_CHGS */ - CMCHKPK(cmPkBool, param->isSPSOcc, mBuf); + CMCHKPK(oduPackBool, param->isSPSOcc, mBuf); #endif count = param->phichLst.count; node = param->phichLst.last; @@ -9841,7 +9534,7 @@ Buffer *mBuf; cmLListDelFrm(¶m->phichLst, &tfuPhichInfo->lnk); tfuPhichInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); count = param->dlPdcchLst.count; node = param->dlPdcchLst.last; while (node) { @@ -9851,7 +9544,7 @@ Buffer *mBuf; cmLListDelFrm(¶m->dlPdcchLst, &tfuPdcchInfo->lnk); tfuPdcchInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); count = param->ulPdcchLst.count; node = param->ulPdcchLst.last; while (node) { @@ -9864,12 +9557,12 @@ Buffer *mBuf; cmLListDelFrm(¶m->ulPdcchLst, &tfuPdcchInfo->lnk); tfuPdcchInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); - CMCHKPK(SPkU8, param->cfi, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); + CMCHKPK(oduUnpackUInt8, param->cfi, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->dlTiming, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->ulTiming, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -9917,9 +9610,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->ulTiming, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->dlTiming, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cfi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cfi, mBuf); cmLListInit(¶m->ulPdcchLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuPdcchInfo; } cmLListInit(¶m->dlPdcchLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuPdcchInfo; } cmLListInit(¶m->phichLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntisSPSOcc, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->isSPSOcc, mBuf); #endif #ifdef EMTC_ENABLE cmLListInit(¶m->ulMpdcchLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuPdcchInfo; } cmLListInit(¶m->dlMpdcchLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); printf("4. cmUnpkTfuCntrlReqInfo :: count %ld \n", count); for (loopCnt=0; loopCntu.format1AllocInfo, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->format, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->format, mBuf); + return ROK; } @@ -10102,7 +9795,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuPdschDciInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->format, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->format, mBuf); switch(param->format) { case TFU_DCI_FORMAT_1: CMCHKUNPK(cmUnpkTfuDciFormat1AllocInfo, ¶m->u.format1AllocInfo, mBuf); @@ -10148,9 +9841,9 @@ Buffer *mBuf; break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE @@ -10187,11 +9880,11 @@ Buffer *mBuf; for(idx=TFU_MAX_DL_SUBBAND-1;idx>=0; idx--) { for (idx2=param->numPhyAnt -1; idx2 >= 0; idx2--) { - CMCHKPK(SPkU16, param->bfValue[idx2], mBuf);} - CMCHKPK(SPkU8, param->numPhyAnt, mBuf); - CMCHKPK(SPkU8, param->sbIndex, mBuf); + CMCHKPK(oduUnpackUInt16, param->bfValue[idx2], mBuf);} + CMCHKPK(oduUnpackUInt8, param->numPhyAnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->sbIndex, mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -10226,13 +9919,13 @@ PUBLIC S16 cmUnpkTfuBfVectorInfo(param, mBuf) TRC3(cmUnpkTfuBfVectorInfo) for(idx=0;idxsbIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numPhyAnt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sbIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numPhyAnt, mBuf); for (idx2=0; idx2 numPhyAnt; idx2++) { - CMCHKUNPK(SUnpkU16, ¶m->bfValue[idx2], mBuf);} + CMCHKUNPK(oduPackUInt16, ¶m->bfValue[idx2], mBuf);} } - RETVALUE(ROK); + return ROK; } #endif @@ -10273,29 +9966,29 @@ Buffer *mBuf; TRC3(cmPkTfuDatReqPduInfo) /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKPK(SPkU8, param->isEnbSFR, mBuf); + CMCHKPK(oduUnpackUInt8, param->isEnbSFR, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKPK(SPkU16, param->txPwrOffset, mBuf); + CMCHKPK(oduUnpackUInt16, param->txPwrOffset, mBuf); if(param->transMode == TFU_UE_TM_7) { CMCHKPK(cmPkTfuBfVectorInfo, param->bfVector, mBuf); - CMCHKPK(SPkU8, param->numBfVectors, mBuf); - CMCHKPK(SPkU8, param->numBfPrbPerSb, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBfVectors, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBfPrbPerSb, mBuf); } - CMCHKPK(SPkU8, param->deltaPowOffIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->deltaPowOffIdx, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKPK(SPkU8, param->pa, mBuf); + CMCHKPK(oduUnpackUInt8, param->pa, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKPK(SPkU8, param->numLayers, mBuf); + CMCHKPK(oduUnpackUInt8, param->numLayers, mBuf); #endif - CMCHKPK(cmPkBool, param->isTApres, mBuf); + CMCHKPK(oduPackBool, param->isTApres, mBuf); CMCHKPK(cmPkTknU32, ¶m->doa, mBuf); - CMCHKPK(SPkU32, param->transMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->transMode, mBuf); CMCHKPK(cmPkTfuDlCqiPuschInfo, ¶m->puschPmiInfo, mBuf); - CMCHKPK(SPkU8, param->puschRptUsd, mBuf); + CMCHKPK(oduUnpackUInt8, param->puschRptUsd, mBuf); for (i = 0; i < TFU_MAX_TB; i++) { #ifndef L2_OPTMZ @@ -10335,21 +10028,21 @@ Buffer *mBuf; mBuf); } - CMCHKPK(SPkU32, param->tbInfo[i].lchInfo[lchIdx].numPdu, mBuf); + CMCHKPK(oduUnpackUInt32, param->tbInfo[i].lchInfo[lchIdx].numPdu, mBuf); } - CMCHKPK(SPkU32, param->tbInfo[i].numLch, mBuf); - CMCHKPK(SPkU32, param->tbInfo[i].padSize, mBuf); + CMCHKPK(oduUnpackUInt32, param->tbInfo[i].numLch, mBuf); + CMCHKPK(oduUnpackUInt32, param->tbInfo[i].padSize, mBuf); CMCHKPK(cmPkBuffer, ¶m->tbInfo[i].macCes, mBuf); CMCHKPK(cmPkBuffer, ¶m->tbInfo[i].macHdr, mBuf); CMCHKPK(cmPkMsgLen, param->tbInfo[i].tbSize, mBuf); - CMCHKPK(cmPkBool, param->tbInfo[i].tbPres, mBuf); + CMCHKPK(oduPackBool, param->tbInfo[i].tbPres, mBuf); #endif } - CMCHKPK(SPkU8, tbMask, mBuf); - CMCHKPK(SPkU8, param->nmbOfTBs, mBuf); + CMCHKPK(oduUnpackUInt8, tbMask, mBuf); + CMCHKPK(oduUnpackUInt8, param->nmbOfTBs, mBuf); CMCHKPK(cmPkTfuPdschDciInfo, ¶m->dciInfo, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10391,9 +10084,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(cmUnpkTfuPdschDciInfo, ¶m->dciInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nmbOfTBs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbOfTBs, mBuf); - CMCHKUNPK(SUnpkU8, &tbMask, mBuf); + CMCHKUNPK(oduPackUInt8, &tbMask, mBuf); for (i=0; imBuf[i] = NULLP; } #else /* L2_OPTMZ*/ - CMCHKUNPK(cmUnpkBool, ¶m->tbInfo[i].tbPres, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->tbInfo[i].tbPres, mBuf); CMCHKUNPK(cmUnpkMsgLen, ¶m->tbInfo[i].tbSize, mBuf); CMCHKUNPK(cmUnpkBuffer, ¶m->tbInfo[i].macHdr, mBuf); CMCHKUNPK(cmUnpkBuffer, ¶m->tbInfo[i].macCes, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->tbInfo[i].padSize, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->tbInfo[i].numLch, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->tbInfo[i].padSize, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->tbInfo[i].numLch, mBuf); for(lchIdx = 0; lchIdx < param->tbInfo[i].numLch; lchIdx++) { - CMCHKUNPK(SUnpkU32, (U32 *)¶m->tbInfo[i].lchInfo[lchIdx].numPdu, + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->tbInfo[i].lchInfo[lchIdx].numPdu, mBuf); for(pduIdx = 0; pduIdx < param->tbInfo[i].lchInfo[lchIdx].numPdu; pduIdx++) @@ -10433,32 +10126,32 @@ Buffer *mBuf; #endif /* L2_OPTMZ*/ } - CMCHKUNPK(SUnpkU8, ¶m->puschRptUsd, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->puschRptUsd, mBuf); CMCHKUNPK(cmUnpkTfuDlCqiPuschInfo, ¶m->puschPmiInfo, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->transMode, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->transMode, mBuf); CMCHKUNPK(cmUnpkTknU32, ¶m->doa, mBuf); - CMCHKUNPK(cmUnpkBool, ¶m->isTApres, mBuf); + CMCHKUNPK(oduUnpackBool, ¶m->isTApres, mBuf); /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE - CMCHKUNPK(SUnpkU8, ¶m->numLayers, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numLayers, mBuf); /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKUNPK(SUnpkU8, ¶m->pa, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pa, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - CMCHKUNPK(SUnpkU8, ¶m->deltaPowOffIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->deltaPowOffIdx, mBuf); if(param->transMode == TFU_UE_TM_7) { - CMCHKUNPK(SUnpkU8, ¶m->numBfPrbPerSb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numBfVectors, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBfPrbPerSb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBfVectors, mBuf); CMCHKUNPK(cmUnpkTfuBfVectorInfo, param->bfVector, mBuf); } - CMCHKUNPK(SUnpkU16, ¶m->txPwrOffset, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->txPwrOffset, mBuf); #endif /* LTE_ADV_FLAG_REMOVED_START */ - CMCHKUNPK(SUnpkU8, ¶m->isEnbSFR, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isEnbSFR, mBuf); /* LTE_ADV_FLAG_REMOVED_END */ - RETVALUE(ROK); + return ROK; } @@ -10509,11 +10202,11 @@ Buffer *mBuf; cmLListDelFrm(¶m->pdus, &tfuDatReqPduInfo->lnk); tfuDatReqPduInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkTknBuf, ¶m->bchDat, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10560,14 +10253,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKUNPK(cmUnpkTknBuf, ¶m->bchDat, &mBuf); cmLListInit(¶m->pdus); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntpdus, &tfuDatReqPduInfo->lnk); tfuDatReqPduInfo->lnk.node = (PTR)tfuDatReqPduInfo; } - RETVALUE(ROK); + return ROK; } @@ -10604,7 +10297,7 @@ Buffer *mBuf; CMCHKPK(cmPkBuffer, ¶m->mBuf, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10641,7 +10334,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(cmUnpkBuffer, ¶m->mBuf, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10683,8 +10376,8 @@ Buffer *mBuf; TRC3(cmPkTfuDatIndInfo) #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->sccIdx, mBuf); - CMCHKPK(SPkU8, param->sectorId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->sectorId, mBuf); #endif /* TFU_5GTF */ count = param->datIndLst.count; node = param->datIndLst.last; @@ -10695,10 +10388,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->datIndLst, &tfuDatInfo->lnk); tfuDatInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10743,7 +10436,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->datIndLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuDatInfo; } #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->sectorId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sccIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sectorId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sccIdx, mBuf); #endif /* TFU_5GTF */ - RETVALUE(ROK); + return ROK; } @@ -10793,7 +10486,7 @@ Buffer *mBuf; TRC3(cmPkTfuSrInfo) CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10832,7 +10525,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuSrInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10881,10 +10574,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->srLst, &tfuSrInfo->lnk); tfuSrInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -10928,14 +10621,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->srLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntsrLst, &tfuSrInfo->lnk); tfuSrInfo->lnk.node = (PTR)tfuSrInfo; } - RETVALUE(ROK); + return ROK; } /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ @@ -10973,18 +10666,18 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuHqInfo) - CMCHKPK(SPkU8, param->isPusch, mBuf); + CMCHKPK(oduUnpackUInt8, param->isPusch, mBuf); for (i=TFU_MAX_HARQ_FDBKS-1; i >= 0; i--) { - CMCHKPK(SPkU32, param->isAck[i], mBuf); + CMCHKPK(oduUnpackUInt32, param->isAck[i], mBuf); } #ifdef TFU_TDD - CMCHKPK(SPkU8, param->M, mBuf); + CMCHKPK(oduUnpackUInt8, param->M, mBuf); #endif/*TFU_TDD*/ - CMCHKPK(SPkU8, param->noOfTbs, mBuf); + CMCHKPK(oduUnpackUInt8, param->noOfTbs, mBuf); /* ACC-TDD ccpu00130520 */ - CMCHKPK(SPkU32, param->hqFdbkMode, mBuf); + CMCHKPK(oduUnpackUInt32, param->hqFdbkMode, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } /* tfu_c_001.main_7. Added changes of TFU_UPGRADE */ @@ -11023,16 +10716,16 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); /* ACC-TDD ccpu00130520 */ - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqFdbkMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->noOfTbs, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->noOfTbs, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->M, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->M, mBuf); #endif for (i=0; iisAck[i], mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->isAck[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->isPusch, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->isPusch, mBuf); + return ROK; } @@ -11084,10 +10777,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->hqIndLst, &tfuHqInfo->lnk); tfuHqInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11132,14 +10825,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->hqIndLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCnthqIndLst, &tfuHqInfo->lnk); tfuHqInfo->lnk.node = (PTR)tfuHqInfo; } - RETVALUE(ROK); + return ROK; } @@ -11175,7 +10868,7 @@ Buffer *mBuf; TRC3(cmPkTfuUlCqiInfo) CMCHKPK(cmPkTfuSubbandCqiInfo, ¶m->subbandCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11211,7 +10904,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuUlCqiInfo) CMCHKUNPK(cmUnpkTfuSubbandCqiInfo, ¶m->subbandCqi, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11251,11 +10944,11 @@ Buffer *mBuf; for (i=TFU_MAX_UL_SUBBAND-1; i >= 0; i--) { CMCHKPK(cmPkTfuUlCqiInfo, ¶m->ulCqiInfoArr[i], mBuf); } - CMCHKPK(SPkU8, param->numSubband, mBuf); - CMCHKPK(SPkU8, param->wideCqi, mBuf); - CMCHKPK(SPkU8, param->isTxPort0, mBuf); + CMCHKPK(oduUnpackUInt8, param->numSubband, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->isTxPort0, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11293,13 +10986,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuUlCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isTxPort0, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->wideCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numSubband, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isTxPort0, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numSubband, mBuf); for (i=0; iulCqiInfoArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -11351,10 +11044,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->ulCqiRpt, &tfuUlCqiRpt->lnk); tfuUlCqiRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11401,14 +11094,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->ulCqiRpt); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntulCqiRpt, &tfuUlCqiRpt->lnk); tfuUlCqiRpt->lnk.node = (PTR)tfuUlCqiRpt; } - RETVALUE(ROK); + return ROK; } @@ -11447,10 +11140,10 @@ Buffer *mBuf; TRC3(cmPkTfuDlCqiRpt) if (cmPkTfuDlCqiInfo(param->isPucchInfo, ¶m->dlCqiInfo, mBuf) != ROK) - RETVALUE(RFAILED); - CMCHKPK(SPkU8, param->isPucchInfo, mBuf); + return RFAILED; + CMCHKPK(oduUnpackUInt8, param->isPucchInfo, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11488,10 +11181,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuDlCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isPucchInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isPucchInfo, mBuf); if (cmUnpkTfuDlCqiInfo (param->isPucchInfo, ¶m->dlCqiInfo, mBuf) != ROK) - RETVALUE(RFAILED); - RETVALUE(ROK); + return RFAILED; + return ROK; } @@ -11541,10 +11234,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->dlCqiRptsLst, &tfuDlCqiRpt->lnk); tfuDlCqiRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11589,14 +11282,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->dlCqiRptsLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntdlCqiRptsLst, &tfuDlCqiRpt->lnk); tfuDlCqiRpt->lnk.node = (PTR)tfuDlCqiRpt; } - RETVALUE(ROK); + return ROK; } @@ -11633,9 +11326,9 @@ Buffer *mBuf; TRC3(cmPkTfuCrcInfo) CMCHKPK(cmPkTknU8, ¶m->rv, mBuf); - CMCHKPK(SPkU8, param->isFailure, mBuf); + CMCHKPK(oduUnpackUInt8, param->isFailure, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11672,9 +11365,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuCrcInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isFailure, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isFailure, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->rv, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11717,8 +11410,8 @@ Buffer *mBuf; TRC3(cmPkTfuCrcIndInfo) #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->sccIdx, mBuf); - CMCHKPK(SPkU8, param->sectorId, mBuf); + CMCHKPK(oduUnpackUInt8, param->sccIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->sectorId, mBuf); #endif /* TFU_5GTF */ count = param->crcLst.count; node = param->crcLst.last; @@ -11729,10 +11422,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->crcLst, &tfuCrcIndInfo->lnk); tfuCrcIndInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11778,7 +11471,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->crcLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntlnk.node = (PTR)tfuCrcIndInfo; } #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->sectorId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->sccIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sectorId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->sccIdx, mBuf); #endif /* TFU_5GTF */ - RETVALUE(ROK); + return ROK; } @@ -11825,9 +11518,9 @@ Buffer *mBuf; TRC3(cmPkTfuTimingAdvInfo) - CMCHKPK(SPkU8, param->timingAdv, mBuf); + CMCHKPK(oduUnpackUInt8, param->timingAdv, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11864,8 +11557,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuTimingAdvInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->timingAdv, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->timingAdv, mBuf); + return ROK; } @@ -11915,10 +11608,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->timingAdvLst, &tfuTimingAdvInfo->lnk); tfuTimingAdvInfo->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -11963,14 +11656,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->timingAdvLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCnttimingAdvLst, &tfuTimingAdvInfo->lnk); tfuTimingAdvInfo->lnk.node = (PTR)tfuTimingAdvInfo; } - RETVALUE(ROK); + return ROK; } /*CA dev Start*/ @@ -12006,13 +11699,13 @@ Buffer *mBuf; TRC3(cmPkTfuTtiCellInfo) - CMCHKPK(SPkU8, param->ulBlankSf, mBuf); - CMCHKPK(SPkU8, param->dlBlankSf, mBuf); - CMCHKPK(SPkU8, param->schTickDelta, mBuf); - CMCHKPK(cmPkBool, param->isDummyTti, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulBlankSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->dlBlankSf, mBuf); + CMCHKPK(oduUnpackUInt8, param->schTickDelta, mBuf); + CMCHKPK(oduPackBool, param->isDummyTti, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*CA dev End*/ @@ -12052,9 +11745,9 @@ Buffer *mBuf; for (i=(param->numCells-1); i >= 0; i--) { CMCHKPK(cmPkTfuTtiCellInfo, ¶m->cells[i], mBuf); } - CMCHKPK(SPkU8, param->numCells, mBuf); + CMCHKPK(oduUnpackUInt8, param->numCells, mBuf); /*CA dev End*/ - RETVALUE(ROK); + return ROK; } /* CA dev Start */ @@ -12092,58 +11785,15 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); - CMCHKUNPK(cmUnpkBool, ¶m->isDummyTti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->schTickDelta, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->dlBlankSf, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulBlankSf, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduUnpackBool, ¶m->isDummyTti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->schTickDelta, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->dlBlankSf, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulBlankSf, mBuf); + return ROK; } /* CA dev End */ -/*********************************************************** -* -* Func : cmUnpkTfuTtiIndInfo -* -* -* Desc : This structure contains information that is passed as a part of the TTI - * indication sent from PHY to MAC. -* -* -* Ret : S16 -* -* Notes: -* -* File : -* -**********************************************************/ -#ifdef ANSI -PUBLIC S16 cmUnpkTfuTtiIndInfo -( -TfuTtiIndInfo *param, -Buffer *mBuf -) -#else -PUBLIC S16 cmUnpkTfuTtiIndInfo(param, mBuf) -TfuTtiIndInfo *param; -Buffer *mBuf; -#endif -{ - - S32 i; - TRC3(cmUnpkTfuTtiIndInfo) - - /* CA dev Start */ - CMCHKUNPK(SUnpkU8, ¶m->numCells, mBuf); - for (i=0; i<(param->numCells); i++) { - CMCHKUNPK(cmUnpkTfuTtiCellInfo, ¶m->cells[i], mBuf); - } - /* CA dev End */ - RETVALUE(ROK); -} - - - /*********************************************************** * * Func : cmPkTfuRaReqInfo @@ -12180,12 +11830,12 @@ Buffer *mBuf; TRC3(cmPkTfuRaReqInfo) - CMCHKPK(SPkU8, param->cqiIdx, mBuf); - CMCHKPK(SPkU8, param->cqiPres, mBuf); - CMCHKPK(SPkU8, param->tpc, mBuf); - CMCHKPK(SPkU16, param->ta, mBuf); - CMCHKPK(SPkU8, param->rapId, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cqiIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->tpc, mBuf); + CMCHKPK(oduUnpackUInt16, param->ta, mBuf); + CMCHKPK(oduUnpackUInt8, param->rapId, mBuf); + return ROK; } @@ -12226,12 +11876,12 @@ Buffer *mBuf; TRC3(cmUnpkTfuRaReqInfo) - CMCHKUNPK(SUnpkU8, ¶m->rapId, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->ta, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->tpc, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiPres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->rapId, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->ta, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->tpc, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx, mBuf); + return ROK; } @@ -12274,17 +11924,17 @@ Buffer *mBuf; CMCHKPK(cmPkTfuRaReqInfo, &(param->raReqInfoArr[i]), mBuf); } #ifdef PRACH_5GTF - CMCHKPK(SPkU16, param->nPwrFactor, mBuf); - CMCHKPK(SPkU8, param->nPRACHSymbIndex, mBuf); - CMCHKPK(SPkU8, param->nf1Value, mBuf); - CMCHKPK(SPkU8, param->nCyclicShift, mBuf); - CMCHKPK(SPkU8, param->nRootSeq, mBuf); - CMCHKPK(SPkU8, param->nPRACHConfiguration, mBuf); - CMCHKPK(SPkU8, param->nPreambleFormat, mBuf); -#endif - CMCHKPK(SPkU8, param->numRaReqInfo, mBuf); + CMCHKPK(oduUnpackUInt16, param->nPwrFactor, mBuf); + CMCHKPK(oduUnpackUInt8, param->nPRACHSymbIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->nf1Value, mBuf); + CMCHKPK(oduUnpackUInt8, param->nCyclicShift, mBuf); + CMCHKPK(oduUnpackUInt8, param->nRootSeq, mBuf); + CMCHKPK(oduUnpackUInt8, param->nPRACHConfiguration, mBuf); + CMCHKPK(oduUnpackUInt8, param->nPreambleFormat, mBuf); +#endif + CMCHKPK(oduUnpackUInt8, param->numRaReqInfo, mBuf); CMCHKPK(cmPkLteRnti, param->raRnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12324,25 +11974,25 @@ Buffer *mBuf; TRC3(cmUnpkTfuRachInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->raRnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRaReqInfo, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRaReqInfo, mBuf); #ifdef PRACH_5GTF - CMCHKUNPK(SPkU8, param->nPreambleFormat, mBuf); - CMCHKUNPK(SPkU8, param->nPRACHConfiguration, mBuf); - CMCHKUNPK(SPkU8, param->nRootSeq, mBuf); - CMCHKUNPK(SPkU8, param->nCyclicShift, mBuf); - CMCHKUNPK(SPkU8, param->nf1Value, mBuf); - CMCHKUNPK(SPkU8, param->nPRACHSymbIndex, mBuf); - CMCHKUNPK(SPkU16, param->nPwrFactor, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nPreambleFormat, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nPRACHConfiguration, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nRootSeq, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nCyclicShift, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nf1Value, mBuf); + CMCHKUNPK(oduUnpackUInt8, param->nPRACHSymbIndex, mBuf); + CMCHKUNPK(oduUnpackUInt16, param->nPwrFactor, mBuf); #endif if (cmGetMem (&(memCp), (sizeof(TfuRaReqInfo) * param->numRaReqInfo), (Ptr *)¶m->raReqInfoArr) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for (i=0; inumRaReqInfo; i++) { CMCHKUNPK(cmUnpkTfuRaReqInfo, ¶m->raReqInfoArr[i], mBuf); } - RETVALUE(ROK); + return ROK; } @@ -12397,13 +12047,13 @@ Buffer *mBuf; if (ROK != cmPkTfuRachInfo(param->memCp, &(param->rachInfoArr[i]), mBuf)) { - RETVALUE(RFAILED); + return RFAILED; } } - CMCHKPK(SPkU8, param->nmbOfRaRnti, mBuf); + CMCHKPK(oduUnpackUInt8, param->nmbOfRaRnti, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12455,20 +12105,20 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nmbOfRaRnti, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nmbOfRaRnti, mBuf); if (cmGetMem (&(param->memCp), (sizeof(TfuRachInfo) * param->nmbOfRaRnti), (Ptr *)¶m->rachInfoArr) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } for (i=0; inmbOfRaRnti; i++) { if (ROK != cmUnpkTfuRachInfo(param->memCp, ¶m->rachInfoArr[i], mBuf)) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } @@ -12505,7 +12155,7 @@ Buffer *mBuf; CMCHKPK(SPkS8, param->pucchDeltaPwr, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12542,7 +12192,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); CMCHKUNPK(SUnpkS8, ¶m->pucchDeltaPwr, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12593,10 +12243,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->pucchDeltaPwrLst, &tfuPucchDeltaPwr->lnk); tfuPucchDeltaPwr->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12642,14 +12292,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->pucchDeltaPwrLst); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntpucchDeltaPwrLst, &tfuPucchDeltaPwr->lnk); tfuPucchDeltaPwr->lnk.node = (PTR)tfuPucchDeltaPwr; } - RETVALUE(ROK); + return ROK; } #ifdef ANSI @@ -12667,13 +12317,13 @@ Buffer *mBuf; MsgLen msgLen=0; TRC3(cmPkBuffer) if (SFndLenMsg(*param, &msgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SCatMsg(mBuf, *param, M1M2) != ROK) - RETVALUE(RFAILED); + return RFAILED; TFU_FREE_MSG(*param); *param = NULLP; CMCHKPK(cmPkMsgLen, msgLen, mBuf); - RETVALUE(ROK); + return ROK; } #ifdef ANSI PUBLIC S16 cmUnpkBuffer @@ -12691,10 +12341,10 @@ Buffer *mBuf; TRC3(cmUnpkBuffer) CMCHKUNPK(cmUnpkMsgLen, &msgLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) - RETVALUE(RFAILED); + return RFAILED; if (SSegMsg(mBuf, totalMsgLen-msgLen, param) != ROK) - RETVALUE(RFAILED); - RETVALUE(ROK); + return RFAILED; + return ROK; } @@ -12743,7 +12393,7 @@ TfuDoaIndInfo * doaInd; (ErrVal)ETFU125, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)doaInd, sizeof(TfuDoaIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } cmPkTfuDoaIndInfo(doaInd, mBuf); if (SPkS16(suId, mBuf) != ROK) { @@ -12754,11 +12404,11 @@ TfuDoaIndInfo * doaInd; #endif TFU_FREE_MEM(doaInd); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } TFU_FREE_MEM(doaInd); pst->event = (Event) EVTTFUDOAIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -12809,7 +12459,7 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU127, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } { Mem sMem; @@ -12822,13 +12472,13 @@ Buffer *mBuf; (ErrVal)ETFU128, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } cmUnpkTfuDoaIndInfo(doaInd, (Ptr)&doaInd->memCp, mBuf); TFU_FREE_MSG(mBuf); - RETVALUE((*func)(pst, suId, doaInd)); + return ((*func)(pst, suId, doaInd)); } @@ -12864,10 +12514,10 @@ Buffer *mBuf; TRC3(cmPkTfuDciFormatTbInfo) - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + return ROK; } @@ -12903,10 +12553,10 @@ Buffer *mBuf; TRC3(cmUnpkTfuDciFormatTbInfo) - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + return ROK; } @@ -12943,10 +12593,10 @@ Buffer *mBuf; TRC3(cmPkTfuSubbandDlCqiInfo) for (i=TFU_MAX_TB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqiIdx[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiIdx[i], mBuf); } CMCHKPK(cmPkTfuSubbandInfo, ¶m->subband, mBuf); - RETVALUE(ROK); + return ROK; } @@ -12984,9 +12634,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuSubbandInfo, ¶m->subband, mBuf); for (i=0; icqiIdx[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiIdx[i], mBuf); } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -13031,10 +12681,10 @@ Buffer *mBuf; CMCHKPK(cmPkTfuCqiPuschMode12, ¶m->u.mode12Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->mode, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->mode, mBuf); + return ROK; } @@ -13070,7 +12720,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuDlCqiPuschInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->mode, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); switch(param->mode) { case TFU_PUSCH_CQI_MODE_12: CMCHKUNPK(cmUnpkTfuCqiPuschMode12, ¶m->u.mode12Info, mBuf); @@ -13082,9 +12732,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuCqiPuschMode31, ¶m->u.mode31Info, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -13118,9 +12768,9 @@ Buffer *mBuf; TRC3(cmPkTfuDoaRpt) - CMCHKPK(SPkU32, param->doa, mBuf); + CMCHKPK(oduUnpackUInt32, param->doa, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13157,8 +12807,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuDoaRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU32, ¶m->doa, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, ¶m->doa, mBuf); + return ROK; } @@ -13209,9 +12859,9 @@ Buffer *mBuf; cmLListDelFrm(¶m->doaRpt, &tfuDoaRpt->lnk); tfuDoaRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13256,14 +12906,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); cmLListInit(¶m->doaRpt); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntdoaRpt, &tfuDoaRpt->lnk); tfuDoaRpt->lnk.node = (PTR)tfuDoaRpt; } - RETVALUE(ROK); + return ROK; } @@ -13304,17 +12954,17 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuSrsRpt) - CMCHKPK(SPkU8, param->wideCqi, mBuf); - CMCHKPK(SPkU8, param->wideCqiPres, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->wideCqiPres, mBuf); for (i=TFU_MAX_UL_RB-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->snr[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->snr[i], mBuf); } - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->numRbs, mBuf); - CMCHKPK(SPkU16, param->ta, mBuf); - CMCHKPK(SPkU16, param->dopEst, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRbs, mBuf); + CMCHKPK(oduUnpackUInt16, param->ta, mBuf); + CMCHKPK(oduUnpackUInt16, param->dopEst, mBuf); CMCHKPK(cmPkLteRnti, param->ueId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13353,16 +13003,16 @@ Buffer *mBuf; TRC3(cmUnpkTfuSrsRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->ueId, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->dopEst, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->ta, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRbs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->dopEst, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->ta, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRbs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); for (i=0; isnr[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->snr[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->wideCqiPres, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->wideCqi, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->wideCqiPres, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->wideCqi, mBuf); + return ROK; } @@ -13414,10 +13064,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->srsRpt, &tfuSrsRpt->lnk); tfuSrsRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13464,14 +13114,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->srsRpt); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntsrsRpt, &tfuSrsRpt->lnk); tfuSrsRpt->lnk.node = (PTR)tfuSrsRpt; } - RETVALUE(ROK); + return ROK; } @@ -13512,19 +13162,19 @@ Buffer *mBuf; TRC3(cmPkTfuRawCqiRpt) #ifdef TFU_5GTF - CMCHKPK(SPkU32, param->uciPayload, mBuf); + CMCHKPK(oduUnpackUInt32, param->uciPayload, mBuf); #else S32 i; for (i=CM_LTE_MAX_CELLS-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->ri[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->ri[i], mBuf); } for (i=TFU_MAX_CQI_BYTES-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->cqiBits[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiBits[i], mBuf); } #endif - CMCHKPK(SPkU8, param->numBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBits, mBuf); CMCHKPK(cmPkLteRnti, param->crnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13566,19 +13216,19 @@ Buffer *mBuf; TRC3(cmUnpkTfuRawCqiRpt) CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBits, mBuf); #ifndef TFU_5GTF S32 i; for (i=0; icqiBits[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiBits[i], mBuf); } for (i=0; iri[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ri[i], mBuf); } #else - CMCHKUNPK(SUnpkU32, ¶m->uciPayload, mBuf); + CMCHKUNPK(oduPackUInt32, ¶m->uciPayload, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -13629,10 +13279,10 @@ Buffer *mBuf; cmLListDelFrm(¶m->rawCqiRpt, &tfuRawCqiRpt->lnk); tfuRawCqiRpt->lnk.node = (PTR)NULLP; } - CMCHKPK(SPkU32, count, mBuf); + CMCHKPK(oduUnpackUInt32, count, mBuf); CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13678,14 +13328,14 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); cmLListInit(¶m->rawCqiRpt); - CMCHKUNPK(SUnpkU32, &count, mBuf); + CMCHKUNPK(oduPackUInt32, &count, mBuf); for (loopCnt=0; loopCntrawCqiRpt, &tfuRawCqiRpt->lnk); tfuRawCqiRpt->lnk.node = (PTR)tfuRawCqiRpt; } - RETVALUE(ROK); + return ROK; } @@ -13726,14 +13376,14 @@ Buffer *mBuf; S32 i; TRC3(cmPkTfuUePucchHqRecpInfo) - CMCHKPK(SPkU8, param->a, mBuf); + CMCHKPK(oduUnpackUInt8, param->a, mBuf); for (i=TFU_MAX_HQ_RES-1; i >= 0; i--) { - CMCHKPK(SPkU16, param->hqRes[i], mBuf); + CMCHKPK(oduUnpackUInt16, param->hqRes[i], mBuf); } - CMCHKPK(SPkU8, param->pucchResCnt, mBuf); - CMCHKPK(SPkU8, param->hqSz, mBuf); - CMCHKPK(SPkU32, param->hqFdbkMode, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->pucchResCnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqSz, mBuf); + CMCHKPK(oduUnpackUInt32, param->hqFdbkMode, mBuf); + return ROK; } @@ -13770,14 +13420,14 @@ Buffer *mBuf; S32 i; TRC3(cmUnpkTfuUePucchHqRecpInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqFdbkMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hqSz, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchResCnt, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchResCnt, mBuf); for (i=0; ihqRes[i], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->hqRes[i], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->a, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->a, mBuf); + return ROK; } @@ -13823,16 +13473,16 @@ Buffer *mBuf; #ifdef LTE_ADV S32 idx; for (idx=(TFU_MAX_HQ_RES-1); idx >= 0; idx--) { - CMCHKPK(SPkU16, param->hqRes[idx], mBuf); + CMCHKPK(oduUnpackUInt16, param->hqRes[idx], mBuf); } #else - CMCHKPK(SPkU16, param->hqRes[0], mBuf); + CMCHKPK(oduUnpackUInt16, param->hqRes[0], mBuf); #endif - CMCHKPK(SPkU8, param->pucchResCnt, mBuf); - CMCHKPK(SPkU8, param->hqSz, mBuf); - CMCHKPK(SPkU32, param->hqFdbkMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchResCnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqSz, mBuf); + CMCHKPK(oduUnpackUInt32, param->hqFdbkMode, mBuf); - RETVALUE(ROK); + return ROK; } @@ -13867,19 +13517,19 @@ Buffer *mBuf; { TRC3(cmUnpkTfuUePucchHqRecpInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqFdbkMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hqSz, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchResCnt, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchResCnt, mBuf); #ifdef LTE_ADV S32 idx; for (idx=0; idxhqRes[idx], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->hqRes[idx], mBuf); } #else - CMCHKUNPK(SUnpkU16, ¶m->hqRes[0], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->hqRes[0], mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -13919,8 +13569,8 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchSrRecpInfo) - CMCHKPK(SPkU16, param->n1PucchIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt16, param->n1PucchIdx, mBuf); + return ROK; } @@ -13956,8 +13606,8 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchSrRecpInfo) - CMCHKUNPK(SUnpkU16, ¶m->n1PucchIdx, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->n1PucchIdx, mBuf); + return ROK; } @@ -13993,9 +13643,9 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchCqiRecpInfo) - CMCHKPK(SPkU8, param->cqiPmiSz, mBuf); - CMCHKPK(SPkU16, param->n2PucchIdx, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cqiPmiSz, mBuf); + CMCHKPK(oduUnpackUInt16, param->n2PucchIdx, mBuf); + return ROK; } @@ -14031,9 +13681,9 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchCqiRecpInfo) - CMCHKUNPK(SUnpkU16, ¶m->n2PucchIdx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiPmiSz, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt16, ¶m->n2PucchIdx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPmiSz, mBuf); + return ROK; } @@ -14069,13 +13719,13 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchSrsRecpInfo) - CMCHKPK(SPkU32, param->srsCyclicShft, mBuf); - CMCHKPK(SPkU16, param->srsCfgIdx, mBuf); - CMCHKPK(SPkU8, param->transComb, mBuf); - CMCHKPK(SPkU32, param->srsHopBw, mBuf); - CMCHKPK(SPkU8, param->nRrc, mBuf); - CMCHKPK(SPkU32, param->srsBw, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->srsCyclicShft, mBuf); + CMCHKPK(oduUnpackUInt16, param->srsCfgIdx, mBuf); + CMCHKPK(oduUnpackUInt8, param->transComb, mBuf); + CMCHKPK(oduUnpackUInt32, param->srsHopBw, mBuf); + CMCHKPK(oduUnpackUInt8, param->nRrc, mBuf); + CMCHKPK(oduUnpackUInt32, param->srsBw, mBuf); + return ROK; } #ifdef TFU_5GTF @@ -14094,10 +13744,10 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchUciRecpInfo) - CMCHKPK(SPkU8, param->SCID, mBuf); - CMCHKPK(SPkU8, param->pucchIndex, mBuf); - CMCHKPK(SPkU8, param->numBits, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->numBits, mBuf); + return ROK; } #endif @@ -14133,13 +13783,13 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchSrsRecpInfo) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->srsBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nRrc, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->srsHopBw, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->transComb, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->srsCfgIdx, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->srsCyclicShft, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->srsBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nRrc, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->srsHopBw, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->transComb, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->srsCfgIdx, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->srsCyclicShft, mBuf); + return ROK; } #ifdef TFU_5GTF @@ -14174,12 +13824,12 @@ Buffer *mBuf; TRC3(cmPkTfuUePucchBsiBriRecpInfo) - CMCHKPK(SPkU8, param->briRpt, mBuf); - CMCHKPK(SPkU8, param->bsiRpt, mBuf); - CMCHKPK(SPkU8, param->SCID, mBuf); - CMCHKPK(SPkU8, param->pucchIndex, mBuf); - CMCHKPK(SPkU8, param->puschFlag, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->briRpt, mBuf); + CMCHKPK(oduUnpackUInt8, param->bsiRpt, mBuf); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); + CMCHKPK(oduUnpackUInt8, param->pucchIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->puschFlag, mBuf); + return ROK; } /*********************************************************** @@ -14213,12 +13863,12 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchBsiBriRecpInfo) - CMCHKUNPK(SUnpkU8, ¶m->puschFlag, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->bsiRpt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->briRpt, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->puschFlag, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->bsiRpt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->briRpt, mBuf); + return ROK; } #endif @@ -14238,11 +13888,11 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchUciRecpInfo) - CMCHKUNPK(SUnpkU8, ¶m->numBits, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->pucchIndex, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->pucchIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); - RETVALUE(ROK); + return ROK; } #endif @@ -14297,8 +13947,8 @@ Buffer *mBuf; CMCHKPK(cmPkTfuUePucchHqRecpInfo, ¶m->hqInfo, mBuf); CMCHKPK(cmPkTfuUePucchSrRecpInfo, ¶m->srInfo, mBuf); CMCHKPK(cmPkTfuUePucchCqiRecpInfo, ¶m->cqiInfo, mBuf); - CMCHKPK(SPkU32, param->uciInfo, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->uciInfo, mBuf); + return ROK; } @@ -14345,7 +13995,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePucchRecpReq) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->uciInfo, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->uciInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchCqiRecpInfo, ¶m->cqiInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchSrRecpInfo, ¶m->srInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchHqRecpInfo, ¶m->hqInfo, mBuf); @@ -14354,7 +14004,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuUePucchUciRecpInfo, ¶m->uciPduInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchBsiBriRecpInfo, ¶m->bsiBriInfo, mBuf); #endif /* TFU_5GTF */ - RETVALUE(ROK); + return ROK; } @@ -14390,32 +14040,32 @@ Buffer *mBuf; TRC3(cmPkTfuUeUlSchRecpInfo) #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->beamIndex, mBuf); - CMCHKPK(SPkU8, param->uciWoTBFlag, mBuf); - CMCHKPK(SPkU8, param->PMI, mBuf); - CMCHKPK(SPkU8, param->SCID, mBuf); - CMCHKPK(SPkU8, param->nAntPortLayer, mBuf); - CMCHKPK(SPkU8, param->xPUSCHRange, mBuf); - CMCHKPK(SPkU8, param->numRbg, mBuf); - CMCHKPK(SPkU8, param->rbgStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->beamIndex, mBuf); + CMCHKPK(oduUnpackUInt8, param->uciWoTBFlag, mBuf); + CMCHKPK(oduUnpackUInt8, param->PMI, mBuf); + CMCHKPK(oduUnpackUInt8, param->SCID, mBuf); + CMCHKPK(oduUnpackUInt8, param->nAntPortLayer, mBuf); + CMCHKPK(oduUnpackUInt8, param->xPUSCHRange, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRbg, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbgStart, mBuf); #endif - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->nSrs, mBuf); - CMCHKPK(SPkU8, param->crntTxNb, mBuf); - CMCHKPK(SPkU8, param->txMode, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->isRtx, mBuf); - CMCHKPK(SPkU8, param->hoppingBits, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - CMCHKPK(SPkU8, param->nDmrs, mBuf); - CMCHKPK(SPkU32, param->modType, mBuf); - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU16, param->size, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->nSrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->crntTxNb, mBuf); + CMCHKPK(oduUnpackUInt8, param->txMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->isRtx, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt32, param->modType, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); - RETVALUE(ROK); + return ROK; } @@ -14451,32 +14101,32 @@ Buffer *mBuf; TRC3(cmUnpkTfuUeUlSchRecpInfo) - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->modType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hoppingBits, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isRtx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->txMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->crntTxNb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nSrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->modType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isRtx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->txMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->crntTxNb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nSrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->rbgStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRbg, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->xPUSCHRange, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nAntPortLayer, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->SCID, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->PMI, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->uciWoTBFlag, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->beamIndex, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbgStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRbg, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->xPUSCHRange, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nAntPortLayer, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->SCID, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->PMI, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->uciWoTBFlag, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->beamIndex, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -14513,17 +14163,17 @@ Buffer *mBuf; U32 idx = 0; TRC3(cmPkTfuUePuschCqiRecpInfo) - CMCHKPK(SPkU8, param->riBetaOff, mBuf); - CMCHKPK(SPkU8, param->cqiBetaOff, mBuf); + CMCHKPK(oduUnpackUInt8, param->riBetaOff, mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiBetaOff, mBuf); for (idx = 0; idx < param->cCNum; idx++) { CMCHKPK(cmPkTknU8, ¶m->riSz[idx], mBuf); - CMCHKPK(SPkU8, param->cqiPmiSzRn1[idx], mBuf); - CMCHKPK(SPkU8, param->cqiPmiSzR1[idx], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiPmiSzRn1[idx], mBuf); + CMCHKPK(oduUnpackUInt8, param->cqiPmiSzR1[idx], mBuf); } - CMCHKPK(SPkU8, param->cCNum, mBuf); - CMCHKPK(SPkU8, param->reportType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->cCNum, mBuf); + CMCHKPK(oduUnpackUInt8, param->reportType, mBuf); + return ROK; } @@ -14560,17 +14210,17 @@ Buffer *mBuf; U32 idx; TRC3(cmUnpkTfuUePuschCqiRecpInfo) - CMCHKUNPK(SUnpkU8, ¶m->reportType, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cCNum, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->reportType, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cCNum, mBuf); for (idx = param->cCNum; idx > 0; idx--) { - CMCHKUNPK(SUnpkU8, ¶m->cqiPmiSzR1[idx-1], mBuf); - CMCHKUNPK(SUnpkU8, ¶m->cqiPmiSzRn1[idx-1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPmiSzR1[idx-1], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->cqiPmiSzRn1[idx-1], mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->riSz[idx-1], mBuf); } - CMCHKUNPK(SUnpkU8, ¶m->cqiBetaOff, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->riBetaOff, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->cqiBetaOff, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->riBetaOff, mBuf); + return ROK; } @@ -14608,13 +14258,13 @@ Buffer *mBuf; #ifdef TFU_TDD - CMCHKPK(SPkU8, param->ulDai, mBuf); - CMCHKPK(SPkU8, param->nBundled, mBuf); - CMCHKPK(SPkU32, param->hqFdbkMode, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulDai, mBuf); + CMCHKPK(oduUnpackUInt8, param->nBundled, mBuf); + CMCHKPK(oduUnpackUInt32, param->hqFdbkMode, mBuf); #endif - CMCHKPK(SPkU8, param->hqBetaOff, mBuf); - CMCHKPK(SPkU8, param->hqSz, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->hqBetaOff, mBuf); + CMCHKPK(oduUnpackUInt8, param->hqSz, mBuf); + return ROK; } @@ -14650,15 +14300,15 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePuschHqRecpInfo) - CMCHKUNPK(SUnpkU8, ¶m->hqSz, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hqBetaOff, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqSz, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hqBetaOff, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqFdbkMode, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nBundled, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulDai, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqFdbkMode, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nBundled, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulDai, mBuf); #endif - RETVALUE(ROK); + return ROK; } @@ -14708,8 +14358,8 @@ Buffer *mBuf; CMCHKPK(cmPkTfuUePuschHqRecpInfo, ¶m->hqInfo, mBuf); CMCHKPK(cmPkTfuUePuschCqiRecpInfo, ¶m->cqiRiInfo, mBuf); CMCHKPK(cmPkTfuUeUlSchRecpInfo, ¶m->ulSchInfo, mBuf); - CMCHKPK(SPkU32, param->rcpInfo, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->rcpInfo, mBuf); + return ROK; } @@ -14753,14 +14403,14 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePuschRecpReq) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->rcpInfo, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->rcpInfo, mBuf); CMCHKUNPK(cmUnpkTfuUeUlSchRecpInfo, ¶m->ulSchInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePuschCqiRecpInfo, ¶m->cqiRiInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePuschHqRecpInfo, ¶m->hqInfo, mBuf); CMCHKUNPK(cmUnpkTfuUePucchSrsRecpInfo, ¶m->srsInfo, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->initialNSrs, mBuf); CMCHKUNPK(cmUnpkTknU8, ¶m->initialNumRbs, mBuf); - RETVALUE(ROK); + return ROK; } @@ -14805,14 +14455,14 @@ Buffer *mBuf; CMCHKPK(cmPkTfuUePucchRecpReq, ¶m->t.pucchRecpReq, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); #ifdef TFU_5GTF - CMCHKPK(SPkU8, param->groupId, mBuf); + CMCHKPK(oduUnpackUInt8, param->groupId, mBuf); #endif /* TFU_5GTF */ CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -14851,9 +14501,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); #ifdef TFU_5GTF - CMCHKUNPK(SUnpkU8, ¶m->groupId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->groupId, mBuf); #endif /* TFU_5GTF */ - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RECP_REQ_PUCCH: CMCHKUNPK(cmUnpkTfuUePucchRecpReq, ¶m->t.pucchRecpReq, mBuf); @@ -14862,9 +14512,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuUePuschRecpReq, ¶m->t.puschRecpReq, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif /* TFU_UPGRADE */ #ifndef TFU_UPGRADE /* TFU_UPGRADE */ @@ -14910,25 +14560,25 @@ Buffer *mBuf; #ifdef TFU_TDD for (i=TFU_MAX_M-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->p[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->p[i], mBuf); } for (i=TFU_MAX_M-1; i >= 0; i--) { - CMCHKPK(SPkU8, param->m[i], mBuf); + CMCHKPK(oduUnpackUInt8, param->m[i], mBuf); } - CMCHKPK(SPkU8, param->M, mBuf); - CMCHKPK(SPkU8, param->multCnt, mBuf); + CMCHKPK(oduUnpackUInt8, param->M, mBuf); + CMCHKPK(oduUnpackUInt8, param->multCnt, mBuf); #endif - CMCHKPK(SPkU32, param->type, mBuf); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); switch(param->hqType) { case TFU_HQ_RECP_REQ_N1PUCCH: - CMCHKPK(SPkU16, param->t.n1Pucch, mBuf); + CMCHKPK(oduUnpackUInt16, param->t.n1Pucch, mBuf); break; #ifdef TFU_TDD case TFU_HQ_RECP_REQ_NORMAL: for (i=TFU_MAX_M-1; i >= 0; i--) { - CMCHKPK(SPkU16, param->t.nCce[i], mBuf); + CMCHKPK(oduUnpackUInt16, param->t.nCce[i], mBuf); } break; @@ -14936,15 +14586,15 @@ Buffer *mBuf; #ifndef TFU_TDD case TFU_HQ_RECP_REQ_NORMAL: - CMCHKPK(SPkU16, param->t.nCce, mBuf); + CMCHKPK(oduUnpackUInt16, param->t.nCce, mBuf); break; #endif default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->hqType, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->hqType, mBuf); + return ROK; } @@ -14988,12 +14638,12 @@ Buffer *mBuf; #endif TRC3(cmUnpkTfuUePucchRecpReq) - CMCHKUNPK(SUnpkU32, (U32 *)¶m->hqType, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->hqType, mBuf); switch(param->hqType) { #ifndef TFU_TDD case TFU_HQ_RECP_REQ_NORMAL: - CMCHKUNPK(SUnpkU16, ¶m->t.nCce, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->t.nCce, mBuf); break; #endif @@ -15001,31 +14651,31 @@ Buffer *mBuf; #ifdef TFU_TDD case TFU_HQ_RECP_REQ_NORMAL: for (i=0; it.nCce[i], mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->t.nCce[i], mBuf); } break; #endif case TFU_HQ_RECP_REQ_N1PUCCH: - CMCHKUNPK(SUnpkU16, ¶m->t.n1Pucch, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->t.n1Pucch, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); #ifdef TFU_TDD - CMCHKUNPK(SUnpkU8, ¶m->multCnt, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->M, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->multCnt, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->M, mBuf); for (i=0; im[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->m[i], mBuf); } for (i=0; ip[i], mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->p[i], mBuf); } #endif - RETVALUE(ROK); + return ROK; } @@ -15061,21 +14711,21 @@ Buffer *mBuf; TRC3(cmPkTfuUeMsg3RecpReq) - CMCHKPK(SPkU32, param->modType, mBuf); - CMCHKPK(SPkU16, param->size, mBuf); + CMCHKPK(oduUnpackUInt32, param->modType, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); /*ccpu00128993 - ADD - fix for msg3 softcombining bug*/ - CMCHKPK(SPkU8, param->nDmrs, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->isRtx, mBuf); - CMCHKPK(SPkU8, param->ulDelay, mBuf); - CMCHKPK(SPkU8, param->expCqi, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->isRtx, mBuf); + CMCHKPK(oduUnpackUInt8, param->ulDelay, mBuf); + CMCHKPK(oduUnpackUInt8, param->expCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + return ROK; } @@ -15111,21 +14761,21 @@ Buffer *mBuf; TRC3(cmUnpkTfuUeMsg3RecpReq) - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->expCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ulDelay, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isRtx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->expCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ulDelay, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isRtx, mBuf); /*ccpu00128993 - ADD - fix for msg3 softcombining bug*/ - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->modType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->modType, mBuf); + return ROK; } @@ -15164,22 +14814,22 @@ Buffer *mBuf; TRC3(cmPkTfuUePuschRecpReq) - CMCHKPK(SPkU32, param->modType, mBuf); - CMCHKPK(SPkU16, param->size, mBuf); - CMCHKPK(SPkU32, param->mode, mBuf); - CMCHKPK(SPkU8, param->expHarq, mBuf); - CMCHKPK(SPkU8, param->expCqi, mBuf); - CMCHKPK(SPkU8, param->nDmrs, mBuf); - CMCHKPK(SPkU8, param->rv, mBuf); - CMCHKPK(SPkU8, param->isRtx, mBuf); - CMCHKPK(SPkU8, param->ndi, mBuf); - CMCHKPK(SPkU8, param->harqProcId, mBuf); - CMCHKPK(SPkU8, param->mcs, mBuf); - CMCHKPK(SPkU8, param->numRb, mBuf); - CMCHKPK(SPkU8, param->rbStart, mBuf); - CMCHKPK(SPkU8, param->hoppingBits, mBuf); - CMCHKPK(SPkU8, param->hoppingEnbld, mBuf); - RETVALUE(ROK); + CMCHKPK(oduUnpackUInt32, param->modType, mBuf); + CMCHKPK(oduUnpackUInt16, param->size, mBuf); + CMCHKPK(oduUnpackUInt32, param->mode, mBuf); + CMCHKPK(oduUnpackUInt8, param->expHarq, mBuf); + CMCHKPK(oduUnpackUInt8, param->expCqi, mBuf); + CMCHKPK(oduUnpackUInt8, param->nDmrs, mBuf); + CMCHKPK(oduUnpackUInt8, param->rv, mBuf); + CMCHKPK(oduUnpackUInt8, param->isRtx, mBuf); + CMCHKPK(oduUnpackUInt8, param->ndi, mBuf); + CMCHKPK(oduUnpackUInt8, param->harqProcId, mBuf); + CMCHKPK(oduUnpackUInt8, param->mcs, mBuf); + CMCHKPK(oduUnpackUInt8, param->numRb, mBuf); + CMCHKPK(oduUnpackUInt8, param->rbStart, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingBits, mBuf); + CMCHKPK(oduUnpackUInt8, param->hoppingEnbld, mBuf); + return ROK; } @@ -15218,22 +14868,22 @@ Buffer *mBuf; TRC3(cmUnpkTfuUePuschRecpReq) - CMCHKUNPK(SUnpkU8, ¶m->hoppingEnbld, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->hoppingBits, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rbStart, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->numRb, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->mcs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->harqProcId, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->ndi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->isRtx, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->rv, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nDmrs, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->expCqi, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->expHarq, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->mode, mBuf); - CMCHKUNPK(SUnpkU16, ¶m->size, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->modType, mBuf); - RETVALUE(ROK); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingEnbld, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->hoppingBits, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rbStart, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->numRb, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->mcs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->harqProcId, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->ndi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->isRtx, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->rv, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->nDmrs, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->expCqi, mBuf); + CMCHKUNPK(oduPackUInt8, ¶m->expHarq, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->mode, mBuf); + CMCHKUNPK(oduPackUInt16, ¶m->size, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->modType, mBuf); + return ROK; } @@ -15281,11 +14931,11 @@ Buffer *mBuf; CMCHKPK(cmPkTfuUePucchRecpReq, ¶m->t.pucchRecpReq, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - CMCHKPK(SPkU32, param->type, mBuf); + CMCHKPK(oduUnpackUInt32, param->type, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); - RETVALUE(ROK); + return ROK; } @@ -15323,7 +14973,7 @@ Buffer *mBuf; TRC3(cmUnpkTfuUeRecpReqInfo) CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU32, (U32 *)¶m->type, mBuf); + CMCHKUNPK(oduPackUInt32, (U32 *)¶m->type, mBuf); switch(param->type) { case TFU_RECP_REQ_PUCCH: CMCHKUNPK(cmUnpkTfuUePucchRecpReq, ¶m->t.pucchRecpReq, mBuf); @@ -15335,9 +14985,9 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkTfuUePuschRecpReq, ¶m->t.puschRecpReq, mBuf); break; default : - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } @@ -15377,7 +15027,7 @@ Buffer *mBuf; CMCHKPK(cmPkLteTimingInfo, ¶m->timingInfo, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** * @@ -15412,7 +15062,7 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timingInfo, mBuf); - RETVALUE(ROK); + return ROK; } /*********************************************************** @@ -15465,9 +15115,9 @@ TfuErrIndInfo * errInd; (ErrVal)ETFU105, (ErrVal)0, "Packing failed"); #endif SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector == TFU_SEL_LC) { + if (pst->selector == ODU_SELECTOR_LC) { if (cmPkTfuErrIndInfo(errInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -15476,12 +15126,12 @@ TfuErrIndInfo * errInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmPkPtr((PTR)errInd, mBuf) != ROK) + if (oduPackPointer((PTR)errInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -15492,7 +15142,7 @@ TfuErrIndInfo * errInd; /*MS_FIX:71858:Changed to SPutSBuf as being allocated with SGetSBuf*/ SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } @@ -15504,9 +15154,9 @@ TfuErrIndInfo * errInd; #endif SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if (SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -15514,12 +15164,12 @@ TfuErrIndInfo * errInd; (ErrVal)ETFU108, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } pst->event = (Event) EVTTFUERRIND; - RETVALUE(SPstTsk(pst,mBuf)); + return (SPstTsk(pst,mBuf)); } @@ -15572,9 +15222,9 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU109, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } - if (pst->selector != TFU_SEL_LWLC) { + if (pst->selector != ODU_SELECTOR_LWLC) { if ((SGetSBuf(pst->region, pst->pool, (Data **)&errInd, sizeof(TfuErrIndInfo))) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -15582,11 +15232,11 @@ Buffer *mBuf; (ErrVal)ETFU110, (ErrVal)0, "Packing failed"); #endif TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } - if (pst->selector == TFU_SEL_LC) + if (pst->selector == ODU_SELECTOR_LC) { if (cmUnpkTfuErrIndInfo(errInd, mBuf) != ROK) { SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); @@ -15596,12 +15246,12 @@ Buffer *mBuf; __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ETFU111, (ErrVal)0, "Packing failed"); #endif - RETVALUE(RFAILED); + return RFAILED; } } - else if(pst->selector == TFU_SEL_LWLC) + else if(pst->selector == ODU_SELECTOR_LWLC) { - if (cmUnpkPtr((PTR *)&errInd, mBuf) != ROK) + if (oduUnpackPointer((PTR *)&errInd, mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, @@ -15610,14 +15260,14 @@ Buffer *mBuf; #endif SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); TFU_FREE_MSG(mBuf); - RETVALUE(RFAILED); + return RFAILED; } } TFU_FREE_MSG(mBuf); /* [ccpu00141698]-MOD- MAC/SCH does not free the TTI ind anymore */ (*func)(pst, suId, errInd); SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)); - RETVALUE(ROK); + return ROK; } #endif /* if defined(LCTFU) */