X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcrg.c;h=2acd045ba3b3bdd0961348214b17c49b5e5937b3;hb=9634ca974c4418c0800090e33d37ef1fe7e8cb30;hp=5d15084525046554a1e04b1af241d3b2fd2370ae;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/cm/crg.c b/src/cm/crg.c index 5d1508452..2acd045ba 100755 --- a/src/cm/crg.c +++ b/src/cm/crg.c @@ -70,7 +70,6 @@ SpId spId; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgBndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -133,7 +132,6 @@ Buffer *mBuf; SuId suId; SpId spId; - TRC3(cmUnpkCrgBndReq) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -168,7 +166,7 @@ Buffer *mBuf; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -177,17 +175,16 @@ S16 cmPkCrgBndCfm ( Pst* pst, SuId suId, -U8 status +uint8_t status ) #else S16 cmPkCrgBndCfm(pst, suId, status) Pst* pst; SuId suId; -U8 status; +uint8_t status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgBndCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -230,7 +227,7 @@ U8 status; * * @param[in] Pst* pst * @param[in] SuId suId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -249,9 +246,8 @@ Buffer *mBuf; #endif { SuId suId; - U8 status; + uint8_t status; - TRC3(cmUnpkCrgBndCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -304,7 +300,6 @@ Reason reason; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgUbndReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -367,7 +362,6 @@ Buffer *mBuf; SpId spId; Reason reason; - TRC3(cmUnpkCrgUbndReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -424,7 +418,6 @@ CrgCfgReqInfo * cfgReqInfo; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgCfgReq) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -513,7 +506,6 @@ Buffer *mBuf; CrgCfgTransId transId; CrgCfgReqInfo *cfgReqInfo; - TRC3(cmUnpkCrgCfgReq) if (SUnpkS16(&spId, mBuf) != ROK) { SPutMsg(mBuf); @@ -568,7 +560,7 @@ Buffer *mBuf; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CrgCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -578,18 +570,17 @@ S16 cmPkCrgCfgCfm Pst* pst, SuId suId, CrgCfgTransId transId, -U8 status +uint8_t status ) #else S16 cmPkCrgCfgCfm(pst, suId, transId, status) Pst* pst; SuId suId; CrgCfgTransId transId; -U8 status; +uint8_t status; #endif { Buffer *mBuf = NULLP; - TRC3(cmPkCrgCfgCfm) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -642,7 +633,7 @@ U8 status; * @param[in] Pst* pst * @param[in] SuId suId * @param[in] CrgCfgTransId transId -* @param[in] U8 status +* @param[in] uint8_t status * @return S16 * -# ROK **/ @@ -662,9 +653,8 @@ Buffer *mBuf; { SuId suId; CrgCfgTransId transId; - U8 status; + uint8_t status; - TRC3(cmUnpkCrgCfgCfm) if (SUnpkS16(&suId, mBuf) != ROK) { SPutMsg(mBuf); @@ -727,7 +717,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmPkCrgCfgTransId) for (i=CRG_CFG_TRANSID_SIZE-1; i >= 0; i--) { CMCHKPK(oduUnpackUInt8, param->trans[i], mBuf); @@ -766,7 +755,6 @@ Buffer *mBuf; { S32 i; - TRC3(cmUnpkCrgCfgTransId) for (i=0; itrans[i], mBuf); @@ -804,7 +792,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgBwCfg) CMCHKPK(oduUnpackUInt8, param->ulTotalBw, mBuf); CMCHKPK(oduUnpackUInt8, param->dlTotalBw, mBuf); @@ -841,7 +828,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgBwCfg) CMCHKUNPK(oduPackUInt8, ¶m->dlTotalBw, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->ulTotalBw, mBuf); @@ -878,7 +864,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgRachCfg) CMCHKPK(oduUnpackUInt8, param->maxMsg3Tx, mBuf); return ROK; @@ -914,7 +899,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgRachCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxMsg3Tx, mBuf); return ROK; @@ -950,7 +934,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgCellCfg) #ifdef EMTC_ENABLE CMCHKPK(oduUnpackUInt8, param->emtcEnable, mBuf); @@ -995,7 +978,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgCellCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkCrgRachCfg, ¶m->rachCfg, mBuf); @@ -1040,7 +1022,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgUeUlHqCfg) CMCHKPK(oduUnpackUInt8, param->maxUlHqTx, mBuf); return ROK; @@ -1063,13 +1044,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkCrgUeSCellCfg +static S16 cmPkCrgUeSCellCfg ( CrgUeSCellInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkCrgUeSCellCfg(param, mBuf) +static S16 cmPkCrgUeSCellCfg(param, mBuf) CrgUeSCellInfo *param; Buffer *mBuf; #endif @@ -1097,13 +1078,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkCrgUeSCellCfg +static S16 cmUnpkCrgUeSCellCfg ( CrgUeSCellInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkCrgUeSCellCfg(param, mBuf) +static S16 cmUnpkCrgUeSCellCfg(param, mBuf) CrgUeSCellInfo *param; Buffer *mBuf; #endif @@ -1144,7 +1125,7 @@ Buffer *mBuf; S8 idx; for(idx = param->numSCells - 1; idx >= 0; idx--) { - CMCHKPK(cmPkCrgUeSCellCfg, ¶m->ueSCellCfg[(U8)idx], mBuf); + CMCHKPK(cmPkCrgUeSCellCfg, ¶m->ueSCellCfg[(uint8_t)idx], mBuf); } CMCHKPK(oduUnpackUInt8, param->numSCells, mBuf); @@ -1180,7 +1161,7 @@ CrgUeSecCellInfo *param; Buffer *mBuf; #endif { - U8 idx; + uint8_t idx; CMCHKUNPK(oduPackUInt8, ¶m->isSCellCfgPres, mBuf); if(TRUE == param->isSCellCfgPres) @@ -1227,7 +1208,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgUeUlHqCfg) CMCHKUNPK(oduPackUInt8, ¶m->maxUlHqTx, mBuf); return ROK; @@ -1263,7 +1243,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgUeCfg) #ifdef TENB_MULT_CELL_SUPPRT CMCHKPK(SPkS16, param->rguDlSapId, mBuf); CMCHKPK(SPkS16, param->rguUlSapId, mBuf); @@ -1305,15 +1284,14 @@ CrgUeCfg *param; Buffer *mBuf; #endif { - U32 tmpEnum; + uint32_t tmpEnum; - TRC3(cmUnpkCrgUeCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); CMCHKUNPK(cmUnpkCrgUeUlHqCfg, ¶m->ueUlHqCfg, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->txMode.pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)&tmpEnum, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)&tmpEnum, mBuf); param->txMode.tm = (CrgTxMode) tmpEnum; #ifdef TENB_MULT_CELL_SUPPRT CMCHKUNPK(SUnpkS16, ¶m->rguUlSapId, mBuf); @@ -1352,7 +1330,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgDlLchCfg) CMCHKPK(oduUnpackUInt8, param->dlTrchType, mBuf); return ROK; @@ -1388,7 +1365,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgDlLchCfg) CMCHKUNPK(oduPackUInt8, ¶m->dlTrchType, mBuf); return ROK; @@ -1424,7 +1400,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgUlLchCfg) CMCHKPK(oduUnpackUInt8, param->lcgId, mBuf); CMCHKPK(oduUnpackUInt8, param->ulTrchType, mBuf); @@ -1461,7 +1436,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgUlLchCfg) CMCHKUNPK(oduPackUInt8, ¶m->ulTrchType, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->lcgId, mBuf); @@ -1498,7 +1472,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgLchCfg) /* crg_c_001.main_5 - ADD - Added the packing for LTE_L2_MEAS. */ #ifdef LTE_L2_MEAS CMCHKPK(oduUnpackUInt8, param->qci, mBuf); @@ -1543,7 +1516,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgLchCfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -1589,7 +1561,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgCfg) switch(param->cfgType) { case CRG_LCH_CFG: @@ -1638,7 +1609,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgCfg) CMCHKUNPK(oduPackUInt8, ¶m->cfgType, mBuf); switch(param->cfgType) { @@ -1687,7 +1657,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgCellRecfg) CMCHKPK(cmPkCrgRachCfg, ¶m->rachRecfg, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -1724,7 +1693,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgCellRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkCrgRachCfg, ¶m->rachRecfg, mBuf); @@ -1761,7 +1729,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgUeRecfg) #ifdef LTE_ADV if(TRUE == param->crgSCellCfg.isSCellCfgPres) { @@ -1811,14 +1778,13 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgUeRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->oldCrnti, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->newCrnti, mBuf); CMCHKUNPK(cmUnpkCrgUeUlHqCfg, ¶m->ueUlHqRecfg, mBuf); CMCHKUNPK(oduPackUInt8, ¶m->txMode.pres, mBuf); - CMCHKUNPK(oduPackUInt32, (U32 *)¶m->txMode.tm, mBuf); + CMCHKUNPK(oduPackUInt32, (uint32_t *)¶m->txMode.tm, mBuf); #ifdef LTE_ADV CMCHKUNPK(cmUnpkCrgUeSecCellInfo, ¶m->crgSCellCfg, mBuf); #endif /* LTE_ADV */ @@ -1855,7 +1821,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgLchRecfg) CMCHKPK(oduUnpackUInt8, param->ulRecfg.lcgId, mBuf); CMCHKPK(cmPkLteLcId, param->lcId, mBuf); @@ -1894,7 +1859,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgLchRecfg) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -1933,7 +1897,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgRecfg) switch(param->recfgType) { case CRG_LCH_CFG: @@ -1982,7 +1945,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgRecfg) CMCHKUNPK(oduPackUInt8, ¶m->recfgType, mBuf); switch(param->recfgType) { @@ -2031,7 +1993,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgDel) switch(param->delType) { case CRG_LCH_CFG: @@ -2084,7 +2045,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgDel) CMCHKUNPK(oduPackUInt8, ¶m->delType, mBuf); switch(param->delType) { @@ -2137,7 +2097,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgRst) CMCHKPK(cmPkLteRnti, param->crnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); @@ -2174,7 +2133,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgRst) CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->crnti, mBuf); @@ -2211,7 +2169,6 @@ Buffer *mBuf; #endif { - TRC3(cmPkCrgCfgReqInfo) switch(param->action) { case CRG_RESET: @@ -2263,7 +2220,6 @@ Buffer *mBuf; #endif { - TRC3(cmUnpkCrgCfgReqInfo) CMCHKUNPK(oduPackUInt8, ¶m->action, mBuf); switch(param->action) {