X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_timer.c;h=0d0fffce26433dbfc9041b38902c2b85c87ba1c9;hb=694adde1a08c393a8443fd5bbd4f036f5cf85403;hp=aa9e71f59b62c193d9c7ffd09cfdae21f29a61b9;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git

diff --git a/src/mt/ss_timer.c b/src/mt/ss_timer.c
index aa9e71f59..0d0fffce2 100644
--- a/src/mt/ss_timer.c
+++ b/src/mt/ss_timer.c
@@ -146,7 +146,7 @@ PRIVATE S16 STmrDeregHndlr ARGS((
 /* ss029.103: addition: procId added and timer function type modified */ 
 #ifndef SS_MULTIPLE_PROCS
 #ifdef ANSI
-PUBLIC S16 SRegCfgTmr
+S16 SRegCfgTmr
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -155,7 +155,7 @@ S16 units,                  /* period units */
 PFS16 tmrFnct               /* timer function, typically SActvTmr */
 )
 #else
-PUBLIC S16 SRegCfgTmr(ent, inst, period, units, tmrFnct)
+S16 SRegCfgTmr(ent, inst, period, units, tmrFnct)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -168,19 +168,17 @@ PFS16 tmrFnct;              /* timer function, typically SActvTmr */
 	SsTmrActvFn ssTmrActvFn;
 	/* ss041.103 - Moved handling to STmrRegHndlr */
 
-   TRC1(SRegCfgTmr);
-
    ssTmrActvFn.mtFlag = FALSE;
    ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;
    ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn);
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SRegCfgTmr
+S16 SRegCfgTmr
 (
 ProcId proc,                /* processor */
 Ent ent,                    /* entity */
@@ -190,7 +188,7 @@ S16 units,                  /* period units */
 PAIFTMRS16 tmrFnct               /* timer function, typically SActvTmr */
 )
 #else
-PUBLIC S16 SRegCfgTmr(proc, ent, inst, period, units, tmrFnct)
+S16 SRegCfgTmr(proc, ent, inst, period, units, tmrFnct)
 ProcId proc;                /* processor */
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
@@ -205,13 +203,11 @@ PAIFTMRS16 tmrFnct;              /* timer function, typically SActvTmr */
    SsTmrActvFn ssTmrActvFn;
    /* ss041.103 - Moved handling to STmrRegHndlr */
 
-   TRC1(SRegCfgTmr);
-
    ssTmrActvFn.mtFlag = FALSE;
    ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;
    ret = STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn);
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 #endif /* SS_MULTIPLE_PROCS */
@@ -240,7 +236,7 @@ PAIFTMRS16 tmrFnct;              /* timer function, typically SActvTmr */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SRegCfgTmrMt
+S16 SRegCfgTmrMt
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -249,7 +245,7 @@ S16 units,                  /* period units */
 PAIFTMRS16 tmrFnctMt        /* timer function, typically SActvTmr */
 )
 #else
-PUBLIC S16 SRegCfgTmrMt(ent, inst, period, units, tmrFnctMt)
+S16 SRegCfgTmrMt(ent, inst, period, units, tmrFnctMt)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -261,13 +257,11 @@ PAIFTMRS16 tmrFnctMt;       /* timer function, typically SActvTmr */
    /* ss015.301 - Enclosed all timer activation functions in a union. */
    SsTmrActvFn ssTmrActvFn;
 
-   TRC1(SRegCfgTmrMt);
-
    ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt;
    ssTmrActvFn.mtFlag = TRUE;
    ret = STmrRegHndlr(ent, inst, period, units, ssTmrActvFn);
 
-   RETVALUE(ret);
+   return (ret);
 }
 #endif /* SS_MT_TMR */
 #endif /* not SS_MULTIPLE_PROCS */
@@ -353,21 +347,19 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
 #endif /* SS_MULTPLE_PROCS */
 
-   TRC1(STmrRegHndlr);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
 
 #ifdef SS_MULTIPLE_PROCS
    if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS528, ERRZERO, "Invalid processor/entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else /* SS_MULTIPLE_PROCS */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS529, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -375,14 +367,14 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
    if (period <= 0)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS530, ERRZERO, "Invalid period");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check period units*/
    if ((units < 1) || (units > SS_TICKS_SEC))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS531, ERRZERO, "Invalid period units");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(ssTmrActvFn.mtFlag == TRUE) 
@@ -393,13 +385,13 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
       if (ssTmrActvFn.actvFnc.tmrActvFnMt == NULLP)  
       {
          SSLOGERROR(ERRCLS_INT_PAR, ESS532, ERRZERO, "Null pointer");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
 #else
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
 #else
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
    }
    else
