X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_cfg_hdl.c;h=d03bbdd89a6a12fc57eb5b174c2da188db665afa;hb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;hp=1610062e15ec86e4f13b8efdef4ab37ceb88994e;hpb=45d134510deb6902b870b4a0fb574b6075fba601;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_cfg_hdl.c b/src/5gnrmac/mac_cfg_hdl.c index 1610062e1..d03bbdd89 100644 --- a/src/5gnrmac/mac_cfg_hdl.c +++ b/src/5gnrmac/mac_cfg_hdl.c @@ -20,6 +20,8 @@ #include "common_def.h" #include "lrg.h" #include "lrg.x" +#include "rgu.h" +#include "rgu.x" #include "du_app_mac_inf.h" #include "mac_sch_interface.h" #include "lwr_mac_upr_inf.h" @@ -61,7 +63,7 @@ SchCellCfgFunc SchCellCfgOpts[] = * @return * -# ROK **/ -PUBLIC int MacSchGenCfgReq(Pst *pst, RgMngmt *cfg) +uint8_t MacSchGenCfgReq(Pst *pst, RgMngmt *cfg) { printf("\nReceived Scheduler gen config at MAC"); pst->dstInst = DEFAULT_CELLS + 1; @@ -85,7 +87,7 @@ PUBLIC int MacSchGenCfgReq(Pst *pst, RgMngmt *cfg) * @return * -# ROK **/ -PUBLIC uint8_t SchSendCfgCfm(Pst *pst, RgMngmt *cfm) +uint8_t SchSendCfgCfm(Pst *pst, RgMngmt *cfm) { printf("\nSending Scheduler config confirm to DU APP"); pst->dstEnt = ENTDUAPP; @@ -117,10 +119,10 @@ uint8_t MacProcCellCfgReq(Pst *pst, MacCellCfg *macCellCfg) { Pst cfmPst; uint16_t cellIdx; - uint16_t ret = ROK; + uint8_t ret = ROK; MacCellCb *macCellCb; - cmMemset((uint8_t *)&cfmPst, 0, sizeof(Pst)); + memset((uint8_t *)&cfmPst, 0, sizeof(Pst)); MAC_ALLOC(macCellCb, sizeof(MacCellCb)); if(macCellCb == NULLP) @@ -192,9 +194,9 @@ uint8_t MacSchCellCfgReq(Pst *pst, MacCellCfg *macCellCfg) { SchCellCfg schCellCfg; Pst cfgPst; - int ret; + uint8_t ret; - cmMemset((uint8_t *)&cfgPst, 0, sizeof(Pst)); + memset((uint8_t *)&cfgPst, 0, sizeof(Pst)); schCellCfg.cellId = macCellCfg->cellId; schCellCfg.phyCellId = macCellCfg->phyCellId; schCellCfg.bandwidth = macCellCfg->dlCarrCfg.bw; @@ -310,7 +312,7 @@ void MacSendCellCfgCfm(uint16_t cellId, uint8_t response) uint16_t cellIdx; MacCellCfgCfm macCellCfgCfm; - cmMemset((uint8_t *)&pst, 0, sizeof(Pst)); + memset((uint8_t *)&pst, 0, sizeof(Pst)); GET_CELL_IDX(cellId, cellIdx); macCellCfgCfm.cellId = macCb.macCell[cellIdx]->macCellCfg.cellId;