X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fmt_ss_wl.x;h=2bc542b0cfe7128c11bb57b0b857be2890d4c867;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=96198b5031eb53cfda086e4d1176ee4b82a6bca1;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git

diff --git a/src/mt/mt_ss_wl.x b/src/mt/mt_ss_wl.x
index 96198b503..2bc542b0c 100755
--- a/src/mt/mt_ss_wl.x
+++ b/src/mt/mt_ss_wl.x
@@ -33,128 +33,10 @@
 #ifndef __MTSSWLX__
 #define __MTSSWLX__
 
-#if 0
-/* mt001.301: Addition */
-#ifdef SS_LOGGER_SUPPORT 
-/* #define __USE_POSIX */
-#include <limits.h>
-#include <netinet/in.h>
-#endif /* SS_LOGGER_SUPPORT  */
-
-/* TAPA task entry doesn't need anything extra for MTSS */
-typedef S8              SsdTTskEntry;
-
-
-/* System task entry */
-typedef struct ssdSTskEntry
-{
-   pthread_t            tId;
-   Ent                  ent;
-   Inst                 inst;
-   SLockId              lock;
-
-#ifdef SS_MULTICORE_SUPPORT
-   U32                  lwpId;
-#endif /* SS_MULTICORE_SUPPORT */
-} SsdSTskEntry;
-
-
-#ifdef SS_DRVR_SUPPORT
-/* Driver task entry */
-typedef struct ssdDrvrTskEntry
-{
-   Bool flag;
-
-} SsdDrvrTskEntry;
-#endif
-
-
-/* timer entry--MTSS uses common timers */
-typedef struct ssdTmrEntry
-{
-   CmTimer              timers[TMR_DEF_MAX];
-
-} SsdTmrEntry;
-
-
-/* dynamic pool doesn't need anything extra for MTSS */
-typedef S8              SsdDPoolEntry;
-
-
-/* static pool -- information for the memory management scheme */
-typedef S8              SsdSPoolEntry;
-
-
-/* generic pool doesn't need anything extra for MTSS */
-typedef S8              SsdPoolEntry;
-
-
-/* region doesn't need anything extra for MTSS */
-typedef S8              SsdRegionEntry;
-
-
-/* system services control point--tick count, timer implementation,
- *   console implementation, IS task implementation
- */
-typedef struct ssdOs
-{
-   unsigned     randSeed;               /* random number generator seed */
-
-   Ticks        sysTicks;               /* elapsed system ticks */
-
-   pthread_t    tmrHdlrTID;             /* timer handler thread */
-   CmTqCp       tmrTqCp;                /* common timer control point */
-   CmTqType     tmrTq[SS_MAX_TMRS];     /* common timer queue */
-
-   sem_t        ssStarted;              /* posted when SS completes init */
-#ifdef CONAVL
-   FILE         *conInFp;               /* console input file pointer */
-   FILE         *conOutFp;              /* console output file pointer */
-   pthread_t    conHdlrTID;             /* console handler thread ID */
-#endif
-
-#ifndef NOFILESYS
-   FILE         *fileOutFp;             /* output file pointer */
-#endif
-
-#ifdef SS_DRVR_SUPPORT
-   pthread_t    isTskHdlrTID;           /* IS task handler thread ID */
-   int          isFildes[2];            /* pipe for SSetIntPend to isTskHdlr */
-#endif
-   Bool         sigEvnt;                /*mt010.301 Flag to check interupt signal(SIGINT)*/
-
-} SsdOs;
-
-/* mt018.201 - added for memory configuration */
-typedef struct mtBktCfg
-{
-   Size         blkSize;                /* bucket quantum size */
-   U32          numBlks;                /* the total blocks in the bucket */
-} MtBktCfg;
-
-typedef struct mtRegCfg
-{
-   Region       regionId;
-   U16          numBkts;
-   Size         heapsize;
-   MtBktCfg     bkt[SS_MAX_POOLS_PER_REG];
-} MtRegCfg;
-
-typedef struct mtMemCfg
-{
-   U8           numRegions;
-   MtRegCfg     region[SS_MAX_REGS];
-} MtMemCfg;
-
-#endif
-
-
-
-
 typedef struct mtDynBktCfg
 {
-   U16          blkSetRelThreshold;       /* threshold value for releasing memory blocks */
-   U16          blkSetAcquireThreshold;   /* threshold for requesting additional memory blocks */
+   uint16_t          blkSetRelThreshold;       /* threshold value for releasing memory blocks */
+   uint16_t          blkSetAcquireThreshold;   /* threshold for requesting additional memory blocks */
 } MtDynBktCfg;
 
 /* The number of blocks in the buckets and size of bloks must be 
@@ -162,7 +44,7 @@ typedef struct mtDynBktCfg
 typedef struct mtDynRegCfg
 {
    Region          regionId;                  /* Region Id */
-   U16             numBkts;                   /* Number of buckets */
+   uint16_t             numBkts;                   /* Number of buckets */
    MtDynBktCfg     bkt[SS_MAX_POOLS_PER_REG]; /* Threshold value configuration for each buckets */
 } MtDynRegCfg;
 
@@ -171,7 +53,7 @@ typedef struct mtDynRegCfg
  * as of the one configured in the gloabl region */
 typedef struct mtDynMemCfg
 {
-   U8              numRegions;           /* Number of regions */
+   uint8_t              numRegions;           /* Number of regions */
    MtDynRegCfg     region[SS_MAX_REGS];  /* Configuration details of each region */
 } MtDynMemCfg;
 
@@ -180,38 +62,19 @@ typedef struct mtDynMemCfg
 typedef struct mtGlobBktCfg
 {
    Size         blkSize;          /* bucket quantum size */
-   U32          numBlks;          /* the total blocks in the bucket */
-   U16          bucketSetSize;    /* Size of each bucket set */
+   uint32_t          numBlks;          /* the total blocks in the bucket */
+   uint16_t          bucketSetSize;    /* Size of each bucket set */
 } MtGlobBktCfg;
 
 typedef struct mtGlobMemCfg
 {
-   U16              numBkts;
+   uint16_t              numBkts;
 #ifdef  XEON_SPECIFIC_CHANGES
    Size             heapSize;
 #endif   
    MtGlobBktCfg     bkt[SS_MAX_POOLS_PER_REG];
 }MtGlobMemCfg;
 
-
-#if 0
-
-/* mt003.301 Readwrite lock additions */
-#ifdef SS_LOCK_SUPPORT
-typedef struct sLockInfo
-{
-  union
-  {
-#ifdef SS_RDWR_LOCK_SUPPORT
-   pthread_rwlock_t rdWrLockId;
-#endif /* SS_RDWR_LOCK_SUPPORT */
-#ifdef SS_REC_LOCK_SUPPORT
-	pthread_mutex_t  recurLock;
-#endif /* SS_REC_LOCK_SUPPORT */
-  }l;
-}SLockInfo;
-#endif /* SS_LOCK_SUPPORT */
-#endif  /*  __MTSSX__  */
 #endif
 
 /**********************************************************************