@@ -407,7 +399,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
       if (ssTmrActvFn.actvFnc.tmrActvFn == NULLP)  
       {
           SSLOGERROR(ERRCLS_INT_PAR, ESS532, ERRZERO, "Null pointer");
-          RETVALUE(RFAILED);
+          return RFAILED;
       }
    } 
 
@@ -419,7 +411,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS533, ERRZERO,
                      "Could not find proc id index");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -431,7 +423,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS534, ERRZERO,
                      "Could not lock TAPA task table");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef SS_MULTIPLE_PROCS
@@ -445,18 +437,18 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS535, ERRZERO,
                      "Could not release the semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
       }
       SSLOGERROR(ERRCLS_INT_PAR, ESS536, ERRZERO, "Unknown task");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if ( SS_RELEASE_SEMA(&osCp.tTskTblSem) != ROK)
    {
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS537, ERRZERO,
                      "Could not release the semaphore");
-   RETVALUE(RFAILED);
+   return RFAILED;
 #endif
    }
 
@@ -471,7 +463,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
       SSLOGERROR(ERRCLS_DEBUG, ESS538, (ErrVal) ret,
                      "Could not lock timer table");
 #endif
-      RETVALUE(ret);
+      return (ret);
    }
 
 
@@ -483,7 +475,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS539, ERRZERO,
                      "Could not unlock the semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
@@ -491,7 +483,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
       SSLOGERROR(ERRCLS_DEBUG, ESS540, ERRZERO, "Too many timers");
 #endif
 
-      RETVALUE(ROUTRES);
+      return (ROUTRES);
    }
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -528,10 +520,10 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
             {
 #if (ERRCLASS & ERRCLS_DEBUG)
    SSLOGERROR(ERRCLS_DEBUG, ESS541, ERRZERO, "Could not unlock the semaphore");
-   RETVALUE(RFAILED);
+   return RFAILED;
 #endif
             }
-            RETVALUE(RFAILED);
+            return RFAILED;
          }
       }
    }
@@ -598,11 +590,11 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS542, ERRZERO,
                      "Could not unlock the semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
    }
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -625,7 +617,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #ifndef SS_MULTIPLE_PROCS
 
 #ifdef ANSI
-PUBLIC S16 SDeregCfgTmr
+S16 SDeregCfgTmr
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -634,7 +626,7 @@ S16 units,                  /* period units */
 PFS16 tmrFnct               /* timer function */
 )
 #else
-PUBLIC S16 SDeregCfgTmr(ent, inst, period, units, tmrFnct)
+S16 SDeregCfgTmr(ent, inst, period, units, tmrFnct)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -647,19 +639,17 @@ PFS16 tmrFnct;              /* timer function */
    SsTmrActvFn ssTmrActvFn;
    /* ss041.103 - Moved handling to STmrDeregHndlr */
 
-   TRC1(SDeregCfgTmr);
-
    ssTmrActvFn.mtFlag = FALSE;
    ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;  
    ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn);
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 #else /* SS_MULTIPLE_PROCS */
 
 #ifdef ANSI
-PUBLIC S16 SDeregCfgTmr
+S16 SDeregCfgTmr
 (
 ProcId proc,                /* processor */
 Ent ent,                    /* entity */
@@ -669,7 +659,7 @@ S16 units,                  /* period units */
 PAIFTMRS16 tmrFnct               /* timer function */
 )
 #else
-PUBLIC S16 SDeregCfgTmr(proc, ent, inst, period, units, tmrFnct)
+S16 SDeregCfgTmr(proc, ent, inst, period, units, tmrFnct)
 ProcId proc;                /* processor */
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
@@ -684,13 +674,11 @@ PAIFTMRS16 tmrFnct;              /* timer function */
 
    /* ss041.103 - Moved handling to STmrDeregHndlr */
 
-   TRC1(SDeregCfgTmr);
-
    ssTmrActvFn.mtFlag = FALSE;
    ssTmrActvFn.actvFnc.tmrActvFn = tmrFnct;  
    ret = STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn);
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 #endif /* SS_MULTIPLE_PROCS */
@@ -714,7 +702,7 @@ PAIFTMRS16 tmrFnct;              /* timer function */
 *
 */
 #ifdef ANSI
