X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lmm.c;h=0e744585620e39461310e4310271d8fb5a78ba01;hb=451e626d5ac7c7e7586bab23358161230449af46;hp=7205c6f38c7617216f2b02cace25c979fba08e0d;hpb=18fbca81feebe0cf45f205c1c580c574741292b0;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index 7205c6f38..0e7445856 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -75,7 +75,7 @@ static int RLOG_MODULE_ID=4096; #include "rg_prg.x" /* PRG Interface includes */ #include "lrg.x" /* LRG Interface includes */ #include "rgr.x" /* LRG Interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ #ifdef SS_DIAG #include "ss_diag.h" /* Common log file */ @@ -83,7 +83,7 @@ static int RLOG_MODULE_ID=4096; #include "ss_rbuf.h" #include "ss_rbuf.x" -#include "rg_cl.h" /* MAC CL defines */ +#include "lwr_mac.h" /* MAC CL defines */ #ifdef __cplusplus extern "C" { @@ -130,14 +130,13 @@ RgMngmt *cfm, Pst *cfmPst )); -extern U16 cmPackLcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); -extern U16 cmPackLwlcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); +extern U16 cmPackMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); packMacCellCfgCfm packMacCellCfmOpts[] = { - cmPackLcMacCellCfgCfm, /* packing for loosely coupled */ + cmPackMacCellCfgCfm, /* packing for loosely coupled */ duHandleMacCellCfgCfm, /* packing for tightly coupled */ - cmPackLwlcMacCellCfgCfm, /* packing for light weight loosly coupled */ + cmPackMacCellCfgCfm, /* packing for light weight loosly coupled */ }; /** @@ -2139,7 +2138,7 @@ S16 MacHdlCellCfgReq macCellCfgFillCfmPst(pst,&cnfPst); macCellCfgCfm.transId = macCellCfg->transId; - //ret = cmPackLcMacCellCfgCfm(&cnfPst,&macCellCfgCfm); + ret = (*packMacCellCfmOpts[cnfPst.selector])(&cnfPst,&macCellCfgCfm); return ret; } /* end of MacHdlCellCfgReq */