X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrmac%2Frg.h;h=1aeeaae3d529c0de9938ab376fcf9721a2e3da27;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=545aaf2f3ffac1f16d5bf057281c61fd244c35e4;hpb=e550b2091fb29289d12a5722b189acbede7862f0;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg.h b/src/5gnrmac/rg.h index 545aaf2f3..1aeeaae3d 100755 --- a/src/5gnrmac/rg.h +++ b/src/5gnrmac/rg.h @@ -244,26 +244,6 @@ U32 macHeader[2]; #define RG_MAX_DL_HARQ_NUM 8 #endif -#define MAC_MEM_REGION 4 -#define MAC_POOL 1 -/* allocate and zero out a MAC static buffer */ -#define MAC_ALLOC(_datPtr, _size) \ -{ \ - S16 _ret; \ - _ret = SGetSBuf(MAC_MEM_REGION, MAC_POOL, \ - (Data **)&_datPtr, _size); \ - if(_ret == ROK) \ - cmMemset((U8*)_datPtr, 0, _size); \ - else \ - _datPtr = NULLP; \ -} - -/* free a static buffer */ -#define MAC_FREE(_datPtr, _size) \ - if(_datPtr) \ - SPutSBuf(MAC_MEM_REGION, MAC_POOL, \ - (Data *)_datPtr, _size); - /* Free shared memory, received through LWLC */ #define MAC_FREE_MEM(_region, _pool, _datPtr, _size) \ if(_datPtr) \ @@ -308,7 +288,7 @@ U32 macHeader[2]; if (_padBuf == NULLP) \ { \ RLOG0(L_ERROR, "RGERR_MUX_BLD_CEHDR_FAIL");\ - RETVALUE(RFAILED);\ + return RFAILED;\ } \ if (mInfo->endptr == NULLP) { \ sduEnd = _sduBuf; \ @@ -664,7 +644,7 @@ toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME {\ if(_inst >= RG_MAX_INST)\ {\ - RETVALUE(RFAILED);\ + return RFAILED;\ }\ } @@ -774,7 +754,6 @@ typedef enum { \ } #endif -#define DEFAULT_CELLS 1 #endif /* __RGH__ */ /**********************************************************************