X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_id.c;h=a0c3d29de067944b0176cb834cee9bec82042b5b;hb=2aa3cc7f94edf59f4fdb04ad81c7a14322bde00e;hp=8b4f52daa89bdfbc932dfea37ab613dbeb8d9cb5;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_id.c b/src/5gnrmac/rg_id.c
index 8b4f52daa..a0c3d29de 100755
--- a/src/5gnrmac/rg_id.c
+++ b/src/5gnrmac/rg_id.c
@@ -35,23 +35,17 @@
 */
 
 /* header include files (.h) */
-#include "envopt.h"           /* environment options */  
-#include "envdep.h"           /* environment dependent */
-#include "envind.h"           /* environment independent */
-#include "gen.h"              /* general layer */
-#include "ssi.h"              /* system services */
+#include "common_def.h"
 #include "lrg.h"              /* layer manager */
    
 /* header/extern include files (.x) */
-#include "gen.x"              /* general layer */
-#include "ssi.x"              /* system services */
 #include "cm_lib.x"           /* common library */
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
-EXTERN Void rgGetSId ARGS((SystemId *s));
+Void rgGetSId ARGS((SystemId *s));
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
@@ -65,7 +59,7 @@ EXTERN Void rgGetSId ARGS((SystemId *s));
 #define RGSWPN "1000372"     /* LTE MAC - part number */
 
 /* system id */
-PRIVATE CONSTANT SystemId sId ={
+static const SystemId sId ={
    RGSWMV,              /* LTE MAC - main version */
    RGSWMR,              /* LTE MAC - main revision */
    RGSWBV,              /* LTE MAC - branch version */
@@ -103,26 +97,19 @@ PRIVATE CONSTANT SystemId sId ={
 *
 */
  
-#ifdef ANSI
-PUBLIC Void rgGetSId
+Void rgGetSId
 (
 SystemId *s                 /* system id */
 )
-#else
-PUBLIC Void rgGetSId(s)
-SystemId *s;                /* system id */
-#endif
 {
-   TRC2(rgGetSId);
-
    s->mVer = sId.mVer;
    s->mRev = sId.mRev;
    s->bVer = sId.bVer;
    s->bRev = sId.bRev;
-   cmMemcpy((U8 *)s->ptNmb, (U8 *)sId.ptNmb, LRG_MAX_PT_NUM_SIZE); 
+   memcpy(s->ptNmb, sId.ptNmb, LRG_MAX_PT_NUM_SIZE); 
 
    /* Stack Crash Problem for TRACE5 Changes. Added the return below */
-  RETVOID; 
+  return; 
   
 } /* end of rgGetSid */