X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_gen.c;h=ab7a754e22b8983094cf2e2bd06ee9ac7a3f2e85;hb=49856df248fd976b4a9882ca4e650fc0bc3e4ee3;hp=a1f88bb6315fcd876e505038fec5c99ce38c9ddb;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git diff --git a/src/cm/cm_gen.c b/src/cm/cm_gen.c index a1f88bb63..ab7a754e2 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 */ @@ -97,30 +97,24 @@ U16 gTransId = 0; * */ -#ifdef ANSI S16 cmPkDateTime ( DateTime *dateTime, /* date and time */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkDateTime(dateTime, mBuf) -DateTime *dateTime; /* date and time */ -Buffer *mBuf; /* message buffer */ -#endif { /*-- cm_gen_c_001.main_36 - added for micro seconds --*/ #ifdef SS_DATETIME_USEC - CMCHKPK(oduUnpackUInt32, dateTime->usec, mBuf); + CMCHKPK(oduPackUInt32, dateTime->usec, mBuf); #endif /*-- SS_DATETIME_USEC --*/ - CMCHKPK(oduUnpackUInt8, dateTime->tenths, mBuf); - CMCHKPK(oduUnpackUInt8, dateTime->sec, mBuf); - CMCHKPK(oduUnpackUInt8, dateTime->min, mBuf); - CMCHKPK(oduUnpackUInt8, dateTime->hour, mBuf); - CMCHKPK(oduUnpackUInt8, dateTime->year, mBuf); - CMCHKPK(oduUnpackUInt8, dateTime->day, mBuf); - CMCHKPK(oduUnpackUInt8, dateTime->month, mBuf); + CMCHKPK(oduPackUInt8, dateTime->tenths, mBuf); + CMCHKPK(oduPackUInt8, dateTime->sec, mBuf); + CMCHKPK(oduPackUInt8, dateTime->min, mBuf); + CMCHKPK(oduPackUInt8, dateTime->hour, mBuf); + CMCHKPK(oduPackUInt8, dateTime->year, mBuf); + CMCHKPK(oduPackUInt8, dateTime->day, mBuf); + CMCHKPK(oduPackUInt8, dateTime->month, mBuf); return ROK; } /* end of cmPkDateTime */ @@ -140,24 +134,18 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkDuration ( Duration *duration, /* duration */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkDuration(duration, mBuf) -Duration *duration; /* duration */ -Buffer *mBuf; /* message buffer */ -#endif { - CMCHKPK(oduUnpackUInt8, duration->tenths, mBuf); - CMCHKPK(oduUnpackUInt8, duration->secs, mBuf); - CMCHKPK(oduUnpackUInt8, duration->mins, mBuf); - CMCHKPK(oduUnpackUInt8, duration->hours, mBuf); - CMCHKPK(oduUnpackUInt8, duration->days, mBuf); + CMCHKPK(oduPackUInt8, duration->tenths, mBuf); + CMCHKPK(oduPackUInt8, duration->secs, mBuf); + CMCHKPK(oduPackUInt8, duration->mins, mBuf); + CMCHKPK(oduPackUInt8, duration->hours, mBuf); + CMCHKPK(oduPackUInt8, duration->days, mBuf); return ROK; } /* end of cmPkDuration */ @@ -176,24 +164,18 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduPackPointer ( PTR ptr, /* pointer */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduPackPointer(ptr, mBuf) -PTR ptr; /* pointer */ -Buffer *mBuf; /* message buffer */ -#endif { 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 @@ -213,17 +195,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 @@ -233,33 +215,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 @@ -267,7 +249,7 @@ Buffer *mBuf; /* message buffer */ break; #endif default: - /* no support for U64 */ + /* no support for uint64_t */ ret = RFAILED; } @@ -289,17 +271,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkEntityId ( EntityId *entityId, /* entity id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkEntityId(entityId, mBuf) -EntityId *entityId; /* entity id */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkInst, entityId->inst, mBuf); @@ -323,17 +299,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkElmntId ( ElmntId *elmntId, /* element id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkElmntId(elmntId, mBuf) -ElmntId *elmntId; /* element id */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkElmntInst3, elmntId->elmntInst3, mBuf); @@ -359,17 +329,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkMemoryId ( MemoryId *memoryId, /* memoryId */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkMemoryId(memoryId, mBuf) -MemoryId *memoryId; /* memoryId */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkPool, memoryId->pool, mBuf); @@ -393,17 +357,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkSystemId ( SystemId *systemId, /* system id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkSystemId(systemId, mBuf) -SystemId *systemId; /* system id */ -Buffer *mBuf; /* message buffer */ -#endif { Txt *p; /* part number string */ @@ -441,32 +399,26 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkProtAddr ( ProtAddr *pAddr, /* protocol address */ Buffer *mBuf /* buffer */ ) -#else -S16 cmPkProtAddr(pAddr, mBuf) -ProtAddr *pAddr; /* protocol address */ -Buffer *mBuf; /* buffer */ -#endif { - U8 j; /* Index */ + uint8_t j; /* Index */ #ifdef CM_ARI2 - CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf); + CMCHKPK(oduPackUInt32, pAddr->autoSysId, mBuf); CMCHKPK(oduPackBool, pAddr->autoSysIdPres, mBuf); #endif /* CM_ARI2 */ for (j = pAddr->len; j; j--) - CMCHKPK(oduUnpackUInt8, pAddr->address[j - 1], mBuf); + CMCHKPK(oduPackUInt8, pAddr->address[j - 1], mBuf); - CMCHKPK(oduUnpackUInt8, pAddr->preLen, mBuf); - CMCHKPK(oduUnpackUInt8, pAddr->len, mBuf); - CMCHKPK(oduUnpackUInt16, pAddr->protType, mBuf); + CMCHKPK(oduPackUInt8, pAddr->preLen, mBuf); + CMCHKPK(oduPackUInt8, pAddr->len, mBuf); + CMCHKPK(oduPackUInt16, pAddr->protType, mBuf); return ROK; @@ -489,20 +441,14 @@ Buffer *mBuf; /* buffer */ * */ -#ifdef ANSI S16 cmPkProtAddrTbl ( ProtAddrTbl *protAddr, /* protocol address table */ Buffer *mBuf /* buffer */ ) -#else -S16 cmPkProtAddrTbl(protAddr, mBuf) -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 */ @@ -514,19 +460,19 @@ Buffer *mBuf; /* buffer */ pAddr = &(protAddr->addr[i - 1]); #ifdef CM_ARI2 - CMCHKPK(oduUnpackUInt32, pAddr->autoSysId, mBuf); + CMCHKPK(oduPackUInt32, pAddr->autoSysId, mBuf); CMCHKPK(oduPackBool, pAddr->autoSysIdPres, mBuf); #endif /* CM_ARI2 */ for (j = pAddr->len; j; j--) - CMCHKPK(oduUnpackUInt8, pAddr->address[j - 1], mBuf); + CMCHKPK(oduPackUInt8, pAddr->address[j - 1], mBuf); - CMCHKPK(oduUnpackUInt8, pAddr->preLen, mBuf); - CMCHKPK(oduUnpackUInt8, pAddr->len, mBuf); - CMCHKPK(oduUnpackUInt16, pAddr->protType, mBuf); + CMCHKPK(oduPackUInt8, pAddr->preLen, mBuf); + CMCHKPK(oduPackUInt8, pAddr->len, mBuf); + CMCHKPK(oduPackUInt16, pAddr->protType, mBuf); } - CMCHKPK(oduUnpackUInt8, protAddr->count, mBuf); + CMCHKPK(oduPackUInt8, protAddr->count, mBuf); return ROK; } /* end of cmPkProtAddrTbl */ @@ -547,19 +493,13 @@ Buffer *mBuf; /* buffer */ * */ -#ifdef ANSI S16 cmPkAddrs ( Addrs *addrs, /* address */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkAddrs(addrs, mBuf) -Addrs *addrs; /* address */ -Buffer *mBuf; /* message buffer */ -#endif { - U8 i; /* loop counter */ + uint8_t i; /* loop counter */ if (addrs->length > ADRLEN) @@ -567,10 +507,10 @@ Buffer *mBuf; /* message buffer */ for (i = addrs->length; i; i--) { - CMCHKPK(oduUnpackUInt8, addrs->strg[i-1], mBuf); + CMCHKPK(oduPackUInt8, addrs->strg[i-1], mBuf); } - CMCHKPK(oduUnpackUInt8, addrs->length, mBuf); + CMCHKPK(oduPackUInt8, addrs->length, mBuf); return ROK; } /* end of cmPkAddrs */ @@ -591,19 +531,13 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkShrtAddrs ( ShrtAddrs *addrs, /* address */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkShrtAddrs(addrs, mBuf) -ShrtAddrs *addrs; /* address */ -Buffer *mBuf; /* message buffer */ -#endif { - U8 i; /* loop counter */ + uint8_t i; /* loop counter */ if (addrs->length > SHRTADRLEN) @@ -611,10 +545,10 @@ Buffer *mBuf; /* message buffer */ for (i = addrs->length; i; i--) { - CMCHKPK(oduUnpackUInt8, addrs->strg[i-1], mBuf); + CMCHKPK(oduPackUInt8, addrs->strg[i-1], mBuf); } - CMCHKPK(oduUnpackUInt8, addrs->length, mBuf); + CMCHKPK(oduPackUInt8, addrs->length, mBuf); return ROK; } /* end of cmPkShrtAddrs */ @@ -634,17 +568,11 @@ 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 */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; /* counter */ @@ -652,7 +580,7 @@ Buffer *mBuf; /* message buffer */ /* pack address mask */ for (i = (ADRLEN - 1); i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, mask[i], mBuf); + CMCHKPK(oduPackUInt8, mask[i], mBuf); } return ROK; @@ -673,17 +601,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkBndCfg ( BndCfg *bndCfg, /* bndCfg */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkBndCfg(bndCfg, mBuf) -BndCfg *bndCfg; /* bndCfg */ -Buffer *mBuf; /* message buffer */ -#endif { Txt *p; /* temporary */ @@ -696,9 +618,9 @@ Buffer *mBuf; /* message buffer */ CMCHKPK(cmPkRegion, bndCfg->region, mBuf); CMCHKPK(cmPkInst, bndCfg->inst, mBuf); CMCHKPK(cmPkEnt, bndCfg->ent, mBuf); - CMCHKPK(oduUnpackUInt8, bndCfg->wdw, mBuf); - CMCHKPK(oduUnpackUInt8, bndCfg->flcTyp, mBuf); - CMCHKPK(oduUnpackUInt8, bndCfg->bufOwnshp, mBuf); + CMCHKPK(oduPackUInt8, bndCfg->wdw, mBuf); + CMCHKPK(oduPackUInt8, bndCfg->flcTyp, mBuf); + CMCHKPK(oduPackUInt8, bndCfg->bufOwnshp, mBuf); for (p = bndCfg->usrId; *p; p++); for (; p != bndCfg->usrId; p--); @@ -721,17 +643,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_gen.c * */ -#ifdef ANSI S16 cmPkPst ( Pst *pst, Buffer *mBuf ) -#else -S16 cmPkPst(pst, mBuf) -Pst *pst; -Buffer *mBuf; -#endif { CMCHKPK(cmPkEvent, pst->event, mBuf); @@ -767,28 +683,22 @@ Buffer *mBuf; * */ -#ifdef ANSI S16 cmPkElmtHdr ( ElmtHdr *m, /* element header */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkElmtHdr(m, mBuf) -ElmtHdr *m; /* element header */ -Buffer *mBuf; /* message buffer */ -#endif { #if (LCAMT || ATM_BISUP) - CMCHKPK(oduUnpackUInt16, m->compInd, mBuf); + CMCHKPK(oduPackUInt16, m->compInd, mBuf); #endif /* LCAMT || ATM_BISUP */ #if (LCAMT || ATM_BISUP) /* Pack action indicator field */ if (m->pres) { - CMCHKPK(oduUnpackUInt8, m->actnInd, mBuf); + CMCHKPK(oduPackUInt8, m->actnInd, mBuf); } #endif @@ -801,9 +711,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 * @@ -813,30 +723,24 @@ 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 */ -Buffer *mBuf; /* message buffer */ -#endif { - if (tknU8->pres) + if (tknUInt8->pres) { /* Value */ - CMCHKPK(oduUnpackUInt8, tknU8->val, mBuf); + CMCHKPK(oduPackUInt8, tknUInt8->val, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknU8->pres, mBuf); + CMCHKPK(oduPackUInt8, tknUInt8->pres, mBuf); return ROK; -} /* end of cmPkTknU8 */ +} /* end of cmPkTknUInt8 */ /* @@ -853,17 +757,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknS8 ( TknS8 *tknS8, /* token S8 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknS8(tknS8, mBuf) -TknS8 *tknS8; /* token S8 */ -Buffer *mBuf; /* message buffer */ -#endif { if (tknS8->pres) @@ -873,7 +771,7 @@ Buffer *mBuf; /* message buffer */ } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknS8->pres, mBuf); + CMCHKPK(oduPackUInt8, tknS8->pres, mBuf); return ROK; } /* end of cmPkTknS8 */ @@ -881,9 +779,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 * @@ -893,37 +791,31 @@ 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 */ -Buffer *mBuf; /* message buffer */ -#endif { - if (tknU16->pres) + if (tknUInt16->pres) { /* Value */ - CMCHKPK(oduUnpackUInt16, tknU16->val, mBuf); + CMCHKPK(oduPackUInt16, tknUInt16->val, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknU16->pres, mBuf); + CMCHKPK(oduPackUInt8, 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 * @@ -933,30 +825,24 @@ 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 */ -Buffer *mBuf; /* message buffer */ -#endif { - if (tknU32->pres) + if (tknUInt32->pres) { /* Value */ - CMCHKPK(oduUnpackUInt32, tknU32->val, mBuf); + CMCHKPK(oduPackUInt32, tknUInt32->val, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknU32->pres, mBuf); + CMCHKPK(oduPackUInt8, tknUInt32->pres, mBuf); return ROK; -} /* end of cmPkTknU32 */ +} /* end of cmPkTknUInt32 */ /* @@ -973,17 +859,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr ( TknStr *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr(tknStr, mBuf) -TknStr *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -993,15 +873,15 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (i = 0; i < (S16) tknStr->len; i++) { - CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); + CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); + CMCHKPK(oduPackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; } /* end of cmPkTknStr */ @@ -1021,17 +901,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrM ( TknStrM *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrM(tknStr, mBuf) -TknStrM *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -1041,15 +915,15 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (i = 0; i < (S16) tknStr->len; i++) { - CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); + CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); + CMCHKPK(oduPackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; } /* end of cmPkTknStrM */ @@ -1069,17 +943,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrS ( TknStrS *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrS(tknStr, mBuf) -TknStrS *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -1089,15 +957,15 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (i = 0; i < (S16) tknStr->len; i++) { - CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); + CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); + CMCHKPK(oduPackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; } /* end of cmPkTknStrS */ @@ -1117,17 +985,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStrE ( TknStrE *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStrE(tknStr, mBuf) -TknStrE *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ @@ -1137,15 +999,15 @@ Buffer *mBuf; /* message buffer */ /* Value */ for (i = 0; i < (S16) tknStr->len; i++) { - CMCHKPK(oduUnpackUInt8, tknStr->val[i], mBuf); + CMCHKPK(oduPackUInt8, tknStr->val[i], mBuf); } /* Length */ - CMCHKPK(oduUnpackUInt8, tknStr->len, mBuf); + CMCHKPK(oduPackUInt8, tknStr->len, mBuf); } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknStr->pres, mBuf); + CMCHKPK(oduPackUInt8, tknStr->pres, mBuf); return ROK; } /* end of cmPkTknStrE */ @@ -1167,24 +1029,18 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkPnNodeId ( PnNodeId *src, /* source PNNI Node Id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkPnNodeId (src, mBuf) -PnNodeId *src; /* source PNNI Node Id */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; for (i = PN_NODEID_LEN - 1; i >= 0; i--) { - CMCHKPK(oduUnpackUInt8, src->id[i], mBuf); + CMCHKPK(oduPackUInt8, src->id[i], mBuf); } return ROK; @@ -1207,17 +1063,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr4 ( TknStr4 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr4(tknStr, mBuf) -TknStr4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1242,17 +1092,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr12 ( TknStr12 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr12(tknStr, mBuf) -TknStr12 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1276,17 +1120,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr32 ( TknStr32 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr32(tknStr, mBuf) -TknStr32 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1310,17 +1148,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr64 ( TknStr64 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr64(tknStr, mBuf) -TknStr64 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1344,17 +1176,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr132 ( TknStr132 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr132(tknStr, mBuf) -TknStr132 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1378,17 +1204,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknStr256 ( TknStr256 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknStr256(tknStr, mBuf) -TknStr256 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMPKTKNSTR(tknStr, mBuf); @@ -1412,39 +1232,33 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknOid ( TknOid *tknOid, /* Object Identifier token */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknOid(tknOid, mBuf) -TknOid *tknOid; /* Object Identifier token */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 i; + uint16_t i; 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 - CMCHKPK(oduUnpackUInt32, tknOid->val[i], mBuf); + /* 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(oduPackUInt32, tknOid->val[i], mBuf); #else - CMCHKPK(oduUnpackUInt16, tknOid->val[i], mBuf); -#endif /* !TKNOID_U16 */ + CMCHKPK(oduPackUInt16, tknOid->val[i], mBuf); +#endif /* !TKNOID_UINT16 */ } /* Pack the length */ - CMCHKPK(oduUnpackUInt8, tknOid->len, mBuf); + CMCHKPK(oduPackUInt8, tknOid->len, mBuf); } /* Pack the token header */ - CMCHKPK(oduUnpackUInt8, tknOid->pres, mBuf); + CMCHKPK(oduPackUInt8, tknOid->pres, mBuf); return ROK; } /* end of cmPkTknOid */ @@ -1464,17 +1278,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknS32 ( TknS32 *tknS32, /* token S32 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknS32(tknS32, mBuf) -TknS32 *tknS32; /* token S32 */ -Buffer *mBuf; /* message buffer */ -#endif { if (tknS32->pres) @@ -1484,7 +1292,7 @@ Buffer *mBuf; /* message buffer */ } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknS32->pres, mBuf); + CMCHKPK(oduPackUInt8, tknS32->pres, mBuf); return ROK; } /* end of cmPkTknS32 */ @@ -1504,17 +1312,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkHeader ( Header *header, /* header */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkHeader(header, mBuf) -Header *header; /* header */ -Buffer *mBuf; /* message buffer */ -#endif { #ifdef LMINT3 @@ -1526,10 +1328,10 @@ Buffer *mBuf; /* message buffer */ #endif /* LMINT3 */ CMCHKPK(cmPkElmntId, &header->elmId, mBuf); CMCHKPK(cmPkEntityId, &header->entId, mBuf); - CMCHKPK(oduUnpackUInt16, header->seqNmb, mBuf); - CMCHKPK(oduUnpackUInt8, header->version, mBuf); - CMCHKPK(oduUnpackUInt8, header->msgType, mBuf); - CMCHKPK(oduUnpackUInt16, header->msgLen, mBuf); + CMCHKPK(oduPackUInt16, header->seqNmb, mBuf); + CMCHKPK(oduPackUInt8, header->version, mBuf); + CMCHKPK(oduPackUInt8, header->msgType, mBuf); + CMCHKPK(oduPackUInt16, header->msgLen, mBuf); return ROK; } /* end of cmPkHeader */ @@ -1549,21 +1351,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkCmStatus ( CmStatus *sta, /* status structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmStatus(sta, mBuf) -CmStatus *sta; /* status structure */ -Buffer *mBuf; /* message buffer */ -#endif { - CMCHKPK(oduUnpackUInt16, sta->reason, mBuf); - CMCHKPK(oduUnpackUInt16, sta->status, mBuf); + CMCHKPK(oduPackUInt16, sta->reason, mBuf); + CMCHKPK(oduPackUInt16, sta->status, mBuf); return ROK; } /* end of cmPkCmStatus */ @@ -1583,22 +1379,16 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkCmAlarm ( CmAlarm *alarm, /* alarm structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkCmAlarm(alarm, mBuf) -CmAlarm *alarm; /* alarm structure */ -Buffer *mBuf; /* message buffer */ -#endif { - CMCHKPK(oduUnpackUInt16, alarm->cause, mBuf); - CMCHKPK(oduUnpackUInt16, alarm->event, mBuf); - CMCHKPK(oduUnpackUInt16, alarm->category, mBuf); + CMCHKPK(oduPackUInt16, alarm->cause, mBuf); + CMCHKPK(oduPackUInt16, alarm->event, mBuf); + CMCHKPK(oduPackUInt16, alarm->category, mBuf); CMCHKPK(cmPkDateTime, &alarm->dt, mBuf); return ROK; @@ -1619,17 +1409,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkSmCfg ( SmCfg *smCfg, /* stack manager */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkSmCfg(smCfg, mBuf) -SmCfg *smCfg; /* stack manager */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkSelector, smCfg->selector, mBuf); @@ -1658,20 +1442,14 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTmrCfg ( TmrCfg *tmrCfg, /* timer configuration */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTmrCfg(tmrCfg, mBuf) -TmrCfg *tmrCfg; /* timer configuration */ -Buffer *mBuf; /* message buffer */ -#endif { - CMCHKPK(oduUnpackUInt16, tmrCfg->val, mBuf); + CMCHKPK(oduPackUInt16, tmrCfg->val, mBuf); CMCHKPK(oduPackBool, tmrCfg->enb, mBuf); return ROK; @@ -1692,17 +1470,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkTknBuf ( TknBuf *tknBuf, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkTknBuf(tknBuf, mBuf) -TknBuf *tknBuf; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { if(tknBuf->pres) @@ -1719,7 +1491,7 @@ Buffer *mBuf; /* message buffer */ } /* Token Header */ - CMCHKPK(oduUnpackUInt8, tknBuf->pres, mBuf); + CMCHKPK(oduPackUInt8, tknBuf->pres, mBuf); return ROK; } /* end of cmPkTknBuf */ @@ -1739,17 +1511,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmPkIntf ( CmIntf *intf, /* interface info */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmPkIntf(intf, mBuf) -CmIntf *intf; /* interface info */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKPK(cmPkIntfId, intf->intfId, mBuf); @@ -1779,30 +1545,24 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkDateTime ( DateTime *dateTime, /* date/time structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkDateTime(dateTime, mBuf) -DateTime *dateTime; /* date/time structure */ -Buffer *mBuf; /* message buffer */ -#endif { - CMCHKUNPK(oduPackUInt8, &dateTime->month, mBuf); - CMCHKUNPK(oduPackUInt8, &dateTime->day, mBuf); - CMCHKUNPK(oduPackUInt8, &dateTime->year, mBuf); - CMCHKUNPK(oduPackUInt8, &dateTime->hour, mBuf); - CMCHKUNPK(oduPackUInt8, &dateTime->min, mBuf); - CMCHKUNPK(oduPackUInt8, &dateTime->sec, mBuf); - CMCHKUNPK(oduPackUInt8, &dateTime->tenths, mBuf); + CMCHKUNPK(oduUnpackUInt8, &dateTime->month, mBuf); + CMCHKUNPK(oduUnpackUInt8, &dateTime->day, mBuf); + CMCHKUNPK(oduUnpackUInt8, &dateTime->year, mBuf); + CMCHKUNPK(oduUnpackUInt8, &dateTime->hour, mBuf); + CMCHKUNPK(oduUnpackUInt8, &dateTime->min, mBuf); + CMCHKUNPK(oduUnpackUInt8, &dateTime->sec, mBuf); + CMCHKUNPK(oduUnpackUInt8, &dateTime->tenths, mBuf); /*-- added for micro seconds --*/ #ifdef SS_DATETIME_USEC - CMCHKUNPK(oduPackUInt32, &dateTime->usec, mBuf); + CMCHKUNPK(oduUnpackUInt32, &dateTime->usec, mBuf); #endif /*-- SS_DATETIME_USEC --*/ return ROK; @@ -1823,24 +1583,18 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkDuration ( Duration *duration, /* duration structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkDuration(duration, mBuf) -Duration *duration; /* duration structure */ -Buffer *mBuf; /* message buffer */ -#endif { - CMCHKUNPK(oduPackUInt8, &duration->days, mBuf); - CMCHKUNPK(oduPackUInt8, &duration->hours, mBuf); - CMCHKUNPK(oduPackUInt8, &duration->mins, mBuf); - CMCHKUNPK(oduPackUInt8, &duration->secs, mBuf); - CMCHKUNPK(oduPackUInt8, &duration->tenths, mBuf); + CMCHKUNPK(oduUnpackUInt8, &duration->days, mBuf); + CMCHKUNPK(oduUnpackUInt8, &duration->hours, mBuf); + CMCHKUNPK(oduUnpackUInt8, &duration->mins, mBuf); + CMCHKUNPK(oduUnpackUInt8, &duration->secs, mBuf); + CMCHKUNPK(oduUnpackUInt8, &duration->tenths, mBuf); return ROK; } /* end of cmUnpkDuration */ @@ -1859,25 +1613,19 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 oduUnpackPointer ( PTR *ptr, /* duration structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 oduUnpackPointer(ptr, mBuf) -PTR *ptr; /* duration structure */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 tmp16; /* temporary value */ - U32 tmp32; /* temporary value */ - Data unpkArray[PTRSIZE]; /* unpacking array */ - S16 ret; /* return code */ + uint16_t tmp16 =0; /* temporary value */ + uint32_t tmp32 =0; /* temporary value */ + Data unpkArray[PTRSIZE]; /* unpacking array */ + S16 ret =ROK; /* return code */ #if (defined(ALPHA) || defined(BIT_64)) - U64 tmp64; + uint64_t tmp64 =0; #endif @@ -1890,11 +1638,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; @@ -1907,19 +1655,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; @@ -1934,41 +1682,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; } @@ -1990,17 +1738,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkEntityId ( EntityId *entityId, /* entity id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkEntityId(entityId, mBuf) -EntityId *entityId; /* entity id */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkEnt, &entityId->ent, mBuf); @@ -2024,17 +1766,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkElmntId ( ElmntId *elmntId, /* element id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkElmntId(elmntId, mBuf) -ElmntId *elmntId; /* element id */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkElmnt, &elmntId->elmnt, mBuf); @@ -2060,17 +1796,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkMemoryId ( MemoryId *memoryId, /* memoryId */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkMemoryId(memoryId, mBuf) -MemoryId *memoryId; /* memoryId */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkRegion, &memoryId->region, mBuf); @@ -2094,17 +1824,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkSystemId ( SystemId *systemId, /* system id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkSystemId(systemId, mBuf) -SystemId *systemId; /* system id */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; /* loop counter */ MsgLen len; @@ -2142,31 +1866,25 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkProtAddr ( ProtAddr *pAddr, /* protocol address */ Buffer *mBuf /* buffer */ ) -#else -S16 cmUnpkProtAddr(pAddr, mBuf) -ProtAddr *pAddr; /* protocol address table */ -Buffer *mBuf; /* buffer */ -#endif { - U8 j; /* Index */ + uint8_t j; /* Index */ - CMCHKUNPK(oduPackUInt16, &(pAddr->protType), mBuf); - CMCHKUNPK(oduPackUInt8, &(pAddr->len), mBuf); - CMCHKUNPK(oduPackUInt8, &(pAddr->preLen), mBuf); + CMCHKUNPK(oduUnpackUInt16, &(pAddr->protType), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(pAddr->len), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(pAddr->preLen), mBuf); for (j =0; j < pAddr->len; j++) - CMCHKUNPK(oduPackUInt8, &pAddr->address[j], mBuf); + CMCHKUNPK(oduUnpackUInt8, &pAddr->address[j], mBuf); #ifdef CM_ARI2 CMCHKUNPK(oduUnpackBool, &(pAddr->autoSysIdPres), mBuf); - CMCHKUNPK(oduPackUInt32, &(pAddr->autoSysId), mBuf); + CMCHKUNPK(oduUnpackUInt32, &(pAddr->autoSysId), mBuf); #endif /* CM_ARI2 */ return ROK; @@ -2188,39 +1906,33 @@ Buffer *mBuf; /* buffer */ * */ -#ifdef ANSI S16 cmUnpkProtAddrTbl ( ProtAddrTbl *protAddr, /* protocol address table */ Buffer *mBuf /* buffer */ ) -#else -S16 cmUnpkProtAddrTbl(protAddr, mBuf) -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 */ - CMCHKUNPK(oduPackUInt8, &protAddr->count, mBuf); + CMCHKUNPK(oduUnpackUInt8, &protAddr->count, mBuf); for (i = 0; i < protAddr->count; i++) { pAddr = &(protAddr->addr[i]); - CMCHKUNPK(oduPackUInt16, &(pAddr->protType), mBuf); - CMCHKUNPK(oduPackUInt8, &(pAddr->len), mBuf); - CMCHKUNPK(oduPackUInt8, &(pAddr->preLen), mBuf); + CMCHKUNPK(oduUnpackUInt16, &(pAddr->protType), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(pAddr->len), mBuf); + CMCHKUNPK(oduUnpackUInt8, &(pAddr->preLen), mBuf); for (j =0; j < pAddr->len; j++) - CMCHKUNPK(oduPackUInt8, &pAddr->address[j], mBuf); + CMCHKUNPK(oduUnpackUInt8, &pAddr->address[j], mBuf); #ifdef CM_ARI2 CMCHKUNPK(oduUnpackBool, &(pAddr->autoSysIdPres), mBuf); - CMCHKUNPK(oduPackUInt32, &(pAddr->autoSysId), mBuf); + CMCHKUNPK(oduUnpackUInt32, &(pAddr->autoSysId), mBuf); #endif /* CM_ARI2 */ } return ROK; @@ -2241,29 +1953,23 @@ Buffer *mBuf; /* buffer */ * */ -#ifdef ANSI S16 cmUnpkAddrs ( Addrs *addrs, /* address */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkAddrs(addrs, mBuf) -Addrs *addrs; /* address */ -Buffer *mBuf; /* message buffer */ -#endif { - U8 i; /* loop counter */ + uint8_t i; /* loop counter */ - CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf); + CMCHKUNPK(oduUnpackUInt8, &addrs->length, mBuf); if (addrs->length > ADRLEN) return RFAILED; for(i = 0; i < addrs->length; i++) { - CMCHKUNPK(oduPackUInt8, &addrs->strg[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, &addrs->strg[i], mBuf); } return ROK; @@ -2283,29 +1989,23 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkShrtAddrs ( ShrtAddrs *addrs, /* address */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkShrtAddrs(addrs, mBuf) -ShrtAddrs *addrs; /* address */ -Buffer *mBuf; /* message buffer */ -#endif { - U8 i; /* loop counter */ + uint8_t i; /* loop counter */ - CMCHKUNPK(oduPackUInt8, &addrs->length, mBuf); + CMCHKUNPK(oduUnpackUInt8, &addrs->length, mBuf); if (addrs->length > SHRTADRLEN) return RFAILED; for(i = 0; i < addrs->length; i++) { - CMCHKUNPK(oduPackUInt8, &addrs->strg[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, &addrs->strg[i], mBuf); } return ROK; } /* end of cmUnpkShrtAddrs */ @@ -2325,17 +2025,11 @@ 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 */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; /* counter */ @@ -2343,7 +2037,7 @@ Buffer *mBuf; /* message buffer */ /* unpack address mask */ for (i = 0; i< ADRLEN; i++) { - CMCHKUNPK(oduPackUInt8, &mask[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, &mask[i], mBuf); } return ROK; } /* end of cmUnpkAddrMask */ @@ -2363,17 +2057,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkBndCfg ( BndCfg *bndCfg, /* bndCfg */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkBndCfg(bndCfg, mBuf) -BndCfg *bndCfg; /* bndCfg */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; /* loop counter */ @@ -2381,9 +2069,9 @@ Buffer *mBuf; /* message buffer */ for (i = 0; bndCfg->usrId[i]; i++); CMCHKUNPK(cmUnpkTxt, bndCfg->usrId+i, mBuf); - CMCHKUNPK(oduPackUInt8, &bndCfg->bufOwnshp, mBuf); - CMCHKUNPK(oduPackUInt8, &bndCfg->flcTyp, mBuf); - CMCHKUNPK(oduPackUInt8, &bndCfg->wdw, mBuf); + CMCHKUNPK(oduUnpackUInt8, &bndCfg->bufOwnshp, mBuf); + CMCHKUNPK(oduUnpackUInt8, &bndCfg->flcTyp, mBuf); + CMCHKUNPK(oduUnpackUInt8, &bndCfg->wdw, mBuf); CMCHKUNPK(cmUnpkEnt, &bndCfg->ent, mBuf); CMCHKUNPK(cmUnpkInst, &bndCfg->inst, mBuf); CMCHKUNPK(cmUnpkRegion, &bndCfg->region, mBuf); @@ -2410,17 +2098,11 @@ Buffer *mBuf; /* message buffer */ * File: cm_gen.c * */ -#ifdef ANSI S16 cmUnpkPst ( Pst *pst, Buffer *mBuf ) -#else -S16 cmUnpkPst(pst, mBuf) -Pst *pst; -Buffer *mBuf; -#endif { #ifdef TDS_ROLL_UPGRADE_SUPPORT @@ -2456,17 +2138,11 @@ Buffer *mBuf; * */ -#ifdef ANSI S16 cmUnpkElmtHdr ( ElmtHdr *m, /* element header */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkElmtHdr(m, mBuf) -ElmtHdr *m; /* element header */ -Buffer *mBuf; /* message buffer */ -#endif { /* Present */ @@ -2476,12 +2152,12 @@ Buffer *mBuf; /* message buffer */ /* Unpack action indicator field */ if (m->pres) { - CMCHKUNPK(oduPackUInt8, &m->actnInd, mBuf); + CMCHKUNPK(oduUnpackUInt8, &m->actnInd, mBuf); } #endif #if (LCAMT || ATM_BISUP) - CMCHKUNPK(oduPackUInt16, &m->compInd, mBuf); + CMCHKUNPK(oduUnpackUInt16, &m->compInd, mBuf); #endif /* LCAMT || ATM_BISUP */ return ROK; @@ -2490,9 +2166,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 * @@ -2502,30 +2178,24 @@ 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 */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknU8->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknUInt8->pres, mBuf); - if (tknU8->pres) + if (tknUInt8->pres) { /* Value */ - CMCHKUNPK(oduPackUInt8, &tknU8->val, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknUInt8->val, mBuf); } return ROK; -} /* end of cmUnpkTknU8 */ +} /* end of cmUnpkTknUInt8 */ /* @@ -2542,21 +2212,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknS8 ( TknS8 *tknS8, /* token S8 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknS8(tknS8, mBuf) -TknS8 *tknS8; /* token S8 */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknS8->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknS8->pres, mBuf); if (tknS8->pres) { @@ -2570,9 +2234,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 * @@ -2582,37 +2246,31 @@ 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 */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknU16->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknUInt16->pres, mBuf); - if (tknU16->pres) + if (tknUInt16->pres) { /* Value */ - CMCHKUNPK(oduPackUInt16, &tknU16->val, mBuf); + CMCHKUNPK(oduUnpackUInt16, &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 * @@ -2622,30 +2280,24 @@ 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 */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknU32->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknUInt32->pres, mBuf); - if (tknU32->pres) + if (tknUInt32->pres) { /* Value */ - CMCHKUNPK(oduPackUInt32, &tknU32->val, mBuf); + CMCHKUNPK(oduUnpackUInt32, &tknUInt32->val, mBuf); } return ROK; -} /* end of cmUnpkTknU32 */ +} /* end of cmUnpkTknUInt32 */ /* * @@ -2661,33 +2313,27 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr ( TknStr *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr(tknStr, mBuf) -TknStr *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if (tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf); /* Value */ for (i = (tknStr->len - 1); i >= 0; i--) { - CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->val[i], mBuf); } } else @@ -2710,33 +2356,27 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrM ( TknStrM *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrM(tknStr, mBuf) -TknStrM *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if (tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf); /* Value */ for (i = (tknStr->len - 1); i >= 0; i--) { - CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->val[i], mBuf); } } else @@ -2760,33 +2400,27 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrS ( TknStrS *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrS(tknStr, mBuf) -TknStrS *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if (tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf); /* Value */ for (i = (tknStr->len - 1); i >= 0; i--) { - CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->val[i], mBuf); } } else @@ -2810,33 +2444,27 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStrE ( TknStrE *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStrE(tknStr, mBuf) -TknStrE *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { Cntr i; /* counter */ /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknStr->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->pres, mBuf); if (tknStr->pres) { /* Length */ - CMCHKUNPK(oduPackUInt8, &tknStr->len, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->len, mBuf); /* Value */ for (i = (tknStr->len - 1); i >= 0; i--) { - CMCHKUNPK(oduPackUInt8, &tknStr->val[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknStr->val[i], mBuf); } } else @@ -2862,24 +2490,18 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkPnNodeId ( PnNodeId *dst, /* source PNNI Node Id */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkPnNodeId (dst, mBuf) -PnNodeId *dst; /* source PNNI Node Id */ -Buffer *mBuf; /* message buffer */ -#endif { S16 i; for (i = 0; i < PN_NODEID_LEN; i++) { - CMCHKUNPK(oduPackUInt8, &dst->id[i], mBuf); + CMCHKUNPK(oduUnpackUInt8, &dst->id[i], mBuf); } return ROK; @@ -2902,17 +2524,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr4 ( TknStr4 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr4(tknStr, mBuf) -TknStr4 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -2937,17 +2553,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr12 ( TknStr12 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr12(tknStr, mBuf) -TknStr12 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -2971,17 +2581,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr32 ( TknStr32 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr32(tknStr, mBuf) -TknStr32 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -3005,17 +2609,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr64 ( TknStr64 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr64(tknStr, mBuf) -TknStr64 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -3039,17 +2637,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr132 ( TknStr132 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr132(tknStr, mBuf) -TknStr132 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -3073,17 +2665,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknStr256 ( TknStr256 *tknStr, /* token string */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknStr256(tknStr, mBuf) -TknStr256 *tknStr; /* token string */ -Buffer *mBuf; /* message buffer */ -#endif { CMUNPKTKNSTR(tknStr, mBuf); @@ -3107,39 +2693,33 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknOid ( TknOid *tknOid, /* Object Identifier token */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknOid(tknOid, mBuf) -TknOid *tknOid; /* Object Identifier token */ -Buffer *mBuf; /* message buffer */ -#endif { - U16 i; + uint16_t i; /* Unpack the token header */ - CMCHKUNPK(oduPackUInt8, &tknOid->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknOid->pres, mBuf); if (tknOid->pres == TRUE) { /* Unpack the length */ - CMCHKUNPK(oduPackUInt8, &tknOid->len, mBuf); + CMCHKUNPK(oduUnpackUInt8, &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 - CMCHKUNPK(oduPackUInt32, &tknOid->val[tknOid->len - i], mBuf); + /* 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(oduUnpackUInt32, &tknOid->val[tknOid->len - i], mBuf); #else - CMCHKUNPK(oduPackUInt16, &tknOid->val[tknOid->len - i], mBuf); -#endif /* !TKNOID_U16 */ + CMCHKUNPK(oduUnpackUInt16, &tknOid->val[tknOid->len - i], mBuf); +#endif /* !TKNOID_UINT16 */ } } @@ -3161,21 +2741,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknS32 ( TknS32 *tknS32, /* token S32 */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTknS32(tknS32, mBuf) -TknS32 *tknS32; /* token S32 */ -Buffer *mBuf; /* message buffer */ -#endif { /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknS32->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknS32->pres, mBuf); if (tknS32->pres) { @@ -3201,23 +2775,17 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkHeader ( Header *header, /* header structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkHeader(header, mBuf) -Header *header; /* header structure */ -Buffer *mBuf; /* message buffer */ -#endif { - CMCHKUNPK(oduPackUInt16, &header->msgLen, mBuf); - CMCHKUNPK(oduPackUInt8, &header->msgType, mBuf); - CMCHKUNPK(oduPackUInt8, &header->version, mBuf); - CMCHKUNPK(oduPackUInt16, &header->seqNmb, mBuf); + CMCHKUNPK(oduUnpackUInt16, &header->msgLen, mBuf); + CMCHKUNPK(oduUnpackUInt8, &header->msgType, mBuf); + CMCHKUNPK(oduUnpackUInt8, &header->version, mBuf); + CMCHKUNPK(oduUnpackUInt16, &header->seqNmb, mBuf); CMCHKUNPK(cmUnpkEntityId, &header->entId, mBuf); CMCHKUNPK(cmUnpkElmntId, &header->elmId, mBuf); #ifdef LMINT3 @@ -3246,21 +2814,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkCmStatus ( CmStatus *sta, /* status structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmStatus(sta, mBuf) -CmStatus *sta; /* status structure */ -Buffer *mBuf; /* message buffer */ -#endif { - CMCHKUNPK(oduPackUInt16, &sta->status, mBuf); - CMCHKUNPK(oduPackUInt16, &sta->reason, mBuf); + CMCHKUNPK(oduUnpackUInt16, &sta->status, mBuf); + CMCHKUNPK(oduUnpackUInt16, &sta->reason, mBuf); return ROK; } /* end of cmUnpkCmStatus */ @@ -3280,23 +2842,17 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkCmAlarm ( CmAlarm *alarm, /* alarm structure */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkCmAlarm(alarm, mBuf) -CmAlarm *alarm; /* alarm structure */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkDateTime, &alarm->dt, mBuf); - CMCHKUNPK(oduPackUInt16, &alarm->category, mBuf); - CMCHKUNPK(oduPackUInt16, &alarm->event, mBuf); - CMCHKUNPK(oduPackUInt16, &alarm->cause, mBuf); + CMCHKUNPK(oduUnpackUInt16, &alarm->category, mBuf); + CMCHKUNPK(oduUnpackUInt16, &alarm->event, mBuf); + CMCHKUNPK(oduUnpackUInt16, &alarm->cause, mBuf); return ROK; } /* end of cmUnpkCmAlarm */ @@ -3316,17 +2872,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkSmCfg ( SmCfg *smCfg, /* stack manager */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkSmCfg(smCfg, mBuf) -SmCfg *smCfg; /* stack manager */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkEnt, &smCfg->ent, mBuf); @@ -3355,21 +2905,15 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTmrCfg ( TmrCfg *tmrCfg, /* timer configuration */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkTmrCfg(tmrCfg, mBuf) -TmrCfg *tmrCfg; /* timer configuration */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(oduUnpackBool, &tmrCfg->enb, mBuf); - CMCHKUNPK(oduPackUInt16, &tmrCfg->val, mBuf); + CMCHKUNPK(oduUnpackUInt16, &tmrCfg->val, mBuf); return ROK; } /* end of cmUnpkTmrCfg */ @@ -3388,17 +2932,11 @@ Buffer *mBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkTknBuf ( TknBuf *tknBuf, /* token string */ Buffer **tBuf /* message buffer */ ) -#else -S16 cmUnpkTknBuf(tknBuf, tBuf) -TknBuf *tknBuf; /* token string */ -Buffer **tBuf; /* message buffer */ -#endif { Buffer *mBuf; @@ -3407,7 +2945,7 @@ Buffer **tBuf; /* message buffer */ mBuf = *tBuf; /* Token Header */ - CMCHKUNPK(oduPackUInt8, &tknBuf->pres, mBuf); + CMCHKUNPK(oduUnpackUInt8, &tknBuf->pres, mBuf); if(tknBuf->pres) { @@ -3456,17 +2994,11 @@ Buffer **tBuf; /* message buffer */ * */ -#ifdef ANSI S16 cmUnpkIntf ( CmIntf *intf, /* interface info */ Buffer *mBuf /* message buffer */ ) -#else -S16 cmUnpkIntf(intf, mBuf) -CmIntf *intf; /* interface info */ -Buffer *mBuf; /* message buffer */ -#endif { CMCHKUNPK(cmUnpkIntfVer, &intf->intfVer, mBuf); @@ -3487,7 +3019,7 @@ Buffer *mBuf; /* message buffer */ * File: cm_gen.c * */ -U16 getTransId() +uint16_t getTransId() { gTransId = (gTransId%65535) + 1; return gTransId;