X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_queue.c;h=91fc3018c2b743171a9ed9d4a2abbc9e8485624a;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=e1cb63ba2b7a3c3c42480588f8f6dc23d9e3ef07;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/mt/ss_queue.c b/src/mt/ss_queue.c index e1cb63ba2..91fc3018c 100644 --- a/src/mt/ss_queue.c +++ b/src/mt/ss_queue.c @@ -93,16 +93,15 @@ * */ #ifdef ANSI -PUBLIC S16 SInitQueue +S16 SInitQueue ( Queue *q /* queue */ ) #else -PUBLIC S16 SInitQueue(q) +S16 SInitQueue(q) Queue *q; /* queue */ #endif { - TRC1(SInitQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue pointer */ @@ -143,12 +142,12 @@ Queue *q; /* queue */ * */ #ifdef ANSI -PUBLIC S16 SFlushQueue +S16 SFlushQueue ( Queue *q /* queue */ ) #else -PUBLIC S16 SFlushQueue(q) +S16 SFlushQueue(q) Queue *q; /* queue */ #endif { @@ -158,10 +157,9 @@ Queue *q; /* queue */ #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif - TRC1(SFlushQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue */ @@ -218,20 +216,19 @@ Queue *q; /* queue */ * */ #ifdef ANSI -PUBLIC S16 SCatQueue +S16 SCatQueue ( Queue *q1, /* queue 1 */ Queue *q2, /* queue 2 */ Order order /* order */ ) #else -PUBLIC S16 SCatQueue(q1, q2, order) +S16 SCatQueue(q1, q2, order) Queue *q1; /* queue 1 */ Queue *q2; /* queue 2 */ Order order; /* order */ #endif { - TRC1(SCatQueue) #if (ERRCLASS & ERRCLS_INT_PAR) if (q1 == NULLP) @@ -330,18 +327,17 @@ Order order; /* order */ * */ #ifdef ANSI -PUBLIC S16 SFndLenQueue +S16 SFndLenQueue ( Queue *q, /* queue */ QLen *lngPtr /* pointer to length */ ) #else -PUBLIC S16 SFndLenQueue(q, lngPtr) +S16 SFndLenQueue(q, lngPtr) Queue *q; /* queue */ QLen *lngPtr; /* pointer to length */ #endif { - TRC1(SFndLenQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue */ @@ -387,14 +383,14 @@ QLen *lngPtr; /* pointer to length */ * */ #ifdef ANSI -PUBLIC S16 SExamQueue +S16 SExamQueue ( Buffer **bufPtr, /* pointer to buffer */ Queue *q, /* queue */ QLen idx /* index */ ) #else -PUBLIC S16 SExamQueue(bufPtr, q, idx) +S16 SExamQueue(bufPtr, q, idx) Buffer **bufPtr; /* pointer to buffer */ Queue *q; /* queue */ QLen idx; /* index */ @@ -403,7 +399,6 @@ QLen idx; /* index */ Buffer *tmpBuf; QLen i; - TRC1(SExamQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ @@ -482,14 +477,14 @@ QLen idx; /* index */ * */ #ifdef ANSI -PUBLIC S16 SAddQueue +S16 SAddQueue ( Buffer *mBuf, /* buffer */ Queue *q, /* queue */ QLen idx /* index */ ) #else -PUBLIC S16 SAddQueue(mBuf, q, idx) +S16 SAddQueue(mBuf, q, idx) Buffer *mBuf; /* buffer */ Queue *q; /* queue */ QLen idx; /* index */ @@ -498,7 +493,6 @@ QLen idx; /* index */ Buffer *tBuf; QLen i; - TRC1(SAddQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue */ @@ -607,14 +601,14 @@ QLen idx; /* index */ * */ #ifdef ANSI -PUBLIC S16 SRemQueue +S16 SRemQueue ( Buffer **bufPtr, /* pointer to buffer */ Queue *q, /* queue */ QLen idx /* index */ ) #else -PUBLIC S16 SRemQueue(bufPtr, q, idx) +S16 SRemQueue(bufPtr, q, idx) Buffer **bufPtr; /* pointer to buffer */ Queue *q; /* queue */ QLen idx; /* index */ @@ -623,7 +617,6 @@ QLen idx; /* index */ Buffer *tBuf; QLen i; - TRC1(SRemQueue) #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ @@ -715,18 +708,17 @@ QLen idx; /* index */ * */ #ifdef ANSI -PUBLIC INLINE S16 SQueueFirst +inline S16 SQueueFirst ( Buffer *buf, /* buffer */ Queue *q /* queue */ ) #else -PUBLIC INLINE S16 SQueueFirst(buf, q) +inline S16 SQueueFirst(buf, q) Buffer *buf; /* buffer */ Queue *q; /* queue */ #endif { - TRC1(SQueueFirst) return (SAddQueue(buf, q, 0)); } /* end of SQueueFirst */ @@ -754,18 +746,17 @@ Queue *q; /* queue */ * */ #ifdef ANSI -PUBLIC INLINE S16 SDequeueFirst +inline S16 SDequeueFirst ( Buffer **bufPtr, /* pointer to buffer */ Queue *q /* queue */ ) #else -PUBLIC INLINE S16 SDequeueFirst(bufPtr, q) +inline S16 SDequeueFirst(bufPtr, q) Buffer **bufPtr; /* pointer to buffer */ Queue *q; /* queue */ #endif { - TRC2(SDequeueFirst) return (SRemQueue(bufPtr, q, 0)); } /* end of SDequeueFirst */ @@ -791,18 +782,17 @@ Queue *q; /* queue */ * */ #ifdef ANSI -PUBLIC S16 SQueueLast +S16 SQueueLast ( Buffer *buf, /* buffer */ Queue *q /* queue */ ) #else -PUBLIC S16 SQueueLast(buf, q) +S16 SQueueLast(buf, q) Buffer *buf; /* buffer */ Queue *q; /* queue */ #endif { - TRC1(SQueueLast) #if (ERRCLASS & ERRCLS_INT_PAR) /* check queue */ @@ -845,20 +835,19 @@ Queue *q; /* queue */ * */ #ifdef ANSI -PUBLIC S16 SDequeueLast +S16 SDequeueLast ( Buffer **bufPtr, /* pointer to buffer */ Queue *q /* queue */ ) #else -PUBLIC S16 SDequeueLast(bufPtr, q) +S16 SDequeueLast(bufPtr, q) Buffer **bufPtr; /* pointer to buffer */ Queue *q; /* queue */ #endif { S16 ret; - TRC1(SDequeueLast) #if (ERRCLASS & ERRCLS_INT_PAR) /* check buffer pointer */ @@ -900,19 +889,18 @@ Queue *q; /* queue */ * */ #ifdef ANSI -PUBLIC S16 ssInitDmndQ +S16 ssInitDmndQ ( SsDmndQ *dQueue /* Demand Queue */ ) #else -PUBLIC S16 ssInitDmndQ(dQueue) +S16 ssInitDmndQ(dQueue) SsDmndQ *dQueue; /* Demand Queue */ #endif { - U8 i; + uint8_t i; S16 ret; - TRC0(ssInitDmnddQ) #if (ERRCLASS & ERRCLS_INT_PAR) if (dQueue == NULLP) @@ -998,20 +986,19 @@ SsDmndQ *dQueue; /* Demand Queue */ * */ #ifdef ANSI -PUBLIC S16 ssDestroyDmndQ +S16 ssDestroyDmndQ ( SsDmndQ *dQueue /* demand Queue */ ) #else -PUBLIC S16 ssDestroyDmndQ(dQueue) +S16 ssDestroyDmndQ(dQueue) SsDmndQ *dQueue; /* demand Queue */ #endif { - U8 i; + uint8_t i; Buffer *tBuf; S16 ret; - TRC0(ssDestroyDmndQ) #if (ERRCLASS & ERRCLS_INT_PAR) if (dQueue == NULLP) @@ -1082,7 +1069,7 @@ SsDmndQ *dQueue; /* demand Queue */ * */ #ifdef ANSI -PUBLIC S16 ssDmndQPut +S16 ssDmndQPut ( SsDmndQ *dQueue, /* demand Queue */ Buffer *mBuf, /* message buffer */ @@ -1090,7 +1077,7 @@ Prior priority, /* priority */ Order order /* position */ ) #else -PUBLIC S16 ssDmndQPut(dQueue, mBuf, priority, order) +S16 ssDmndQPut(dQueue, mBuf, priority, order) SsDmndQ *dQueue; /* demand Queue */ Buffer *mBuf; /* message buffer */ Prior priority; /* priority */ @@ -1098,22 +1085,21 @@ Order order; /* position */ #endif { #ifndef TENB_RTLIN_CHANGES - U8 maskIndex; /* mask Index */ - U8 bitPosition; /* bit position in index */ + uint8_t maskIndex; /* mask Index */ + uint8_t bitPosition; /* bit position in index */ #else - U8 qIndex; + uint8_t qIndex; #endif Queue *queue; /* queue in demand queue */ S16 ret; /* return value */ #ifdef SS_PERF int value; - U32 size; + uint32_t size; #endif #ifdef MSPD_MLOG_NEW - U32 t = MacGetTick(); + uint32_t t = MacGetTick(); #endif - TRC0(ssDmndQPut) #if (ERRCLASS & ERRCLS_INT_PAR) if (dQueue == NULLP) @@ -1288,18 +1274,17 @@ Order order; /* position */ * */ #ifdef ANSI -PUBLIC S16 ssDmndQWait +S16 ssDmndQWait ( SsDmndQ *dQueue /* demand queue */ ) #else -PUBLIC S16 ssDmndQWait(dQueue) +S16 ssDmndQWait(dQueue) SsDmndQ *dQueue; /* demand queue */ #endif { S16 ret; - TRC0(ssDmndQWait) #if (ERRCLASS & ERRCLS_INT_PAR) if (dQueue == NULLP) @@ -1343,14 +1328,14 @@ SsDmndQ *dQueue; /* demand queue */ * */ #ifdef ANSI -PUBLIC S16 ssDmndQGet +S16 ssDmndQGet ( SsDmndQ *dQueue, /* demand queue */ Buffer **mBuf, /* message buffer */ Order order /* position */ ) #else -PUBLIC S16 ssDmndQGet(dQueue, mBuf, order) +S16 ssDmndQGet(dQueue, mBuf, order) SsDmndQ *dQueue; /* demand queue */ Buffer **mBuf; /* message buffer */ Order order; /* position */ @@ -1360,11 +1345,10 @@ Order order; /* position */ S16 ret; S16 i; #ifndef TENB_RTLIN_CHANGES - U8 bitPosition; - U8 qIndex; + uint8_t bitPosition; + uint8_t qIndex; #endif - TRC0(ssDmndQGet) #if (ERRCLASS & ERRCLS_INT_PAR) if (mBuf == NULLP) @@ -1527,14 +1511,14 @@ setting the crntSize to 0 and removing the message */ * */ #ifdef ANSI -PUBLIC S16 ssFndLenDmndQ +S16 ssFndLenDmndQ ( SsDmndQ *dQueue, /* demand queue */ Prior priority, /* priority */ QLen *len /* queue length */ ) #else -PUBLIC S16 ssFndLenDmndQ(dQueue, priority, len) +S16 ssFndLenDmndQ(dQueue, priority, len) SsDmndQ *dQueue; /* demand queue */ Prior priority; /* priority */ QLen *len; /* queue length */ @@ -1542,9 +1526,8 @@ QLen *len; /* queue length */ { S16 ret; /* return value */ - U8 i; + uint8_t i; - TRC0(ssFndLenDmndQ) #if (ERRCLASS & ERRCLS_INT_PAR) if ((dQueue == NULLP) || (len == NULLP))