X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fssi.h;h=d7cebf4c95d0d807d473106fd99ba12b296a09f4;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=a42c01d52879f9a90dba010cc955236117f9dbe9;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git diff --git a/src/cm/ssi.h b/src/cm/ssi.h index a42c01d52..d7cebf4c9 100755 --- a/src/cm/ssi.h +++ b/src/cm/ssi.h @@ -127,7 +127,7 @@ #ifdef MSVER2 /* mos version 2 */ #define MINBUFSIZE (PTRALIGN(sizeof(SBuf))) #define SBUFSIZE(size) (size < (Size) MINBUFSIZE ? (Size) MINBUFSIZE : (Size)PTRALIGN(size)) -#define SLockId U8 /* lock type */ +#define SLockId uint8_t /* lock type */ #define SInitLock(l, t) ((*l) = ROK) #define SLock(l) ((*l) = ROK) #define SUnlock(l) ((*l) = ROK) @@ -844,7 +844,7 @@ { \ S16 ret; \ if ((ret = func(val, mBuf)) != ROK) \ - RETVALUE(ret); \ + return (ret); \ } #define CMCHKPKLOG(func, val, mBuf, errCode, pst) \ @@ -856,7 +856,7 @@ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, \ __LINE__, (ErrCls) ERRCLS_ADD_RES, errCode, (ErrVal)ret, \ "Packing failure"); \ - RETVALUE(ret); \ + return (ret); \ } \ } @@ -869,7 +869,7 @@ SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId, __FILE__, \ __LINE__, (ErrCls) ERRCLS_ADD_RES, errCode, (ErrVal)ret, \ "Packing failure"); \ - RETVALUE(ret); \ + return (ret); \ } \ } @@ -896,7 +896,7 @@ { \ S16 ret; \ if ((ret = func(val, mBuf)) != ROK) \ - RETVALUE(ret); \ + return (ret); \ } #define CMCHKUNPKLOG(func, val, mBuf, errCode, pst) \ @@ -908,7 +908,7 @@ SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, \ __LINE__, (ErrCls) ERRCLS_ADD_RES, (ErrVal)errCode, (ErrVal)ret, \ "Unpacking failure"); \ - RETVALUE(ret); \ + return (ret); \ } \ } @@ -921,7 +921,7 @@ SLogError(pst->dstEnt, pst->dstInst, pst->dstProcId, __FILE__, \ __LINE__, (ErrCls) ERRCLS_ADD_RES, (ErrVal)errCode, (ErrVal)ret, \ "Unpacking failure"); \ - RETVALUE(ret); \ + return (ret); \ } \ } @@ -1340,9 +1340,9 @@ #define ENTEG 0xd3 /* EGTP Layer */ #define ENTEU 0xd4 /* EGTP USER */ /* ssi_h_001.main_135 : addition of LTE related entities */ -#define ENTTF 0xd5 /* LTE-PHY */ -#define ENTRG 0xd6 /* LTE-MAC */ -#define ENTKW 0xd7 /* LTE-RLC */ +#define ENTLWRMAC 0xd5 /* LTE-PHY */ +#define ENTMAC 0xd6 /* LTE-MAC */ +#define ENTRLC 0xd7 /* LTE-RLC */ #define ENTPJ 0xd8 /* LTE-PDCP */ #define ENTNH 0xd9 /* LTE-RRC */ @@ -1396,6 +1396,12 @@ #define ENTLAST ENTNL /* last entity id */ #endif /* WR_DG_OAM */ +#ifdef ODU +#define ENTDUAPP 0xeb /* ORAN DU APP */ +#define ENTSCTP 0xec /* ORAN SCTP */ +#define ENTF1AP 0xed /* ORAN F1AP */ +#define ENTEGTP 0xee /* ORAN EGTP */ +#endif //ORAN /* un-configured procId */ #ifdef SS_MULTIPLE_PROCS #define PROCNC 0xFFFF /* Processor not configured */ @@ -1927,10 +1933,10 @@ #define OWNREGION DFLT_REGION /* own region */ /* lock data types */ -#define SsSemaId U8 -#define SLockId U8 +#define SsSemaId uint8_t +#define SLockId uint8_t /* ssi_h_001.main_143: Additions */ -#define SLockInfo U8 +#define SLockInfo uint8_t /* basic lock types */ #define SS_LOCK_MUTEX 1 @@ -2138,17 +2144,17 @@ * allocation/de-allocation from static memory pool */ #ifdef SS_HISTOGRAM_SUPPORT -#define SGetSBuf(region, pool, bufPtr, size) SGetSBufNew(region,pool,bufPtr,size, __LINE__, (U8*)__FILE__) -#define SPutSBuf(region, pool, buf, size) SPutSBufNew(region, pool, buf, size, __LINE__, (U8*)__FILE__) -#define SGetMsg(region, pool, mBufPtr) SGetMsgNew(region, pool, mBufPtr, __LINE__, (U8*)__FILE__) -#define SPutMsg(mBuf) SPutMsgNew(mBuf, __LINE__, (U8*)__FILE__) +#define SGetSBuf(region, pool, bufPtr, size) SGetSBufNew(region,pool,bufPtr,size, __LINE__, (uint8_t*)__FILE__) +#define SPutSBuf(region, pool, buf, size) SPutSBufNew(region, pool, buf, size, __LINE__, (uint8_t*)__FILE__) +#define SGetMsg(region, pool, mBufPtr) SGetMsgNew(region, pool, mBufPtr, __LINE__, (uint8_t*)__FILE__) +#define SPutMsg(mBuf) SPutMsgNew(mBuf, __LINE__, (uint8_t*)__FILE__) #elif defined(SS_LIGHT_MEM_LEAK_STS) -#define SGetSBuf(region, pool, bufPtr, size) SGetSBufNew(region,pool,bufPtr,size, __LINE__, (U8*)__func__) -#define SGetMsg(region, pool, mBufPtr) SGetMsgNew(region, pool, mBufPtr, __LINE__, (U8*)__func__) -#define SGetDBuf(region, pool, bufPtr) SGetDBufNew(region,pool,bufPtr, __LINE__, (U8*)__func__) -#define SPutSBuf(region, pool, buf, size) SPutSBufNew(region, pool, buf, size, __LINE__, (U8 *)__func__) -#define SPutMsg(mBuf) SPutMsgNew(mBuf, __LINE__, (U8*)__func__) -#define SPutDBuf(region, pool, buf) SPutDBufNew(region, pool, buf, __LINE__, (U8*)__func__) +#define SGetSBuf(region, pool, bufPtr, size) SGetSBufNew(region,pool,bufPtr,size, __LINE__, (uint8_t*)__func__) +#define SGetMsg(region, pool, mBufPtr) SGetMsgNew(region, pool, mBufPtr, __LINE__, (uint8_t*)__func__) +#define SGetDBuf(region, pool, bufPtr) SGetDBufNew(region,pool,bufPtr, __LINE__, (uint8_t*)__func__) +#define SPutSBuf(region, pool, buf, size) SPutSBufNew(region, pool, buf, size, __LINE__, (uint8_t *)__func__) +#define SPutMsg(mBuf) SPutMsgNew(mBuf, __LINE__, (uint8_t*)__func__) +#define SPutDBuf(region, pool, buf) SPutDBufNew(region, pool, buf, __LINE__, (uint8_t*)__func__) #endif /* SS_HISTOGRAM_SUPPORT */ /* ssi_h_001.main_142 Readwrite additions */ /* ssi_h_001.main_144 Readwrite locks Guarded */ @@ -2359,7 +2365,7 @@ #define GetTIMETICK() 0 #endif #ifdef PHY_SHUTDOWN_ENABLE -#define stop_printf(...) do {EXTERN U8 sndPhyShutDwn;printf(__VA_ARGS__); mtStopHndlr(); sndPhyShutDwn = 1;} while (0) +#define stop_printf(...) do {EXTERN uint8_t sndPhyShutDwn;printf(__VA_ARGS__); mtStopHndlr(); sndPhyShutDwn = 1;} while (0) #else #define stop_printf(...) do {printf(__VA_ARGS__); mtStopHndlr(); exit(-1);} while (0) #endif @@ -2383,7 +2389,7 @@ #ifdef MS_MUBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ #define MS_BUF_ADD_CALLER()\ {\ - extern U32 cmFreeCaller[4];\ + extern uint32_t cmFreeCaller[4];\ if(cmFreeCaller[MxGetCpuID()] == NULLP)\ cmFreeCaller[MxGetCpuID()] = __return_address()-4;\ }