U8, U16, U32 data type changes

[o-du/l2.git] / src / 5gnrmac / rg_id.c

diff --git a/src/5gnrmac/rg_id.c b/src/5gnrmac/rg_id.c
index 8b4f52d..1d4afde 100755 (executable)
--- a/src/5gnrmac/rg_id.c
+++ b/src/5gnrmac/rg_id.c
@@ -35,16 +35,10 @@
 */
 
 /* 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 */
 
 
@@ -104,25 +98,23 @@ PRIVATE CONSTANT SystemId sId ={
 */
  
 #ifdef ANSI
-PUBLIC Void rgGetSId
+Void rgGetSId
 (
 SystemId *s                 /* system id */
 )
 #else
-PUBLIC Void rgGetSId(s)
+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 */