Merge "[Epic-ID: ODUHIGH-518] Alignment to latest ORAN WG8 Spec: O-RAN.WG8.AAD.0...

[o-du/l2.git] / src / mt / ss_mem.c

diff --git a/src/mt/ss_mem.c b/src/mt/ss_mem.c
index d99e8fb..743a71d 100644 (file)
--- a/src/mt/ss_mem.c
+++ b/src/mt/ss_mem.c
@@ -111,17 +111,11 @@
 *       File:  ss_mem.c
 *
 */
-#ifdef ANSI
 S16 SRegDynRegion
 (
 Region region,                  /* region ID */
 SRegInfo *regInfo               /* information about the region */
 )
-#else
-S16 SRegDynRegion(region, regInfo)
-Region region;                  /* region ID */
-SRegInfo *regInfo;              /* information about the region */
-#endif
 {
    S16 ret;
 
@@ -205,17 +199,11 @@ SRegInfo *regInfo;              /* information about the region */
 *       File:  ss_mem.c
 *
 */
-#ifdef ANSI
 S16 SRegRegion
 (
 Region region,                  /* region ID */
 SRegInfo *regInfo               /* information about the region */
 )
-#else
-S16 SRegRegion(region, regInfo)
-Region region;                  /* region ID */
-SRegInfo *regInfo;              /* information about the region */
-#endif
 {
    S16 ret;
 
@@ -297,15 +285,10 @@ SRegInfo *regInfo;              /* information about the region */
 *       File:  ss_mem.c
 *
 */
-#ifdef ANSI
 S16 SDeregRegion
 (
 Region region                   /* region ID */
 )
-#else
-S16 SDeregRegion(region)
-Region region;                  /* region ID */
-#endif
 {
    S16 ret;
 
@@ -384,54 +367,35 @@ Region region;                  /* region ID */
 #ifndef SS_FAP
 /* ss001.301: Additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-#ifdef ANSI
 S16 SAlloc
 (
 Region region,                  /* region ID */
 Size *size,                     /* size of block required/allocated */
-U32 flags,                      /* allocation flags */
+uint32_t flags,                      /* allocation flags */
 Data **ptr,                      /* filled with pointer to block */
-U32   line,
-U8    *fileName,
-U8    entId
+uint32_t   line,
+uint8_t    *fileName,
+uint8_t    entId
 )
 #else
-S16 SAlloc(region, size, flags, ptr, line, fileName, entId)
-Region region;                  /* region ID */
-Size *size;                     /* size of block required/allocated */
-U32 flags;                      /* allocation flags */
-Data **ptr;                     /* filled with pointer to block */
-U32   line;
-U8   *fileName;
-U8    entId;
-#endif
-#else
 #ifdef T2K_MEM_LEAK_DBG
 S16 SAllocNew
 (
 Region region,                  /* region ID */
 Size *size,                     /* size of block required/allocated */
-U32 flags,                      /* allocation flags */
+uint32_t flags,                      /* allocation flags */
 Data **ptr,                      /* filled with pointer to block */
 char* file,
-U32 line
+uint32_t line
 )
 #else
-#ifdef ANSI
 S16 SAlloc
 (
 Region region,                  /* region ID */
 Size *size,                     /* size of block required/allocated */
-U32 flags,                      /* allocation flags */
+uint32_t flags,                      /* allocation flags */
 Data **ptr                      /* filled with pointer to block */
 )
-#else
-S16 SAlloc(region, size, flags, ptr)
-Region region;                  /* region ID */
-Size *size;                     /* size of block required/allocated */
-U32 flags;                      /* allocation flags */
-Data **ptr;                     /* filled with pointer to block */
-#endif
 #endif
 #endif
 {
@@ -584,27 +548,16 @@ Data **ptr;                     /* filled with pointer to block */
 */
 /* ss001.301: Additions */
 #ifdef SS_HISTOGRAM_SUPPORT 
-#ifdef ANSI
 S16 SFree
 (
 Region region,                  /* region ID */
 Data *ptr,                      /* pointer to the allocated block */
 Size size,                      /* size of block */
-U32  line,
-U8   *fileName,
-U8   entId
+uint32_t  line,
+uint8_t   *fileName,
+uint8_t   entId
 )
 #else
-S16 SFree(region, ptr, size, line, fileName, entId)
-Region region;                  /* region ID */
-Data *ptr;                      /* pointer to the allocated block */
-Size size;                      /* size of block */
-U32  line;
-U8   *fileName;
-U8   entId;
-#endif
-#else
-#ifdef ANSI
 #ifdef T2K_MEM_LEAK_DBG
 S16 SFreeNew
 (
@@ -612,7 +565,7 @@ Region region,                  /* region ID */
 Data *ptr,                      /* pointer to the allocated block */
 Size size,                       /* size of block */
 char* file,
-U32 line
+uint32_t line
 )
 #else
 S16 SFree
@@ -622,12 +575,6 @@ Data *ptr,                      /* pointer to the allocated block */
 Size size                       /* size of block */
 )
 #endif
-#else
-S16 SFree(region, ptr, size)
-Region region;                  /* region ID */
-Data *ptr;                      /* pointer to the allocated block */
-Size size;                      /* size of block */
-#endif
 #endif
 {
    S16 ret;
@@ -794,28 +741,23 @@ Size size;                      /* size of block */
 *       File:  mt_ss.c
 *
 */
-#ifdef ANSI
 S16 SHstGrmInfoShow 
 (
 Ent      *entId
 )
-#else
-S16 SHstGrmInfoShow(entId)
-Ent      *entId;
-#endif
 {
     /*ss012.301 : Increased Buffer size to fix segmentation fault*/
     Txt                                        prntBuf[511];  /* Buffer to print on the console */
-       U16                                     ret = ROK;     /* return value */
+       uint16_t                                        ret = ROK;     /* return value */
        Ent                                     tapaTsk[SS_MAX_TTSKS]; /* List of tapa task */
-       U32                                     tskCnt = 0;   /* Tapa task Count */
-       U32                                     regCnt = 0;   /* Region count */
-       U32                                     bktCnt = 0;   /* Bucket count in each region */
+       uint32_t                                        tskCnt = 0;   /* Tapa task Count */
+       uint32_t                                        regCnt = 0;   /* Region count */
+       uint32_t                                        bktCnt = 0;   /* Bucket count in each region */
        CmHstGrmHashListCp      *hashListCp = NULLP; /* Hash List ponter of bucket */
-       U32                  binCnt = 0;   
-       U32                  entCnt = 0;
+       uint32_t                  binCnt = 0;   
+       uint32_t                  entCnt = 0;
        CmMemEntries        *entry = NULLP;
-       U32                  blkSize = 0;
+       uint32_t                  blkSize = 0;
    
 
    memset(tapaTsk, ENTNC, sizeof(tapaTsk));