X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Frgu.c;h=c4a796d1d228ba75e54ee0bbf19fb70d87d0459a;hb=07a3604e42e6b03158e5ce6f1f2bc0e551572079;hp=809f60eb055993e64bbaf864642d8dccdba7da08;hpb=fe3e15254e67fd96dbfabec4bf7245c3b64ee415;p=o-du%2Fl2.git diff --git a/src/cm/rgu.c b/src/cm/rgu.c index 809f60eb0..c4a796d1d 100755 --- a/src/cm/rgu.c +++ b/src/cm/rgu.c @@ -35,25 +35,10 @@ */ /* 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 "common_def.h" #include "rgu.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 "rgu.x" /* RGU Interface includes */ #ifdef SS_RBUF @@ -448,7 +433,7 @@ RlcMacData *dlData RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKPK(cmPkPtr,(PTR) dlData, mBuf); } @@ -490,7 +475,7 @@ RlcMacData *dlData __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, (ErrVal)ERGU024, (ErrVal)0, "Packing failed"); #endif - if (dlData != NULLP); + if (dlData != NULLP) { SPutSBuf(pst->region, pst->pool, (Data *)dlData, sizeof(RlcMacData)); @@ -534,7 +519,7 @@ Buffer *mBuf RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKUNPK(cmUnpkPtr,(PTR *) &dlData, mBuf); } @@ -592,22 +577,9 @@ Buffer *mBuf * @return S16 * -# ROK **/ -#ifdef ANSI -PUBLIC S16 packRcvdUlData -( -Pst* pst, -SuId suId, -RlcMacData *ulData -) -#else -PUBLIC S16 packRcvdUlData(pst, suId, ulData) -Pst* pst; -SuId suId; -RlcMacData *ulData; -#endif +uint8_t packRlcUlData(Pst* pst, RlcMacData *ulData) { Buffer *mBuf = NULLP; - TRC3(packRcvdUlData) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { #if (ERRCLASS & ERRCLS_ADD_RES) @@ -619,7 +591,7 @@ RlcMacData *ulData; RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKPK(cmPkPtr,(PTR)ulData, mBuf); } @@ -648,17 +620,6 @@ RlcMacData *ulData; } ulData = NULLP; } - if (SPkS16(suId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU037, (ErrVal)0, "Packing failed"); -#endif - SPutStaticBuffer(pst->region, pst->pool, (Data *)ulData, sizeof(RlcMacData),0); - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - pst->event = (Event) EVTRLCULDAT; RETVALUE(SPstTsk(pst,mBuf)); } @@ -678,29 +639,13 @@ RlcMacData *ulData; * @return S16 * -# ROK **/ -PUBLIC S16 unpackRcvdUlData -( -RlcMacUlData func, -Pst *pst, -Buffer *mBuf -) +uint8_t unpackRcvdUlData(RlcMacUlDataFunc func, Pst *pst, Buffer *mBuf) { - SuId suId; RlcMacData *ulData; TRC3(unpackRcvdUlData) - if (SUnpkS16(&suId, mBuf) != ROK) { -#if (ERRCLASS & ERRCLS_ADD_RES) - SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, - __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES, - (ErrVal)ERGU039, (ErrVal)0, "UnPacking failed"); -#endif - SPutMsg(mBuf); - RETVALUE(RFAILED); - } - - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKUNPK(cmUnpkPtr,(PTR *) &ulData, mBuf); } @@ -729,7 +674,7 @@ Buffer *mBuf } } SPutMsg(mBuf); - RETVALUE((*func)(pst, suId, ulData)); + RETVALUE((*func)(pst, ulData)); } @@ -863,7 +808,7 @@ RguL2MUlThrpMeasReqInfo* measReq; SPutSBuf(pst->region, pst->pool, (Data *)measReq, sizeof(RguL2MUlThrpMeasReqInfo)); RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKPK(cmPkPtr,(PTR) measReq, mBuf); } @@ -956,7 +901,7 @@ Buffer *mBuf; SPutMsg(mBuf); RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKUNPK(cmUnpkPtr,(PTR *) &measReq, mBuf); } @@ -1044,7 +989,7 @@ RlcMacBOStatus *boStatus RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKPK(cmPkPtr,(PTR) boStaInfo, mBuf); } @@ -1116,7 +1061,7 @@ Buffer *mBuf RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKUNPK(cmUnpkPtr,(PTR *) &boSta, mBuf); } @@ -1217,7 +1162,7 @@ RguHarqStatusInd *harqStatusInd; RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKPK(cmPkPtr,(PTR) harqStaInd, mBuf); } @@ -1254,7 +1199,7 @@ RguHarqStatusInd *harqStatusInd; if (SPutSBuf(pst->region, pst->pool, (Data *)harqStaInd, sizeof(RguHarqStatusInd)) != ROK) { #else - if (pst->selector != RGU_SEL_LWLC) + if (pst->selector != ODU_SELECTOR_LWLC) { if(SPutStaticBuffer(pst->region, pst->pool, (Data *)harqStaInd, sizeof(RguHarqStatusInd), 0) != ROK) @@ -1323,7 +1268,7 @@ Buffer *mBuf; if ((SGetSBuf(pst->region, pst->pool, (Data **)&hqStaInd, sizeof(RguHarqStatusInd))) != ROK) { #else - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKUNPK(cmUnpkPtr,(PTR *) &hqStaInd, mBuf); } @@ -1402,7 +1347,7 @@ RlcMacSchedRepInfo * schRep SPutSBuf(pst->region, pst->pool, (Data *)schRep, sizeof(RlcMacSchedRepInfo)); RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKPK(cmPkPtr,(PTR) schRep, mBuf); } @@ -1487,7 +1432,7 @@ Buffer *mBuf SPutMsg(mBuf); RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKUNPK(cmUnpkPtr,(PTR *) &schRep, mBuf); } @@ -1627,7 +1572,7 @@ RguFlowCntrlInd *flowCntrlInd; #endif RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKPK(cmPkPtr,(PTR) flowCntrlInd, mBuf); } @@ -1768,7 +1713,7 @@ Buffer *mBuf; SPutMsg(mBuf); RETVALUE(RFAILED); } - if (pst->selector == RGU_SEL_LWLC) + if (pst->selector == ODU_SELECTOR_LWLC) { CMCHKUNPK(cmUnpkPtr,(PTR *) &flowCntrlInd, mBuf); } @@ -2649,21 +2594,21 @@ Buffer *mBuf; TRC3(packRlcMacDataInfo); - for (i=param->nmbPdu-1; i >= 0; i--) + for (i=param->numPdu-1; i >= 0; i--) { msgLen = 0; - if (SFndLenMsg(param->pduInfo[i].pduBuf, &msgLen) != ROK) - RETVALUE(RFAILED); - if (SCatMsg(mBuf, param->pduInfo[i].pduBuf, M1M2) != ROK) - RETVALUE(RFAILED); + //if (SFndLenMsg(param->pduInfo[i].pduBuf, &msgLen) != ROK) + // RETVALUE(RFAILED); + //if (SCatMsg(mBuf, param->pduInfo[i].pduBuf, M1M2) != ROK) + // RETVALUE(RFAILED); CMCHKPK(cmPkMsgLen, msgLen, mBuf); CMCHKPK(cmPkLteLcId, param->pduInfo[i].lcId, mBuf); CMCHKPK(cmPkBool, param->pduInfo[i].commCh, mBuf); } - CMCHKPK(SPkU8, param->nmbPdu, mBuf); + CMCHKPK(SPkU8, param->numPdu, mBuf); CMCHKPK(cmPkLteRnti, param->rnti, mBuf); CMCHKPK(cmPkLteCellId, param->cellId, mBuf); - CMCHKPK(cmPkLteTimingInfo, ¶m->timeToTx, mBuf); + //CMCHKPK(cmPkLteTimingInfo, ¶m->timeToTx, mBuf); RETVALUE(ROK); } @@ -2701,11 +2646,11 @@ Buffer *mBuf; TRC3(unpackRlcMacDataInfo); - CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timeToTx, mBuf); + //CMCHKUNPK(cmUnpkLteTimingInfo, ¶m->timeToTx, mBuf); CMCHKUNPK(cmUnpkLteCellId, ¶m->cellId, mBuf); CMCHKUNPK(cmUnpkLteRnti, ¶m->rnti, mBuf); - CMCHKUNPK(SUnpkU8, ¶m->nmbPdu, mBuf); - for (i=0; inmbPdu; i++) + CMCHKUNPK(SUnpkU8, ¶m->numPdu, mBuf); + for (i=0; inumPdu; i++) { MsgLen totalMsgLen; @@ -2714,8 +2659,8 @@ Buffer *mBuf; CMCHKUNPK(cmUnpkMsgLen, ¶m->pduInfo[i].pduLen, mBuf); if (SFndLenMsg(mBuf, &totalMsgLen) != ROK) RETVALUE(RFAILED); - if (SSegMsg(mBuf, totalMsgLen-param->pduInfo[i].pduLen, ¶m->pduInfo[i].pduBuf) != ROK) - RETVALUE(RFAILED); + //if (SSegMsg(mBuf, totalMsgLen-param->pduInfo[i].pduLen, ¶m->pduInfo[i].pduBuf) != ROK) + // RETVALUE(RFAILED); } RETVALUE(ROK); }