X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcm%2Fcm_gen.c;h=fc9864d98f9249b0437edfd215a47c6df0750eec;hb=9634ca974c4418c0800090e33d37ef1fe7e8cb30;hp=5a65de7653fb16297b43221cdcdfd4540117f109;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/cm/cm_gen.c b/src/cm/cm_gen.c index 5a65de765..fc9864d98 100644 --- a/src/cm/cm_gen.c +++ b/src/cm/cm_gen.c @@ -73,7 +73,7 @@ /* functions in other modules */ /* public variable declarations */ -U16 gTransId = 0; +uint16_t gTransId = 0; /* private variable declarations */ @@ -109,7 +109,6 @@ DateTime *dateTime; /* date and time */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkDateTime) /*-- cm_gen_c_001.main_36 - added for micro seconds --*/ #ifdef SS_DATETIME_USEC @@ -153,7 +152,6 @@ Duration *duration; /* duration */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkDuration) CMCHKPK(oduUnpackUInt8, duration->tenths, mBuf); CMCHKPK(oduUnpackUInt8, duration->secs, mBuf); @@ -192,13 +190,12 @@ Buffer *mBuf; /* message buffer */ { Data pkArray[PTRSIZE]; /* array for packing */ S16 ret; /* return code */ - U16 tmp; /* temporary value */ + uint16_t tmp; /* temporary value */ #if (defined(ALPHA) || defined(BIT_64)) - U32 tmp32; + uint32_t tmp32; #endif - TRC2(oduPackPointer) ret = ROK; switch (PTRSIZE) @@ -216,17 +213,17 @@ Buffer *mBuf; /* message buffer */ case 4: #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp = (U16) GetHiWord(ptr); + tmp = (uint16_t) GetHiWord(ptr); pkArray[0] = (Data) GetHiByte(tmp); pkArray[1] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(ptr); + tmp = (uint16_t) GetLoWord(ptr); pkArray[2] = (Data) GetHiByte(tmp); pkArray[3] = (Data) GetLoByte(tmp); #else /* forward compatibility, packing order */ - tmp = (U16) GetHiWord(ptr); + tmp = (uint16_t) GetHiWord(ptr); pkArray[3] = (Data) GetHiByte(tmp); pkArray[2] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(ptr); + tmp = (uint16_t) GetLoWord(ptr); pkArray[1] = (Data) GetHiByte(tmp); pkArray[0] = (Data) GetLoByte(tmp); #endif @@ -236,33 +233,33 @@ Buffer *mBuf; /* message buffer */ case 8: #if (defined(ALPHA) || defined(BIT_64)) #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp32 = (U32) GetHi32Bit(ptr); - tmp = (U16) GetHiWord(tmp32); + tmp32 = (uint32_t) GetHi32Bit(ptr); + tmp = (uint16_t) GetHiWord(tmp32); pkArray[0] = (Data) GetHiByte(tmp); pkArray[1] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(tmp32); + tmp = (uint16_t) GetLoWord(tmp32); pkArray[2] = (Data) GetHiByte(tmp); pkArray[3] = (Data) GetLoByte(tmp); - tmp32 = (U32) GetLo32Bit(ptr); - tmp = (U16) GetHiWord(tmp32); + tmp32 = (uint32_t) GetLo32Bit(ptr); + tmp = (uint16_t) GetHiWord(tmp32); pkArray[4] = (Data) GetHiByte(tmp); pkArray[5] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(tmp32); + tmp = (uint16_t) GetLoWord(tmp32); pkArray[6] = (Data) GetHiByte(tmp); pkArray[7] = (Data) GetLoByte(tmp); #else /* forward compatibility, packing order */ - tmp32 = (U32) GetHi32Bit(ptr); - tmp = (U16) GetHiWord(tmp32); + tmp32 = (uint32_t) GetHi32Bit(ptr); + tmp = (uint16_t) GetHiWord(tmp32); pkArray[7] = (Data) GetHiByte(tmp); pkArray[6] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(tmp32); + tmp = (uint16_t) GetLoWord(tmp32); pkArray[5] = (Data) GetHiByte(tmp); pkArray[4] = (Data) GetLoByte(tmp); - tmp32 = (U32) GetLo32Bit(ptr); - tmp = (U16) GetHiWord(tmp32); + tmp32 = (uint32_t) GetLo32Bit(ptr); + tmp = (uint16_t) GetHiWord(tmp32); pkArray[3] = (Data) GetHiByte(tmp); pkArray[2] = (Data) GetLoByte(tmp); - tmp = (U16) GetLoWord(tmp32); + tmp = (uint16_t) GetLoWord(tmp32); pkArray[1] = (Data) GetHiByte(tmp); pkArray[0] = (Data) GetLoByte(tmp); #endif @@ -270,7 +267,7 @@ Buffer *mBuf; /* message buffer */ break; #endif default: - /* no support for U64 */ + /* no support for uint64_t */ ret = RFAILED; } @@ -304,7 +301,6 @@ EntityId *entityId; /* entity id */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkEntityId) CMCHKPK(cmPkInst, entityId->inst, mBuf); CMCHKPK(cmPkEnt, entityId->ent, mBuf); @@ -339,7 +335,6 @@ ElmntId *elmntId; /* element id */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkElmntId) CMCHKPK(cmPkElmntInst3, elmntId->elmntInst3, mBuf); CMCHKPK(cmPkElmntInst2, elmntId->elmntInst2, mBuf); @@ -376,7 +371,6 @@ MemoryId *memoryId; /* memoryId */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkMemoryId) CMCHKPK(cmPkPool, memoryId->pool, mBuf); CMCHKPK(cmPkRegion, memoryId->region, mBuf); @@ -413,7 +407,6 @@ Buffer *mBuf; /* message buffer */ { Txt *p; /* part number string */ - TRC2(cmPkSystemId) for (p = systemId->ptNmb; *p; p++); @@ -460,9 +453,8 @@ ProtAddr *pAddr; /* protocol address */ Buffer *mBuf; /* buffer */ #endif { - U8 j; /* Index */ + uint8_t j; /* Index */ - TRC3(cmPkProtAddr) #ifdef CM_ARI2 CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf); @@ -509,11 +501,10 @@ ProtAddrTbl *protAddr; /* protocol address table */ Buffer *mBuf; /* buffer */ #endif { - U8 i; /* index */ - U8 j; /* Index */ + uint8_t i; /* index */ + uint8_t j; /* Index */ ProtAddr *pAddr; /* protocol Address */ - TRC3(cmPkProtAddrTbl) if (protAddr->count > MAX_PROT_ADDRS) return RFAILED; @@ -568,9 +559,8 @@ Addrs *addrs; /* address */ Buffer *mBuf; /* message buffer */ #endif { - U8 i; /* loop counter */ + uint8_t i; /* loop counter */ - TRC2(cmPkAddrs) if (addrs->length > ADRLEN) return RFAILED; @@ -613,9 +603,8 @@ ShrtAddrs *addrs; /* address */ Buffer *mBuf; /* message buffer */ #endif { - U8 i; /* loop counter */ + uint8_t i; /* loop counter */ - TRC2(cmPkShrtAddrs) if (addrs->length > SHRTADRLEN) return RFAILED; @@ -648,18 +637,17 @@ Buffer *mBuf; /* message buffer */ #ifdef ANSI S16 cmPkAddrMask ( -U8 *mask, /* pointer to address mask array */ +uint8_t *mask, /* pointer to address mask array */ Buffer *mBuf /* message buffer */ ) #else S16 cmPkAddrMask(mask, mBuf) -U8 *mask; /* pointer to address mask array */ +uint8_t *mask; /* pointer to address mask array */ Buffer *mBuf; /* message buffer */ #endif { S16 i; /* counter */ - TRC2(cmPkAddrMask) /* pack address mask */ for (i = (ADRLEN - 1); i >= 0; i--) @@ -699,7 +687,6 @@ Buffer *mBuf; /* message buffer */ { Txt *p; /* temporary */ - TRC2(cmPkBndCfg) CMCHKPK(cmPkSelector, bndCfg->selector, mBuf); CMCHKPK(cmPkAddrs, &bndCfg->sapAdr, mBuf); @@ -746,7 +733,6 @@ Pst *pst; Buffer *mBuf; #endif { - TRC2(cmPkPst) CMCHKPK(cmPkEvent, pst->event, mBuf); CMCHKPK(cmPkInst, pst->srcInst, mBuf); @@ -793,7 +779,6 @@ ElmtHdr *m; /* element header */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkElmtHdr) #if (LCAMT || ATM_BISUP) CMCHKPK(oduUnpackUInt16, m->compInd, mBuf); @@ -816,9 +801,9 @@ Buffer *mBuf; /* message buffer */ /* * - * Fun: cmPkTknU8 + * Fun: cmPkTknUInt8 * - * Desc: This function packs a token U8 + * Desc: This function packs a token uint8_t * * Ret: ROK - ok * @@ -829,30 +814,29 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -S16 cmPkTknU8 +S16 cmPkTknUInt8 ( -TknU8 *tknU8, /* token U8 */ +TknUInt8 *tknUInt8, /* token uint8_t */ Buffer *mBuf /* message buffer */ ) #else -S16 cmPkTknU8(tknU8, mBuf) -TknU8 *tknU8; /* token U8 */ +S16 cmPkTknUInt8(tknUInt8, mBuf) +TknUInt8 *tknUInt8; /* token uint8_t */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknU8) - if (tknU8->pres) + if (tknUInt8->pres) { /* Value */ - CMCHKPK(oduUnpackUInt8, tknU8->val, mBuf); + CMCHKPK(oduUnpackUInt8, tknUInt8->val, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknU8->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknUInt8->pres, mBuf); return ROK; -} /* end of cmPkTknU8 */ +} /* end of cmPkTknUInt8 */ /* @@ -881,7 +865,6 @@ TknS8 *tknS8; /* token S8 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknS8) if (tknS8->pres) { @@ -898,9 +881,9 @@ Buffer *mBuf; /* message buffer */ /* * - * Fun: cmPkTknU16 + * Fun: cmPkTknUInt16 * - * Desc: This function packs a token U16 + * Desc: This function packs a token uint16_t * * Ret: ROK - ok * @@ -911,37 +894,36 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -S16 cmPkTknU16 +S16 cmPkTknUInt16 ( -TknU16 *tknU16, /* token U16 */ +TknUInt16 *tknUInt16, /* token uint16_t */ Buffer *mBuf /* message buffer */ ) #else -S16 cmPkTknU16(tknU16, mBuf) -TknU16 *tknU16; /* token U16 */ +S16 cmPkTknUInt16(tknUInt16, mBuf) +TknUInt16 *tknUInt16; /* token uint16_t */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknU16) - if (tknU16->pres) + if (tknUInt16->pres) { /* Value */ - CMCHKPK(oduUnpackUInt16, tknU16->val, mBuf); + CMCHKPK(oduUnpackUInt16, tknUInt16->val, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknU16->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknUInt16->pres, mBuf); return ROK; -} /* end of cmPkTknU16 */ +} /* end of cmPkTknUInt16 */ /* * - * Fun: cmPkTknU32 + * Fun: cmPkTknUInt32 * - * Desc: This function packs a token U32 + * Desc: This function packs a token uint32_t * * Ret: ROK - ok * @@ -952,30 +934,29 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -S16 cmPkTknU32 +S16 cmPkTknUInt32 ( -TknU32 *tknU32, /* token U32 */ +TknUInt32 *tknUInt32, /* token uint32_t */ Buffer *mBuf /* message buffer */ ) #else -S16 cmPkTknU32(tknU32, mBuf) -TknU32 *tknU32; /* token U32 */ +S16 cmPkTknUInt32(tknUInt32, mBuf) +TknUInt32 *tknUInt32; /* token uint32_t */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknU32) - if (tknU32->pres) + if (tknUInt32->pres) { /* Value */ - CMCHKPK(oduUnpackUInt32, tknU32->val, mBuf); + CMCHKPK(oduUnpackUInt32, tknUInt32->val, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknU32->pres, mBuf); + CMCHKPK(oduUnpackUInt8, tknUInt32->pres, mBuf); return ROK; -} /* end of cmPkTknU32 */ +} /* end of cmPkTknUInt32 */ /* @@ -1006,7 +987,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmPkTknStr) if (tknStr->pres) { @@ -1055,7 +1035,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmPkTknStrM) if(tknStr->pres) { @@ -1104,7 +1083,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmPkTknStrS) if(tknStr->pres) { @@ -1153,7 +1131,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmPkTknStrE) if(tknStr->pres) { @@ -1204,7 +1181,6 @@ Buffer *mBuf; /* message buffer */ { S16 i; - TRC3(cmPkPnNodeId); for (i = PN_NODEID_LEN - 1; i >= 0; i--) { @@ -1243,7 +1219,6 @@ TknStr4 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr4) CMPKTKNSTR(tknStr, mBuf); @@ -1279,7 +1254,6 @@ TknStr12 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr12) CMPKTKNSTR(tknStr, mBuf); @@ -1314,7 +1288,6 @@ TknStr32 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr32) CMPKTKNSTR(tknStr, mBuf); @@ -1349,7 +1322,6 @@ TknStr64 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr64) CMPKTKNSTR(tknStr, mBuf); @@ -1384,7 +1356,6 @@ TknStr132 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr132) CMPKTKNSTR(tknStr, mBuf); @@ -1419,7 +1390,6 @@ TknStr256 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknStr256) CMPKTKNSTR(tknStr, mBuf); @@ -1454,22 +1424,21 @@ TknOid *tknOid; /* Object Identifier token */ Buffer *mBuf; /* message buffer */ #endif { - U16 i; + uint16_t i; - TRC2(cmPkTknOid) if (tknOid->pres == TRUE) { /* Pack the value */ - for (i = 0; i < (U16)tknOid->len; i++) + for (i = 0; i < (uint16_t)tknOid->len; i++) { - /* cm_gen_c_001.main_33: changes for TknOid value from U16 to U32 - * with compilation flag TKNOID_U16 */ -#ifndef TKNOID_U16 + /* cm_gen_c_001.main_33: changes for TknOid value from uint16_t to uint32_t + * with compilation flag TKNOID_UINT16 */ +#ifndef TKNOID_UINT16 CMCHKPK(oduUnpackUInt32, tknOid->val[i], mBuf); #else CMCHKPK(oduUnpackUInt16, tknOid->val[i], mBuf); -#endif /* !TKNOID_U16 */ +#endif /* !TKNOID_UINT16 */ } /* Pack the length */ CMCHKPK(oduUnpackUInt8, tknOid->len, mBuf); @@ -1507,7 +1476,6 @@ TknS32 *tknS32; /* token S32 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknS32) if (tknS32->pres) { @@ -1548,7 +1516,6 @@ Header *header; /* header */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkHeader) #ifdef LMINT3 CMCHKPK(cmPkMemoryId, &header->response.mem, mBuf); @@ -1594,7 +1561,6 @@ CmStatus *sta; /* status structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkCmStatus) CMCHKPK(oduUnpackUInt16, sta->reason, mBuf); CMCHKPK(oduUnpackUInt16, sta->status, mBuf); @@ -1629,7 +1595,6 @@ CmAlarm *alarm; /* alarm structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkCmAlarm) CMCHKPK(oduUnpackUInt16, alarm->cause, mBuf); CMCHKPK(oduUnpackUInt16, alarm->event, mBuf); @@ -1666,7 +1631,6 @@ SmCfg *smCfg; /* stack manager */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkSmCfg) CMCHKPK(cmPkSelector, smCfg->selector, mBuf); CMCHKPK(cmPkRoute, smCfg->route, mBuf); @@ -1706,7 +1670,6 @@ TmrCfg *tmrCfg; /* timer configuration */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTmrCfg) CMCHKPK(oduUnpackUInt16, tmrCfg->val, mBuf); CMCHKPK(oduPackBool, tmrCfg->enb, mBuf); @@ -1741,7 +1704,6 @@ TknBuf *tknBuf; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkTknBuf) if(tknBuf->pres) { @@ -1789,7 +1751,6 @@ CmIntf *intf; /* interface info */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmPkIntf) CMCHKPK(cmPkIntfId, intf->intfId, mBuf); CMCHKPK(cmPkIntfVer, intf->intfVer, mBuf); @@ -1830,7 +1791,6 @@ DateTime *dateTime; /* date/time structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpDateTime) CMCHKUNPK(oduPackUInt8, &dateTime->month, mBuf); CMCHKUNPK(oduPackUInt8, &dateTime->day, mBuf); @@ -1875,7 +1835,6 @@ Duration *duration; /* duration structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpDuration) CMCHKUNPK(oduPackUInt8, &duration->days, mBuf); CMCHKUNPK(oduPackUInt8, &duration->hours, mBuf); @@ -1912,16 +1871,15 @@ PTR *ptr; /* duration structure */ 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[PTRSIZE]; /* unpacking array */ S16 ret; /* return code */ #if (defined(ALPHA) || defined(BIT_64)) - U64 tmp64; + uint64_t tmp64; #endif - TRC2(oduUnpackPointer) switch (PTRSIZE) { @@ -1932,11 +1890,11 @@ Buffer *mBuf; /* message buffer */ 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 *ptr = tmp16; break; @@ -1949,19 +1907,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 *ptr = tmp32; break; @@ -1976,41 +1934,41 @@ Buffer *mBuf; /* message buffer */ tmp32 = 0; tmp64 = 0; #ifndef FCSPKINT /* backward compatibility, packing order */ - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[7]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[6]); - tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16); - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[5]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[4]); - tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16); - tmp64 = (U64) PutHi32Bit(tmp64, tmp32); - 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); - tmp64 = (U64) PutLo32Bit(tmp64, tmp32); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[7]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[6]); + tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[5]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[4]); + tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16); + tmp64 = (uint64_t) PutHi32Bit(tmp64, tmp32); + 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); + tmp64 = (uint64_t) PutLo32Bit(tmp64, tmp32); #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); - tmp64 = (U64) PutHi32Bit(tmp64, tmp32); - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[4]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[5]); - tmp32 = (U32) PutHiWord(tmp32, (U16) tmp16); - tmp16 = (U16) PutHiByte(tmp16, (U8) unpkArray[6]); - tmp16 = (U16) PutLoByte(tmp16, (U8) unpkArray[7]); - tmp32 = (U32) PutLoWord(tmp32, (U16) tmp16); - tmp64 = (U64) PutLo32Bit(tmp64, tmp32); + 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); + tmp64 = (uint64_t) PutHi32Bit(tmp64, tmp32); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[4]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[5]); + tmp32 = (uint32_t) PutHiWord(tmp32, (uint16_t) tmp16); + tmp16 = (uint16_t) PutHiByte(tmp16, (uint8_t) unpkArray[6]); + tmp16 = (uint16_t) PutLoByte(tmp16, (uint8_t) unpkArray[7]); + tmp32 = (uint32_t) PutLoWord(tmp32, (uint16_t) tmp16); + tmp64 = (uint64_t) PutLo32Bit(tmp64, tmp32); #endif *ptr = tmp64; break; #endif default: - /* no support for U64 */ + /* no support for uint64_t */ ret = RFAILED; } @@ -2044,7 +2002,6 @@ EntityId *entityId; /* entity id */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkEntityId) CMCHKUNPK(cmUnpkEnt, &entityId->ent, mBuf); CMCHKUNPK(cmUnpkInst, &entityId->inst, mBuf); @@ -2079,7 +2036,6 @@ ElmntId *elmntId; /* element id */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkElmntId) CMCHKUNPK(cmUnpkElmnt, &elmntId->elmnt, mBuf); CMCHKUNPK(cmUnpkElmntInst1, &elmntId->elmntInst1, mBuf); @@ -2116,7 +2072,6 @@ MemoryId *memoryId; /* memoryId */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkMemoryId) CMCHKUNPK(cmUnpkRegion, &memoryId->region, mBuf); CMCHKUNPK(cmUnpkPool, &memoryId->pool, mBuf); @@ -2154,7 +2109,6 @@ Buffer *mBuf; /* message buffer */ S16 i; /* loop counter */ MsgLen len; - TRC2(cmUnpkSystemId) CMCHKUNPK(SUnpkS16, &systemId->mVer, mBuf); CMCHKUNPK(SUnpkS16, &systemId->mRev, mBuf); @@ -2200,9 +2154,8 @@ ProtAddr *pAddr; /* protocol address table */ Buffer *mBuf; /* buffer */ #endif { - U8 j; /* Index */ + uint8_t j; /* Index */ - TRC3(cmUnpkProtAddr) CMCHKUNPK(oduPackUInt16, &(pAddr->protType), mBuf); CMCHKUNPK(oduPackUInt8, &(pAddr->len), mBuf); @@ -2247,11 +2200,10 @@ ProtAddrTbl *protAddr; /* protocol address table */ Buffer *mBuf; /* buffer */ #endif { - U8 i; /* index */ - U8 j; /* Index */ + uint8_t i; /* index */ + uint8_t j; /* Index */ ProtAddr *pAddr; /* Protocol Address */ - TRC3(cmUnpkProtAddrTbl) CMCHKUNPK(oduPackUInt8, &protAddr->count, mBuf); for (i = 0; i < protAddr->count; i++) @@ -2301,9 +2253,8 @@ Addrs *addrs; /* address */ Buffer *mBuf; /* message buffer */ #endif { - U8 i; /* loop counter */ + uint8_t i; /* loop counter */ - TRC2(cmUnpAddrs) CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf); @@ -2344,9 +2295,8 @@ ShrtAddrs *addrs; /* address */ Buffer *mBuf; /* message buffer */ #endif { - U8 i; /* loop counter */ + uint8_t i; /* loop counter */ - TRC2(cmUnpShrtAddrs) CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf); @@ -2378,18 +2328,17 @@ Buffer *mBuf; /* message buffer */ #ifdef ANSI S16 cmUnpkAddrMask ( -U8 *mask, /* pointer to address mask */ +uint8_t *mask, /* pointer to address mask */ Buffer *mBuf /* message buffer */ ) #else S16 cmUnpkAddrMask(mask, mBuf) -U8 *mask; /* pointer to address mask */ +uint8_t *mask; /* pointer to address mask */ Buffer *mBuf; /* message buffer */ #endif { S16 i; /* counter */ - TRC2(cmUnpAddrMask) /* unpack address mask */ for (i = 0; i< ADRLEN; i++) @@ -2428,7 +2377,6 @@ Buffer *mBuf; /* message buffer */ { S16 i; /* loop counter */ - TRC2(cmUnpBndCfg) for (i = 0; bndCfg->usrId[i]; i++); CMCHKUNPK(cmUnpkTxt, bndCfg->usrId+i, mBuf); @@ -2474,7 +2422,6 @@ Pst *pst; Buffer *mBuf; #endif { - TRC2(cmUnpkPst) #ifdef TDS_ROLL_UPGRADE_SUPPORT CMCHKUNPK(cmUnpkIntfVer, &pst->intfVer, mBuf); @@ -2521,7 +2468,6 @@ ElmtHdr *m; /* element header */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpElmtHdr) /* Present */ CMCHKUNPK(oduUnpackBool, &m->pres , mBuf); @@ -2544,9 +2490,9 @@ Buffer *mBuf; /* message buffer */ /* * -* Fun: cmUnpkTknU8 +* Fun: cmUnpkTknUInt8 * -* Desc: This function unpacks a token U8 +* Desc: This function unpacks a token uint8_t * * Ret: ROK - ok * @@ -2557,30 +2503,29 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -S16 cmUnpkTknU8 +S16 cmUnpkTknUInt8 ( -TknU8 *tknU8, /* token U8 */ +TknUInt8 *tknUInt8, /* token uint8_t */ Buffer *mBuf /* message buffer */ ) #else -S16 cmUnpkTknU8(tknU8, mBuf) -TknU8 *tknU8; /* token U8 */ +S16 cmUnpkTknUInt8(tknUInt8, mBuf) +TknUInt8 *tknUInt8; /* token uint8_t */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknU8) /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknU8->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknUInt8->pres, mBuf); - if (tknU8->pres) + if (tknUInt8->pres) { /* Value */ - CMCHKUNPK(oduPackUInt8, &tknU8->val, mBuf); + CMCHKUNPK(oduPackUInt8, &tknUInt8->val, mBuf); } return ROK; -} /* end of cmUnpkTknU8 */ +} /* end of cmUnpkTknUInt8 */ /* @@ -2609,7 +2554,6 @@ TknS8 *tknS8; /* token S8 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknS8) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknS8->pres, mBuf); @@ -2626,9 +2570,9 @@ Buffer *mBuf; /* message buffer */ /* * -* Fun: cmUnpkTknU16 +* Fun: cmUnpkTknUInt16 * -* Desc: This function unpacks a token U16 +* Desc: This function unpacks a token uint16_t * * Ret: ROK - ok * @@ -2639,37 +2583,36 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -S16 cmUnpkTknU16 +S16 cmUnpkTknUInt16 ( -TknU16 *tknU16, /* token U16 */ +TknUInt16 *tknUInt16, /* token uint16_t */ Buffer *mBuf /* message buffer */ ) #else -S16 cmUnpkTknU16(tknU16, mBuf) -TknU16 *tknU16; /* token U16 */ +S16 cmUnpkTknUInt16(tknUInt16, mBuf) +TknUInt16 *tknUInt16; /* token uint16_t */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknU16) /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknU16->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknUInt16->pres, mBuf); - if (tknU16->pres) + if (tknUInt16->pres) { /* Value */ - CMCHKUNPK(oduPackUInt16, &tknU16->val, mBuf); + CMCHKUNPK(oduPackUInt16, &tknUInt16->val, mBuf); } return ROK; -} /* end of cmUnpkTknU16 */ +} /* end of cmUnpkTknUInt16 */ /* * -* Fun: cmUnpkTknU32 +* Fun: cmUnpkTknUInt32 * -* Desc: This function unpacks a token U32 +* Desc: This function unpacks a token uint32_t * * Ret: ROK - ok * @@ -2680,30 +2623,29 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -S16 cmUnpkTknU32 +S16 cmUnpkTknUInt32 ( -TknU32 *tknU32, /* token U32 */ +TknUInt32 *tknUInt32, /* token uint32_t */ Buffer *mBuf /* message buffer */ ) #else -S16 cmUnpkTknU32(tknU32, mBuf) -TknU32 *tknU32; /* token U32 */ +S16 cmUnpkTknUInt32(tknUInt32, mBuf) +TknUInt32 *tknUInt32; /* token uint32_t */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknU32) /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknU32->pres, mBuf); + CMCHKUNPK(oduPackUInt8, &tknUInt32->pres, mBuf); - if (tknU32->pres) + if (tknUInt32->pres) { /* Value */ - CMCHKUNPK(oduPackUInt32, &tknU32->val, mBuf); + CMCHKUNPK(oduPackUInt32, &tknUInt32->val, mBuf); } return ROK; -} /* end of cmUnpkTknU32 */ +} /* end of cmUnpkTknUInt32 */ /* * @@ -2733,7 +2675,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmUnpTknStr) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -2783,7 +2724,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmUnpTknStrM) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -2834,7 +2774,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmUnpTknStrS) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -2885,7 +2824,6 @@ Buffer *mBuf; /* message buffer */ { Cntr i; /* counter */ - TRC2(cmUnpTknStrE) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); @@ -2938,7 +2876,6 @@ Buffer *mBuf; /* message buffer */ { S16 i; - TRC3(cmUnpkPnNodeId); for (i = 0; i < PN_NODEID_LEN; i++) { @@ -2977,7 +2914,6 @@ TknStr4 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr4) CMUNPKTKNSTR(tknStr, mBuf); @@ -3013,7 +2949,6 @@ TknStr12 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr12) CMUNPKTKNSTR(tknStr, mBuf); @@ -3048,7 +2983,6 @@ TknStr32 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr32) CMUNPKTKNSTR(tknStr, mBuf); @@ -3083,7 +3017,6 @@ TknStr64 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr64) CMUNPKTKNSTR(tknStr, mBuf); @@ -3118,7 +3051,6 @@ TknStr132 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr132) CMUNPKTKNSTR(tknStr, mBuf); @@ -3153,7 +3085,6 @@ TknStr256 *tknStr; /* token string */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkTknStr256) CMUNPKTKNSTR(tknStr, mBuf); @@ -3188,9 +3119,8 @@ TknOid *tknOid; /* Object Identifier token */ Buffer *mBuf; /* message buffer */ #endif { - U16 i; + uint16_t i; - TRC2(cmUnpkTknOid) /* Unpack the token header */ CMCHKUNPK(oduPackUInt8, &tknOid->pres, mBuf); @@ -3201,15 +3131,15 @@ Buffer *mBuf; /* message buffer */ CMCHKUNPK(oduPackUInt8, &tknOid->len, mBuf); /* Pack the value */ - for (i = 1; i <= (U16)tknOid->len; i++) + for (i = 1; i <= (uint16_t)tknOid->len; i++) { - /* cm_gen_c_001.main_33: changes for TknOid value from U16 to U32 - * with compilation flag TKNOID_U16 */ -#ifndef TKNOID_U16 + /* cm_gen_c_001.main_33: changes for TknOid value from uint16_t to uint32_t + * with compilation flag TKNOID_UINT16 */ +#ifndef TKNOID_UINT16 CMCHKUNPK(oduPackUInt32, &tknOid->val[tknOid->len - i], mBuf); #else CMCHKUNPK(oduPackUInt16, &tknOid->val[tknOid->len - i], mBuf); -#endif /* !TKNOID_U16 */ +#endif /* !TKNOID_UINT16 */ } } @@ -3243,7 +3173,6 @@ TknS32 *tknS32; /* token S32 */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTknS32) /* Token Header */ CMCHKUNPK(oduPackUInt8, &tknS32->pres, mBuf); @@ -3284,7 +3213,6 @@ Header *header; /* header structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpHeader) CMCHKUNPK(oduPackUInt16, &header->msgLen, mBuf); CMCHKUNPK(oduPackUInt8, &header->msgType, mBuf); @@ -3330,7 +3258,6 @@ CmStatus *sta; /* status structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkCmStatus) CMCHKUNPK(oduPackUInt16, &sta->status, mBuf); CMCHKUNPK(oduPackUInt16, &sta->reason, mBuf); @@ -3365,7 +3292,6 @@ CmAlarm *alarm; /* alarm structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkCmAlarm) CMCHKUNPK(cmUnpkDateTime, &alarm->dt, mBuf); CMCHKUNPK(oduPackUInt16, &alarm->category, mBuf); @@ -3402,7 +3328,6 @@ SmCfg *smCfg; /* stack manager */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpSmCfg) CMCHKUNPK(cmUnpkEnt, &smCfg->ent, mBuf); CMCHKUNPK(cmUnpkInst, &smCfg->inst, mBuf); @@ -3442,7 +3367,6 @@ TmrCfg *tmrCfg; /* timer configuration */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpTmrCfg) CMCHKUNPK(oduUnpackBool, &tmrCfg->enb, mBuf); CMCHKUNPK(oduPackUInt16, &tmrCfg->val, mBuf); @@ -3479,7 +3403,6 @@ Buffer **tBuf; /* message buffer */ Buffer *mBuf; - TRC2(cmUnpkTknBuf) mBuf = *tBuf; @@ -3545,7 +3468,6 @@ CmIntf *intf; /* interface info */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(cmUnpkIntf) CMCHKUNPK(cmUnpkIntfVer, &intf->intfVer, mBuf); CMCHKUNPK(cmUnpkIntfId, &intf->intfId, mBuf); @@ -3565,7 +3487,7 @@ Buffer *mBuf; /* message buffer */ * File: cm_gen.c * */ -U16 getTransId() +uint16_t getTransId() { gTransId = (gTransId%65535) + 1; return gTransId;