-PUBLIC S16 SDeregCfgTmrMt
+S16 SDeregCfgTmrMt
 (
 Ent ent,                    /* entity */
 Inst inst,                  /* instance */
@@ -723,7 +711,7 @@ S16 units,                  /* period units */
 PAIFTMRS16 tmrFnctMt               /* timer function */
 )
 #else
-PUBLIC S16 SDeregCfgTmrMt(ent, inst, period, units, tmrFnctMt)
+S16 SDeregCfgTmrMt(ent, inst, period, units, tmrFnctMt)
 Ent ent;                    /* entity */
 Inst inst;                  /* instance */
 S16 period;                 /* period */
@@ -735,14 +723,12 @@ PAIFTMRS16 tmrFnctMt;              /* timer function */
    /* ss015.301 Enclosed all timer activation functions in a union. */
    SsTmrActvFn ssTmrActvFn;
 
-   TRC1(SDeregCfgTmrMt);
-
    ssTmrActvFn.actvFnc.tmrActvFnMt = tmrFnctMt;
    ssTmrActvFn.mtFlag = TRUE;
 
    ret = STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn);
 
-   RETVALUE(ret);
+   return (ret);
 }
 #endif /* SS_MT_TMR */
 #endif /* not SS_MULTIPLE_PROCS */
@@ -827,37 +813,34 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #endif /* SS_MULTIPLE_PROCS */
 
 
-   TRC1(STmrDeregHndlr);
-
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
 
 #ifdef SS_MULTIPLE_PROCS
    if ((proc == SS_INV_PROCID) || (ent >= SS_MAX_ENT) ||  (inst >= SS_MAX_INST))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS543, ERRZERO, "Invalid processor/entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #else /* SS_MULTIPLE_PROCS */
    if (ent >= SS_MAX_ENT ||  inst >= SS_MAX_INST)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS544, ERRZERO, "Invalid entity/instance");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
    /* check period */
    if (period <= 0)
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS545, ERRZERO, "Invalid period");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check period units */
    if ((units < 1) || (units > SS_TICKS_SEC))
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS546, ERRZERO, "Invalid period units");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check timer function */
@@ -868,13 +851,13 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
    if (ssTmrActvFn.actvFnc.tmrActvFnMt == NULLP)  
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS547, ERRZERO, "Null pointer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #else
-    RETVALUE(RFAILED);
+    return RFAILED;
 #endif
 #else
-    RETVALUE(RFAILED);
+    return RFAILED;
 #endif
  
    }
@@ -883,7 +866,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
    if (ssTmrActvFn.actvFnc.tmrActvFn == NULLP)  
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS547, ERRZERO, "Null pointer");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
   }
 
@@ -895,7 +878,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
    {
       SSLOGERROR(ERRCLS_INT_PAR, ESS548, ERRZERO,
                      "Could not find proc id index");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* SS_MULTIPLE_PROCS */
 
@@ -906,7 +889,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
    {
       SSLOGERROR(ERRCLS_DEBUG, ESS549, ERRZERO,
                      "Could not lock TAPA task table");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 #ifdef SS_MULTIPLE_PROCS
@@ -920,18 +903,18 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS550, ERRZERO,
                      "Could not release the semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
       SSLOGERROR(ERRCLS_INT_PAR, ESS551, ERRZERO, "Unknown task");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if ( SS_RELEASE_SEMA(&osCp.tTskTblSem) != ROK)
    {
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS552, ERRZERO,
                      "Could not release the semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
     }
 
@@ -946,7 +929,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
       SSLOGERROR(ERRCLS_DEBUG, ESS553, (ErrVal) ret,
                      "Could not lock timer table");
 #endif
-      RETVALUE(ret);
+      return (ret);
    }
 
 
@@ -993,7 +976,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #if (ERRCLASS & ERRCLS_DEBUG)
          SSLOGERROR(ERRCLS_DEBUG, ESS554, ERRZERO,
                      "Could not unlock the semaphore");
-         RETVALUE(RFAILED);
+         return RFAILED;
 #endif
       }
 
@@ -1001,7 +984,7 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
       SSLOGERROR(ERRCLS_DEBUG, ESS555, ERRZERO, "Could not locate timer");
 #endif
 
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 
@@ -1041,12 +1024,12 @@ SsTmrActvFn ssTmrActvFn;         /* timer function */
 #if (ERRCLASS & ERRCLS_DEBUG)
       SSLOGERROR(ERRCLS_DEBUG, ESS556, ERRZERO,
                      "Could not unlock the semaphore");
-      RETVALUE(RFAILED);
+      return RFAILED;
 #endif
    }
 
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 /**********************************************************************