X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_uhm.c;h=840f37687770b8376f2e4264192135176d415bf5;hb=9c929d38c3bc6ae39ed658d0a7297612e5525b00;hp=e795ef66c0459f1eeb65dd88879a450d48c358ef;hpb=18fbca81feebe0cf45f205c1c580c574741292b0;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_uhm.c b/src/5gnrmac/rg_uhm.c
index e795ef66c..840f37687 100755
--- a/src/5gnrmac/rg_uhm.c
+++ b/src/5gnrmac/rg_uhm.c
@@ -33,19 +33,7 @@
 */
 
 /* header include files -- defines (.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_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"       /* memory management */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "tfu.h"           /* TFU Interface defines */
 #include "crg.h"           /* CRG Interface defines */
@@ -57,15 +45,6 @@
 #include "rg_err.h"        /* MAC error defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* system services */
-#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"       /* memory management */
 
 #include "tfu.x"           /* TFU Interface defines */
 #include "crg.x"           /* CRG Interface includes */
@@ -74,7 +53,7 @@
 #include "rg_prg.x"        /* PRG Interface defines */
 #include "lrg.x"           /* LRG Interface includes */
 
-#include "du_mgr_mac_inf.h"
+#include "du_app_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 
 /* local defines */
@@ -104,14 +83,14 @@
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgUHMCrgUeCfg
+Void rgUHMCrgUeCfg
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb,
 CrgUeCfg       *ueCfg
 )
 #else
-PUBLIC Void rgUHMCrgUeCfg(cellCb, ueCb, ueCfg) 
+Void rgUHMCrgUeCfg(cellCb, ueCb, ueCfg) 
 RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 CrgUeCfg       *ueCfg;
@@ -142,14 +121,14 @@ CrgUeCfg       *ueCfg;
  *  @return  Void
  **/
 #ifdef ANSI
-PUBLIC Void rgUHMCrgUeRecfg
+Void rgUHMCrgUeRecfg
 (
 RgCellCb       *cellCb,
 RgUeCb         *ueCb,
 CrgUeRecfg     *ueRecfg
 )
 #else
-PUBLIC Void rgUHMCrgUeRecfg(cellCb, ueCb, ueRecfg) 
+Void rgUHMCrgUeRecfg(cellCb, ueCb, ueRecfg) 
 RgCellCb       *cellCb;
 RgUeCb         *ueCb;
 CrgUeRecfg     *ueRecfg;