X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_strm.c;h=b4fb65f6169e1c30e25f082819bd7e492340c1ae;hb=65780c0e397afca1bc67923de1a19a420a0e86f3;hp=9d14ed47b5d45d82e13daf608eeddc8914bc19b2;hpb=3f340f5742e5c7c92b8541479ee7f2d670200cfb;p=o-du%2Fl2.git diff --git a/src/mt/ss_strm.c b/src/mt/ss_strm.c index 9d14ed47b..b4fb65f61 100644 --- a/src/mt/ss_strm.c +++ b/src/mt/ss_strm.c @@ -76,7 +76,7 @@ /* private variable declarations */ -PRIVATE struct +static struct { Region mdRegion; /* region for message and data blocks */ Region datRegion; /* region for data buffers */ @@ -103,17 +103,11 @@ PRIVATE struct * File: ss_strm.c * */ -#ifdef ANSI S16 ssStrmCfg ( Region mdRegId, /* region for message and data blocks */ Region datRegId /* region for data buffers */ ) -#else -S16 ssStrmCfg(mdRegId, datRegId) -Region mdRegId; /* region for message and data blocks */ -Region datRegId; /* region for data buffers */ -#endif { strmCfg.mdRegion = mdRegId; @@ -150,21 +144,15 @@ Region datRegId; /* region for data buffers */ * File: ss_strm.c * */ -#ifdef ANSI S32 ssAdjMsg ( SsMblk *mp, /* message */ S32 len /* bytes to remove */ ) -#else -S32 ssAdjMsg(mp, len) -SsMblk *mp; /* message */ -S32 len; /* bytes to remove */ -#endif { S32 n; /* counter */ S32 size; /* size of mblks of same type as head/tail */ - U8 type; /* message type */ + uint8_t type; /* message type */ SsMblk *bp; /* mblk for iteration */ SsMblk *first; /* first mblk to be adjusted */ @@ -309,17 +297,11 @@ S32 len; /* bytes to remove */ * File: ss_strm.c * */ -#ifdef ANSI SsMblk *ssAllocB ( S32 size, /* required size */ -U32 pri /* message priority */ +uint32_t pri /* message priority */ ) -#else -SsMblk *ssAllocB(size, pri) -S32 size; /* required size */ -U32 pri; /* message priority */ -#endif { SsMblk *bp; /* mblk for iteration */ Data *dat; /* pointer to data buffer */ @@ -330,7 +312,7 @@ U32 pri; /* message priority */ #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif UNUSED(pri); @@ -340,7 +322,7 @@ U32 pri; /* message priority */ m = (sizeof(SsMblk) + sizeof(SsDblk)); /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp, __LINE__, (U8*)__FILE__, ENTNC); + r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp, __LINE__, (uint8_t*)__FILE__, ENTNC); #else r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -360,7 +342,7 @@ U32 pri; /* message priority */ n = size; /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - r = SAlloc(strmCfg.datRegion, &n, 0, &dat, __LINE__, (U8*)__FILE__, ENTNC); + r = SAlloc(strmCfg.datRegion, &n, 0, &dat, __LINE__, (uint8_t*)__FILE__, ENTNC); #else r = SAlloc(strmCfg.datRegion, &n, 0, &dat); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -372,7 +354,7 @@ U32 pri; /* message priority */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - SFree(strmCfg.mdRegion, (Data *)bp, m, __LINE__, (U8*)__FILE__, ENTNC); + SFree(strmCfg.mdRegion, (Data *)bp, m, __LINE__, (uint8_t*)__FILE__, ENTNC); #else SFree(strmCfg.mdRegion, (Data *)bp, m); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -386,7 +368,7 @@ U32 pri; /* message priority */ } /* generic set-up-message function */ - SS_STRM_INITB(bp, (SsDblk *)(((U8 *)bp) + sizeof(SsMblk)), dat, size, NULLP); + SS_STRM_INITB(bp, (SsDblk *)(((uint8_t *)bp) + sizeof(SsMblk)), dat, size, NULLP); return (bp); @@ -409,19 +391,14 @@ U32 pri; /* message priority */ * File: ss_strm.c * */ -#ifdef ANSI SsMblk *ssCopyB ( SsMblk *mp /* message block */ ) -#else -SsMblk *ssCopyB(mp) -SsMblk *mp; /* message block */ -#endif { SsMblk *bp; /* mblk for iteration */ - U8 *ptr; /* pointer to data */ - U32 size; /* size of data content */ + uint8_t *ptr; /* pointer to data */ + uint32_t size; /* size of data content */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -477,15 +454,10 @@ SsMblk *mp; /* message block */ * File: ss_strm.c * */ -#ifdef ANSI SsMblk *ssCopyMsg ( SsMblk *mp /* message block */ ) -#else -SsMblk *ssCopyMsg(mp) -SsMblk *mp; /* message block */ -#endif { SsMblk *first; /* first mblk in message */ SsMblk *bp; /* mblk for iteration */ @@ -554,15 +526,10 @@ SsMblk *mp; /* message block */ * File: ss_strm.c * */ -#ifdef ANSI SsMblk *ssDupB ( SsMblk *mp /* message block */ ) -#else -SsMblk *ssDupB(mp) -SsMblk *mp; /* message block */ -#endif { SsMblk *bp; /* mblk for iteration */ /* ss028.103 - Addition of lock for mBuf reference count */ @@ -649,15 +616,10 @@ SsMblk *mp; /* message block */ * File: ss_strm.c * */ -#ifdef ANSI SsMblk *ssDupMsg ( SsMblk *mp /* message block */ ) -#else -SsMblk *ssDupMsg(mp) -SsMblk *mp; /* message block */ -#endif { SsMblk *first; /* first mblk in message */ SsMblk *bp; /* mblk for iteration */ @@ -715,21 +677,13 @@ SsMblk *mp; /* message block */ * File: ss_strm.c * */ -#ifdef ANSI SsMblk *ssESBAlloc ( -U8 *base, /* client supplied data buffer */ +uint8_t *base, /* client supplied data buffer */ S32 size, /* size of data buffer */ S32 pri, /* message priority */ SsFrtn *fr_rtn /* free routine */ ) -#else -SsMblk *ssESBAlloc(base, size, pri, fr_rtn) -U8 *base; /* client supplied data buffer */ -S32 size; /* size of data buffer */ -S32 pri; /* message priority */ -SsFrtn *fr_rtn; /* free routine */ -#endif { SsMblk *bp; /* mblk for iteration */ Size m; /* mblk + dblk */ @@ -751,11 +705,11 @@ SsFrtn *fr_rtn; /* free routine */ m = (sizeof(SsMblk) + sizeof(SsDblk)); /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp, __LINE__, (U8*)__FILE__, ENTNC); + r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp, __LINE__, (uint8_t*)__FILE__, ENTNC); #else #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif r = SAlloc(strmCfg.mdRegion, &m, 0, (Data **)&bp); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -770,7 +724,7 @@ SsFrtn *fr_rtn; /* free routine */ /* use the generic set-up-message function to initialize everything */ - SS_STRM_INITB(bp, (SsDblk *)(((U8 *)bp) + sizeof(SsMblk)), + SS_STRM_INITB(bp, (SsDblk *)(((uint8_t *)bp) + sizeof(SsMblk)), base, size, fr_rtn); @@ -794,15 +748,10 @@ SsFrtn *fr_rtn; /* free routine */ * File: ss_strm.c * */ -#ifdef ANSI Void ssFreeB ( SsMblk *mp /* message block */ ) -#else -Void ssFreeB(mp) -SsMblk *mp; /* message block */ -#endif { SsMblk *bp; /* mblk for iteration */ Size size; /* mblk + dblk */ @@ -810,14 +759,14 @@ SsMblk *mp; /* message block */ #ifdef T2K_MEM_LEAK_DBG char* file = __FILE__; - U32 line = __LINE__; + uint32_t line = __LINE__; #endif #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS341, ERRZERO, "Null pointer"); - RETVOID; + return; } #endif @@ -832,7 +781,7 @@ SsMblk *mp; /* message block */ if (mp->b_datap == NULLP) { - RETVOID; + return; } @@ -846,7 +795,7 @@ SsMblk *mp; /* message block */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (U8*)__FILE__, ENTNC); + SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (uint8_t*)__FILE__, ENTNC); #else #ifdef T2K_MEM_LEAK_DBG SFree(strmCfg.mdRegion, (Data *)mp, size); @@ -854,7 +803,7 @@ SsMblk *mp; /* message block */ SFree(strmCfg.mdRegion, (Data *)mp, size); #endif #endif /* SS_HISTOGRAM_SUPPORT */ - RETVOID; + return; } /* ss028.103 - Addition of lock for mBuf reference count */ @@ -864,7 +813,7 @@ SsMblk *mp; /* message block */ { SSLOGERROR(ERRCLS_DEBUG, ESS343, ERRZERO, "Could not lock the mBuf Ref Lock"); - RETVOID; + return; } #endif @@ -878,7 +827,7 @@ SsMblk *mp; /* message block */ #if (ERRCLASS & ERRCLS_DEBUG) SSLOGERROR(ERRCLS_DEBUG, ESS344, ERRZERO, "Could not give the Semaphore"); - RETVOID; + return; #endif } #endif @@ -909,7 +858,7 @@ SsMblk *mp; /* message block */ #ifdef SS_HISTOGRAM_SUPPORT SFree(strmCfg.datRegion, mp->b_datap->db_base, (Size)(mp->b_datap->db_lim - mp->b_datap->db_base), - __LINE__, (U8*)__FILE__, ENTNC); + __LINE__, (uint8_t*)__FILE__, ENTNC); #else SFree(strmCfg.datRegion, mp->b_datap->db_base, (Size)(mp->b_datap->db_lim - mp->b_datap->db_base)); @@ -927,7 +876,7 @@ SsMblk *mp; /* message block */ bp = (SsMblk *)(mp->b_datap - sizeof (SsMblk)); /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - SFree(strmCfg.mdRegion, (Data *)bp, size, __LINE__, (U8*)__FILE__, ENTNC); + SFree(strmCfg.mdRegion, (Data *)bp, size, __LINE__, (uint8_t*)__FILE__, ENTNC); #else SFree(strmCfg.mdRegion, (Data *)bp, size); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -935,7 +884,7 @@ SsMblk *mp; /* message block */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (U8*)__FILE__, ENTNC); + SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (uint8_t*)__FILE__, ENTNC); #else SFree(strmCfg.mdRegion, (Data *)mp, size); #endif /* SS_HISTOGRAM_SUPPORT */ @@ -956,14 +905,14 @@ SsMblk *mp; /* message block */ { /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT - SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (U8*)__FILE__, ENTNC); + SFree(strmCfg.mdRegion, (Data *)mp, size, __LINE__, (uint8_t*)__FILE__, ENTNC); #else SFree(strmCfg.mdRegion, (Data *)mp, size); #endif /* SS_HISTOGRAM_SUPPORT */ } } - RETVOID; + return; } /* ssFreeB */ @@ -982,15 +931,10 @@ SsMblk *mp; /* message block */ * File: ss_strm.c * */ -#ifdef ANSI Void ssFreeMsg ( SsMblk *mp /* message block */ ) -#else -Void ssFreeMsg(mp) -SsMblk *mp; /* message block */ -#endif { SsMblk *bp; /* mblk for iteration */ @@ -1002,7 +946,7 @@ SsMblk *mp; /* message block */ ssFreeB(bp); } - RETVOID; + return; } /* ssFreeMsg */ @@ -1020,24 +964,18 @@ SsMblk *mp; /* message block */ * File: ss_strm.c * */ -#ifdef ANSI Void ssLinkB ( SsMblk *mp, /* first message block */ SsMblk *bp /* second message block */ ) -#else -Void ssLinkB(mp, bp) -SsMblk *mp; /* first message block */ -SsMblk *bp; /* second message block */ -#endif { #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP || bp == NULLP) { SSLOGERROR(ERRCLS_INT_PAR, ESS345, ERRZERO, "Null pointer"); - RETVOID; + return; } #endif @@ -1052,7 +990,7 @@ SsMblk *bp; /* second message block */ /* link in the passed mblock */ mp->b_cont = bp; - RETVOID; + return; } /* ssLinkB */ @@ -1070,15 +1008,10 @@ SsMblk *bp; /* second message block */ * File: ss_strm.c * */ -#ifdef ANSI S32 ssMsgDSize ( SsMblk *mp /* message block */ ) -#else -S32 ssMsgDSize(mp) -SsMblk *mp; /* message block */ -#endif { S32 n; /* temporary */ S32 size; /* size of data */ @@ -1120,25 +1053,19 @@ SsMblk *mp; /* message block */ * File: ss_strm.c * */ -#ifdef ANSI S32 ssPullupMsg ( SsMblk *mp, /* message block */ S32 len /* number of bytes to align */ ) -#else -S32 ssPullupMsg(mp, len) -SsMblk *mp; /* message block */ -S32 len; /* number of bytes to align */ -#endif { SsMblk *bp; /* mblk for iteration */ SsMblk *newbp; /* the new mblk */ SsMblk *prev; /* mblk of same type */ - U8 *base; /* for swapping data buffers */ - U8 *lim; /* for swapping data buffers */ - U8 *rptr; /* for swapping data buffers */ - U8 *wptr; /* for swapping data buffers */ + uint8_t *base; /* for swapping data buffers */ + uint8_t *lim; /* for swapping data buffers */ + uint8_t *rptr; /* for swapping data buffers */ + uint8_t *wptr; /* for swapping data buffers */ /* ss008.301 */ #ifdef SS_DBLK_FREE_RTN SsFrtn *frtn; /* for swapping data buffers */ @@ -1146,7 +1073,7 @@ S32 len; /* number of bytes to align */ S32 mLen; /* number of bytes in all blocks of same type */ S32 m; /* temporary */ S32 n; /* temporary */ - U8 type; /* message type */ + uint8_t type; /* message type */ #if (ERRCLASS & ERRCLS_INT_PAR) if (mp == NULLP) @@ -1319,17 +1246,11 @@ S32 len; /* number of bytes to align */ * File: ss_strm.c * */ -#ifdef ANSI SsMblk *ssRmvB ( SsMblk *mp, /* message */ SsMblk *bp /* message block */ ) -#else -SsMblk *ssRmvB(mp, bp) -SsMblk *mp; /* message */ -SsMblk *bp; /* message block */ -#endif { SsMblk *rp; /* mblk that will be returned */ @@ -1398,17 +1319,11 @@ SsMblk *bp; /* message block */ * File: ss_strm.c * */ -#ifdef ANSI S32 ssTestB ( S32 size, /* size required */ -U32 pri /* priority of the message buffer */ +uint32_t pri /* priority of the message buffer */ ) -#else -S32 ssTestB(size, pri) -S32 size; /* size required */ -U32 pri; /* priority of the message buffer */ -#endif { SsMblk *bp; /* mblk for iteration */ @@ -1440,15 +1355,10 @@ U32 pri; /* priority of the message buffer */ * File: ss_strm.c * */ -#ifdef ANSI SsMblk *ssUnlinkB ( SsMblk *mp /* message */ ) -#else -SsMblk *ssUnlinkB(mp) -SsMblk *mp; /* message */ -#endif { SsMblk *bp; /* mblk for iteration */