X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fss_pack.c;h=2f9635a656361aae002940c3ea588bcbef24d9ea;hb=d18d80cc82c8bae113c62a45b30345bfb4ca570f;hp=ade96db1df7c501b6a7a6d3c605e85e3ac77ae6b;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/mt/ss_pack.c b/src/mt/ss_pack.c index ade96db1d..2f9635a65 100644 --- a/src/mt/ss_pack.c +++ b/src/mt/ss_pack.c @@ -88,20 +88,13 @@ * */ -#ifdef ANSI S16 SPkS8 ( S8 val, /* value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SPkS8(val, mBuf) -S8 val; /* value */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret; /* return code */ - TRC1(SPkS8) ret = SAddPreMsg((Data) val, mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) if (ret != ROK) @@ -128,20 +121,13 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduUnpackUInt8 ( -U8 val, /* value */ +uint8_t val, /* value */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduUnpackUInt8(val, mBuf) -U8 val; /* value */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret; /* return code */ - TRC1(oduUnpackUInt8) ret = SAddPreMsg((Data) val, mBuf); #if (ERRCLASS & ERRCLS_ADD_RES) if (ret != ROK) @@ -166,22 +152,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SPkS16 ( S16 val, /* value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SPkS16(val, mBuf) -S16 val; /* value */ -Buffer *mBuf; /* message buffer */ -#endif { Data pkArray[2]; /* array for packing */ S16 ret; /* return code */ - TRC1(SPkS16) #ifndef FCSPKINT /* backward compatibility, packing order */ pkArray[0] = (Data) GetHiByte(val); pkArray[1] = (Data) GetLoByte(val); @@ -214,22 +193,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduUnpackUInt16 ( -U16 val, /* value */ +uint16_t val, /* value */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduUnpackUInt16(val, mBuf) -U16 val; /* value */ -Buffer *mBuf; /* message buffer */ -#endif { Data pkArray[2]; /* array for packing */ S16 ret; /* return code */ - TRC1(oduUnpackUInt16) #ifndef FCSPKINT /* backward compatibility, packing order */ pkArray[0] = (Data) GetHiByte(val); pkArray[1] = (Data) GetLoByte(val); @@ -262,35 +234,28 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SPkS32 ( S32 val, /* value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SPkS32(val, mBuf) -S32 val; /* value */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 tmp; /* temporary value */ + uint16_t tmp; /* temporary value */ Data pkArray[4]; /* packing array */ S16 ret; /* return code */ - TRC1(SPkS32) #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp = (U16) GetHiWord(val); + tmp = (uint16_t) GetHiWord(val); pkArray[0] = (Data) GetHiByte(tmp); pkArray[1] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(val); + tmp = (uint16_t) GetLoWord(val); pkArray[2] = (Data) GetHiByte(tmp); pkArray[3] = (Data) GetLoByte(tmp); #else /* forward compatibility, packing order */ - tmp = (U16) GetHiWord(val); + tmp = (uint16_t) GetHiWord(val); pkArray[3] = (Data) GetHiByte(tmp); pkArray[2] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(val); + tmp = (uint16_t) GetLoWord(val); pkArray[1] = (Data) GetHiByte(tmp); pkArray[0] = (Data) GetLoByte(tmp); #endif @@ -319,35 +284,28 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduUnpackUInt32 ( -U32 val, /* value */ +uint32_t val, /* value */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduUnpackUInt32(val, mBuf) -U32 val; /* value */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 tmp; /* temporary value */ + uint16_t tmp; /* temporary value */ Data pkArray[4]; /* packing array */ S16 ret; /* return code */ - TRC1(oduUnpackUInt32) #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp = (U16) GetHiWord(val); + tmp = (uint16_t) GetHiWord(val); pkArray[0] = (Data) GetHiByte(tmp); pkArray[1] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(val); + tmp = (uint16_t) GetLoWord(val); pkArray[2] = (Data) GetHiByte(tmp); pkArray[3] = (Data) GetLoByte(tmp); #else /* forward compatibility, packing order */ - tmp = (U16) GetHiWord(val); + tmp = (uint16_t) GetHiWord(val); pkArray[3] = (Data) GetHiByte(tmp); pkArray[2] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(val); + tmp = (uint16_t) GetLoWord(val); pkArray[1] = (Data) GetHiByte(tmp); pkArray[0] = (Data) GetLoByte(tmp); #endif @@ -377,17 +335,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SPkF32 ( F32 val, /* value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SPkF32(val, mBuf) -F32 val; /* value */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret; /* return code */ S8 tmpArray[15]; /* temporary array */ @@ -397,8 +349,6 @@ Buffer *mBuf; /* message buffer */ S8 pkArray[15]; /* packing array */ #endif /*FCSPKINT*/ - TRC1(SPkF32) - sprintf(tmpArray, "%.7e", val); #ifndef FCSPKINT /* backward compatibility, packing order */ @@ -436,17 +386,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SPkF64 ( F64 val, /* value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SPkF64(val, mBuf) -F64 val; /* value */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret; /* return code */ @@ -457,8 +401,6 @@ Buffer *mBuf; /* message buffer */ S8 pkArray[25]; /* packing array */ #endif /*FCSPKINT*/ - TRC1(SPkF64) - sprintf(tmpArray, "%.16le", val); #ifndef FCSPKINT /* backward compatibility, packing order */ @@ -496,21 +438,14 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SUnpkS8 ( S8 *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SUnpkS8(val, mBuf) -S8 *val; /* pointer to value */ -Buffer *mBuf; /* message buffer */ -#endif { Data tmp; /* temporary value */ S16 ret; /* return code */ - TRC1(SUnpkS8) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -546,21 +481,14 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduPackUInt8 ( -U8 *val, /* pointer to value */ +uint8_t *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduPackUInt8(val, mBuf) -U8 *val; /* pointer to value */ -Buffer *mBuf; /* message buffer */ -#endif { Data tmp; /* temporary value */ S16 ret; /* return code */ - TRC1(oduPackUInt8) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -577,7 +505,7 @@ Buffer *mBuf; /* message buffer */ if (ret != ROK) SSLOGERROR(ERRCLS_DEBUG, ESS253, (ErrVal)ret, "SRemPreMsg() failed"); #endif - *val = (U8) tmp; + *val = (uint8_t) tmp; return (ret); } /* end of oduPackUInt8 */ @@ -595,22 +523,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SUnpkS16 ( S16 *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SUnpkS16(val, mBuf) -S16 *val; /* pointer to value */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 tmp16; /* temporary value */ + uint16_t tmp16; /* temporary value */ Data unpkArray[2]; /* unpacking array */ S16 ret; /* return code */ - TRC1(SUnpkS16) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -629,11 +550,11 @@ Buffer *mBuf; /* message buffer */ #endif tmp16 = 0; #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[1]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[0]); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[1]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[0]); #else /* forward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[0]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[0]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[1]); #endif *val = (S16) tmp16; return (ret); @@ -654,22 +575,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduPackUInt16 ( -U16 *val, /* pointer to value */ +uint16_t *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduPackUInt16(val, mBuf) -U16 *val; /* pointer to value */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 tmp16; /* temporary value */ + uint16_t tmp16; /* temporary value */ Data unpkArray[2]; /* unpacking array */ S16 ret; /* return code */ - TRC1(oduPackUInt16) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -688,11 +602,11 @@ Buffer *mBuf; /* message buffer */ #endif tmp16 = 0; #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[1]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[0]); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[1]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[0]); #else /* forward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[0]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[0]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[1]); #endif *val = tmp16; return (ret); @@ -713,23 +627,16 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SUnpkS32 ( S32 *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SUnpkS32(val, mBuf) -S32 *val; /* pointer to value */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 tmp16; /* temporary value */ - U32 tmp32; /* temporary value */ + uint16_t tmp16; /* temporary value */ + uint32_t tmp32; /* temporary value */ Data unpkArray[4]; /* unpacking array */ S16 ret; /* return code */ - TRC1(SUnpkS32) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -749,19 +656,19 @@ Buffer *mBuf; /* message buffer */ tmp16 = 0; tmp32 = 0; #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[3]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[2]); - tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16); - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[1]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[0]); - tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[3]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[2]); + tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[1]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[0]); + tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16); #else /* forward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[0]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]); - tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16); - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[2]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[3]); - tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[0]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[1]); + tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[2]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[3]); + tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16); #endif *val = (S32) tmp32; return (ret); @@ -782,25 +689,18 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduPackUInt32 ( -U32 *val, /* pointer to value */ +uint32_t *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduPackUInt32(val, mBuf) -U32 *val; /* pointer to value */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 tmp16; /* temporary value */ - U32 tmp32; /* temporary value */ + uint16_t tmp16; /* temporary value */ + uint32_t tmp32; /* temporary value */ Data unpkArray[4]; /* unpacking array */ #ifdef ERRCLASS S16 ret; /* return code */ #endif /* ERRCLASS */ - TRC1(oduPackUInt32) /* ss021.103 - Addition of data pointer check */ #if (ERRCLASS & ERRCLS_INT_PAR) @@ -821,19 +721,19 @@ Buffer *mBuf; /* message buffer */ tmp16 = 0; tmp32 = 0; #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[3]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[2]); - tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16); - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[1]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[0]); - tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[3]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[2]); + tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[1]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[0]); + tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16); #else /* forward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[0]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[1]); - tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16); - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[2]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[3]); - tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[0]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[1]); + tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[2]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[3]); + tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16); #endif *val = tmp32; return (ret); @@ -855,17 +755,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SUnpkF32 ( F32 *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SUnpkF32(val, mBuf) -F32 *val; /* pointer to value */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret; /* return code */ S8 tmpArray[15]; /* temporary array */ @@ -875,8 +769,6 @@ Buffer *mBuf; /* message buffer */ S8 unpkArray[15]; /* unpacking array */ #endif /* FCSPKINT */ - TRC1(SUnpkF32) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!val) @@ -921,17 +813,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 SUnpkF64 ( F64 *val, /* pointer to value */ Buffer *mBuf /* message buffer */ ) -#else -S16 SUnpkF64(val, mBuf) -F64 *val; /* pointer to value */ -Buffer *mBuf; /* message buffer */ -#endif { S16 ret; /* return code */ @@ -942,8 +828,6 @@ Buffer *mBuf; /* message buffer */ S8 unpkArray[25]; /* unpacking array */ #endif /* FCSPKINT */ - TRC1(SUnpkF64) - #if (ERRCLASS & ERRCLS_INT_PAR) /* check data pointer */ if (!val)