X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_dux.c;h=b39913292e08e880c9942897626aaa53ab6ab7c3;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=b2b58b89f601200e8a9aee0a6f7fde4c0af3d10e;hpb=d1ead035ab3b543810f1838b2519904bf84477ec;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_dux.c b/src/5gnrmac/rg_dux.c index b2b58b89f..b39913292 100755 --- a/src/5gnrmac/rg_dux.c +++ b/src/5gnrmac/rg_dux.c @@ -36,19 +36,8 @@ static const char* RLOG_MODULE_NAME="MAC"; static int RLOG_FILE_ID=176; static int RLOG_MODULE_ID=4096; /* header include files -- defines (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ +#include "common_def.h" -#include "gen.h" /* general */ -#include "ssi.h" /* system services */ - -#include "cm_lte.h" /* Common LTE */ -#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_mblk.h" /* common memory link list library */ - #include "rg_env.h" /* MAC Environment Defines */ #include "tfu.h" /* CRG Interface defines */ #include "crg.h" /* CRG Interface defines */ @@ -60,16 +49,6 @@ static int RLOG_MODULE_ID=4096; #include "rg_err.h" /* MAC error defines */ /* header/extern include files (.x) */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services */ -#include "cm5.x" /* common timers */ -#include "cm_lib.x" /* common library */ -#include "cm_lte.x" /* Common LTE */ -#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_mblk.x" /* common memory link list library */ #include "rgu.x" /* RGU types */ #include "tfu.x" /* CRG Interface includes */ @@ -79,7 +58,7 @@ static int RLOG_MODULE_ID=4096; #include "rgu.x" /* RGU Interface includes */ #include "lrg.x" /* LRG Interface includes */ -#include "mac_interface.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ /* local defines */ @@ -115,15 +94,15 @@ static int RLOG_MODULE_ID=4096; } #define RG_UNPACK_SHORT_BSR(_bsr, _mBuf, _ret) {\ - _ret = SUnpkU8((_bsr), (_mBuf)); \ + _ret = oduPackUInt8((_bsr), (_mBuf)); \ } #define RG_UNPACK_TRUNC_BSR(_bsr, _mBuf, _ret) {\ - _ret = SUnpkU8((_bsr), (_mBuf)); \ + _ret = oduPackUInt8((_bsr), (_mBuf)); \ } #define RG_UNPACK_PHR(_phr, _mBuf, _ret) {\ - _ret = SUnpkU8((_phr), (_mBuf)); \ + _ret = oduPackUInt8((_phr), (_mBuf)); \ } #define RG_UNPACK_CRNTI(_rnti, _mBuf, _ret) {\ @@ -139,11 +118,11 @@ static int RLOG_MODULE_ID=4096; /* For EXT PHR DEMUX */ #define RG_UNPACK_EXT_PHR_CI(_ci, _mBuf, _ret) {\ - _ret = SUnpkU8((_ci), (_mBuf)); \ + _ret = oduPackUInt8((_ci), (_mBuf)); \ } #define RG_UNPACK_EXT_PHR(_extPhr, _mBuf, _ret) {\ - _ret = SUnpkU8((_extPhr), (_mBuf)); \ + _ret = oduPackUInt8((_extPhr), (_mBuf)); \ } @@ -192,19 +171,18 @@ RgErrInfo *err; S16 ret; RgMacSdu *sduAloc = NULLP; - TRC2(rgDUXInsSdu) RG_DUX_ALLOC(pdu, sizeof(RgMacSdu), sduAloc, ret); if(ret != ROK) { RLOG1(L_ERROR, "Allocation of RgSubHdr failed for LCID:%d",lcId); err->errCause = RGERR_DUX_MEM_EXHAUST; - RETVALUE(RFAILED); + return RFAILED; } *sdu = sduAloc; RG_INIT_SDU(sduAloc, lcId, sduLen); cmLListAdd2Tail(&pdu->sduLst, &sduAloc->sduLstEnt); - RETVALUE(ROK); + return ROK; } /** @@ -253,14 +231,13 @@ RgErrInfo *err; U8 byte; U8 fmt=0; - TRC2(rgDUXExtSubHdr) *len = 0; - if(SUnpkU8(&byte,mBuf) != ROK) + if(oduPackUInt8(&byte,mBuf) != ROK) { - RLOG0(L_ERROR, "SUnpkU8 failed"); + RLOG0(L_ERROR, "oduPackUInt8 failed"); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } /* Extract the lcid */ RG_EXT_LCID(*lcId, byte); @@ -269,25 +246,25 @@ RgErrInfo *err; if(*lcId <= RG_DEDLC_MAX_LCID) { /* variable size MAC Sub PDU */ RG_EXT_FORMT_BIT(fmt,byte); - if(SUnpkU8(&byte, mBuf) != ROK) + if(oduPackUInt8(&byte, mBuf) != ROK) { - RLOG0(L_ERROR, "SUnpkU8 failed"); + RLOG0(L_ERROR, "oduPackUInt8 failed"); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } *len = byte; if(fmt) { - if(SUnpkU8(&byte,mBuf) != ROK) + if(oduPackUInt8(&byte,mBuf) != ROK) { - RLOG0(L_ERROR, "SUnpkU8 failed"); + RLOG0(L_ERROR, "oduPackUInt8 failed"); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } *len = (*len << 8) | byte; } } - RETVALUE(ROK); + return ROK; } /* rgDUXExtSubHdr */ /** @@ -337,7 +314,6 @@ RgErrInfo *err; { S16 ret; - TRC2(rgDUXExtCe); switch(lcId) { @@ -354,7 +330,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of EXT PHR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } /* Not handling Type 2 PHR report as simultaneous PUSCH/PUCCH @@ -375,7 +351,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of EXT PHR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } /* extPhrOctet: Bits : 7 6 5 4 3 2 1 0 @@ -399,7 +375,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of EXT PHR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } extPhr->servCellPhr[extPhr->numServCells].pCmax = (extPhrPCmax & 0x3F); } @@ -419,7 +395,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of PHR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } ceInfo->bitMask |= RG_PHR_CE_PRSNT; } @@ -431,7 +407,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of Trunc BSR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } ceInfo->bitMask |= RG_TRUNC_BSR_CE_PRSNT; } @@ -443,7 +419,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of Short BSR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } ceInfo->bitMask |= RG_SHORT_BSR_CE_PRSNT; } @@ -456,7 +432,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of Long BSR failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } RG_EXT_BS(longBsr, ceInfo->ces.bsr.longBsr.bs1, @@ -473,7 +449,7 @@ RgErrInfo *err; { RLOG1(L_ERROR,"Unpacking of C-RNTI failed LCID:%d",lcId); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } ceInfo->bitMask |= RG_CRNTI_CE_PRSNT; } @@ -481,9 +457,9 @@ RgErrInfo *err; default: RLOG1(L_ERROR, "Invalid LCID:%u received",lcId); err->errCause = RGERR_DUX_INV_LCID_RX; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgDUXExtCe */ @@ -537,7 +513,6 @@ RgErrInfo *err; Buffer *tmpBuf2 = NULLP; RgMacSdu *sdu; - TRC2(rgDUXExtSdu) if(lcId == RG_CCCH_LCID) { @@ -547,7 +522,7 @@ RgErrInfo *err; if(rgDUXInsSdu(inst,pdu, &sdu,lcId, subPduLen, err) != ROK) { RG_FREE_MSG(*mBuf); - RETVALUE(RFAILED); + return RFAILED; } tmpBuf1 = *mBuf; @@ -558,12 +533,12 @@ RgErrInfo *err; RG_FREE_MSG(tmpBuf1); RLOG0(L_ERROR,"SSegMsg failed"); err->errCause = RGERR_DUX_RLC_PDU_CREAT_FAIL; - RETVALUE(RFAILED); + return RFAILED; } sdu->mBuf = tmpBuf1; *mBuf = tmpBuf2; } - RETVALUE(ROK); + return ROK; } /* rgDUXExtSdu */ /** @@ -589,7 +564,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgDUXDemuxData +S16 rgDUXDemuxData ( Inst inst, RgMacPdu *pdu, @@ -598,7 +573,7 @@ Buffer **mBuf, RgErrInfo *err ) #else -PUBLIC S16 rgDUXDemuxData(inst,pdu, ceInfo, mBuf, err) +S16 rgDUXDemuxData(inst,pdu, ceInfo, mBuf, err) Inst inst; RgMacPdu *pdu; RgInfCeInfo *ceInfo; @@ -609,7 +584,6 @@ RgErrInfo *err; U8 lcId; U16 subPduLen; MsgLen len; - TRC2(rgDUXDemuxData) ceInfo->bitMask = 0x0000; @@ -619,7 +593,7 @@ RgErrInfo *err; if(*mBuf == NULLP) { RLOG0(L_ERROR, "Null Buffer Recevived"); - RETVALUE(RFAILED); + return RFAILED; } do { @@ -631,12 +605,12 @@ RgErrInfo *err; { RG_FREE_MSG(*mBuf); RLOG0(L_ERROR, "Failed to extract pad sub headers"); - RETVALUE(RFAILED); + return RFAILED; } if(lcId == RG_PAD_LCID) { /*at end of MAC PDU, Padding started */ RG_FREE_MSG(*mBuf); - RETVALUE(ROK); + return ROK; } if(lcId <= RG_DEDLC_MAX_LCID) { @@ -647,11 +621,11 @@ RgErrInfo *err; * will be responsible for freeing mBuf */ *mBuf = NULLP; RLOG0(L_ERROR, "failed to Extract the sdus"); - RETVALUE(RFAILED); + return RFAILED; } if(*mBuf == NULLP) /* if message read completes then return */ { - RETVALUE(ROK); + return ROK; } } else @@ -661,7 +635,7 @@ RgErrInfo *err; { RG_FREE_MSG(*mBuf); RLOG0(L_ERROR, " failed to Extract the ces"); - RETVALUE(RFAILED); + return RFAILED; } } if(SFndLenMsg(*mBuf,&len) != ROK) @@ -669,12 +643,12 @@ RgErrInfo *err; RG_FREE_MSG(*mBuf); RLOG0(L_ERROR,"mBuf length check failed"); err->errCause = RGERR_DUX_UNPACK_FAILURE; - RETVALUE(RFAILED); + return RFAILED; } }while(len); RG_FREE_MSG(*mBuf); - RETVALUE(ROK); + return ROK; } /* rgDUXDemuxData */ /**********************************************************************