X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_gen.h;h=2820e8b47b2d7b973e9504612ea1fb22ede8df10;hb=49856df248fd976b4a9882ca4e650fc0bc3e4ee3;hp=64b0b87e15fe3c2c254efe62af88bead185e1316;hpb=e54c2aae19e97065def9e5ab2d1488477b1ea209;p=o-du%2Fl2.git diff --git a/src/cm/cm_gen.h b/src/cm/cm_gen.h index 64b0b87e1..2820e8b47 100644 --- a/src/cm/cm_gen.h +++ b/src/cm/cm_gen.h @@ -47,71 +47,71 @@ /* system services typedefs */ -#define oduPackBool(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Bool */ +#define oduPackBool(x, mBuf) oduPackUInt8(x, mBuf) /* pack Bool */ #define cmPkStatus(x, mBuf) SPkS16(x, mBuf) /* pack Status */ -#define cmPkTicks(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Ticks */ +#define cmPkTicks(x, mBuf) oduPackUInt32(x, mBuf) /* pack Ticks */ #define cmPkQLen(x, mBuf) SPkS16(x, mBuf) /* pack QLen */ #define cmPkOrder(x, mBuf) SPkS16(x, mBuf) /* pack Order */ -#define cmPkData(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Data */ -#define cmPkRandom(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Random */ +#define cmPkData(x, mBuf) oduPackUInt8(x, mBuf) /* pack Data */ +#define cmPkRandom(x, mBuf) oduPackUInt16(x, mBuf) /* pack Random */ #define cmPkSeq(x, mBuf) SPkS16(x, mBuf) /* pack Seq */ #define cmPkReason(x, mBuf) SPkS16(x, mBuf) /* pack Reason */ -#define cmPkProcId(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack ProcId */ +#define cmPkProcId(x, mBuf) oduPackUInt16(x, mBuf) /* pack ProcId */ #define cmPkVectNmb(x, mBuf) SPkS16(x, mBuf) /* pack VectNmb */ -#define cmPkPrior(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Prior*/ +#define cmPkPrior(x, mBuf) oduPackUInt8(x, mBuf) /* pack Prior*/ #define cmPkPriority(x, mBuf) cmPkPrior(x, mBuf) /* pack Priority */ -#define cmPkRoute(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Route */ +#define cmPkRoute(x, mBuf) oduPackUInt8(x, mBuf) /* pack Route */ #define cmPkTtype(x, mBuf) SPkS16(x, mBuf) /* pack Ttype */ #define cmPkSema(x, mBuf) SPkS8(x, mBuf) /* pack Sema */ #define cmPkTxt(x, mBuf) SPkS8(x, mBuf) /* pack Txt */ -#define cmPkEnt(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ent */ -#define cmPkInst(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Inst */ +#define cmPkEnt(x, mBuf) oduPackUInt8(x, mBuf) /* pack Ent */ +#define cmPkInst(x, mBuf) oduPackUInt8(x, mBuf) /* pack Inst */ #define cmPkElmnt(x, mBuf) SPkS16(x, mBuf) /* pack Elmnt */ #define cmPkElmntInst1(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst1 */ #define cmPkElmntInst2(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst2 */ #define cmPkElmntInst3(x, mBuf) SPkS16(x, mBuf) /* pack ElmntInst3 */ -#define cmPkRegion(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Region */ -#define cmPkPool(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Pool */ +#define cmPkRegion(x, mBuf) oduPackUInt8(x, mBuf) /* pack Region */ +#define cmPkPool(x, mBuf) oduPackUInt8(x, mBuf) /* pack Pool */ #ifdef LONG_MSG #define cmPkMsgLen(x, mBuf) SPkS32(x, mBuf) /* pack MsgLen */ #else #define cmPkMsgLen(x, mBuf) SPkS16(x, mBuf) /* pack MsgLen */ #endif #ifdef DOS -#define cmPkSize(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Size */ +#define cmPkSize(x, mBuf) oduPackUInt16(x, mBuf) /* pack Size */ #else -#define cmPkSize(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Size */ +#define cmPkSize(x, mBuf) oduPackUInt32(x, mBuf) /* pack Size */ #endif /* DOS */ /* general typedefs */ -#define cmPkSelector(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Selector */ -#define cmPkEvent(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Event */ +#define cmPkSelector(x, mBuf) oduPackUInt8(x, mBuf) /* pack Selector */ +#define cmPkEvent(x, mBuf) oduPackUInt8(x, mBuf) /* pack Event */ #define cmPkCntr(x, mBuf) SPkS32(x, mBuf) /* pack Cntr */ -#define cmPkStsCntr(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack StsCntr */ +#define cmPkStsCntr(x, mBuf) oduPackUInt32(x, mBuf) /* pack StsCntr */ #define cmPkLnkNmb(x, mBuf) SPkS16(x, mBuf) /* pack LnkNmb */ #define cmPkSuId(x, mBuf) SPkS16(x, mBuf) /* pack SuId */ #define cmPkSpId(x, mBuf) SPkS16(x, mBuf) /* pack SpId */ #define cmPkSuInstId(x, mBuf) SPkS16(x, mBuf) /* pack SuInstId */ #define cmPkSpInstInd(x, mBuf) SPkS16(x, mBuf) /* pack SpInstInd */ -#define cmPkSapi(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Sapi */ -#define cmPkTei(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Tei */ -#define cmPkCes(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ces */ -#define cmPkDlci(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Dlci */ -#define cmPkCalRef(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack CalRef */ +#define cmPkSapi(x, mBuf) oduPackUInt8(x, mBuf) /* pack Sapi */ +#define cmPkTei(x, mBuf) oduPackUInt8(x, mBuf) /* pack Tei */ +#define cmPkCes(x, mBuf) oduPackUInt8(x, mBuf) /* pack Ces */ +#define cmPkDlci(x, mBuf) oduPackUInt32(x, mBuf) /* pack Dlci */ +#define cmPkCalRef(x, mBuf) oduPackUInt16(x, mBuf) /* pack CalRef */ #define cmPkOrigin(x, mBuf) SPkS16(x, mBuf) /* pack Origin */ #define cmPkSwtch(x, mBuf) SPkS16(x, mBuf) /* pack Swtch */ -#define cmPkCause(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Cause */ -#define cmPkDgn(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Dgn */ +#define cmPkCause(x, mBuf) oduPackUInt8(x, mBuf) /* pack Cause */ +#define cmPkDgn(x, mBuf) oduPackUInt8(x, mBuf) /* pack Dgn */ #define cmPkAction(x, mBuf) SPkS16(x, mBuf) /* pack Action */ #define cmPkSeqS16(x, mBuf) SPkS16(x, mBuf) /* pack SeqS16 */ -#define cmPkSeqUInt16(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack SeqUInt16 */ +#define cmPkSeqUInt16(x, mBuf) oduPackUInt16(x, mBuf) /* pack SeqUInt16 */ #define cmPkSeqS24(x, mBuf) SPkS32(x, mBuf) /* pack SeqS24 */ -#define cmPkSeqUInt24(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack SeqUInt24 */ -#define cmPkSetUpArb(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack SetUpArb */ -#define cmPkEvntType(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack EvntType */ -#define cmPkState(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack State */ -#define cmPkMode(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Mode */ +#define cmPkSeqUInt24(x, mBuf) oduPackUInt32(x, mBuf) /* pack SeqUInt24 */ +#define cmPkSetUpArb(x, mBuf) oduPackUInt8(x, mBuf) /* pack SetUpArb */ +#define cmPkEvntType(x, mBuf) oduPackUInt8(x, mBuf) /* pack EvntType */ +#define cmPkState(x, mBuf) oduPackUInt8(x, mBuf) /* pack State */ +#define cmPkMode(x, mBuf) oduPackUInt8(x, mBuf) /* pack Mode */ #define cmPkConnId(x, mBuf) SPkS32(x, mBuf) /* pack ConnId */ /* scc specific typedefs */ @@ -125,97 +125,97 @@ /* tcp/ip specific typedefs */ -#define cmPkIpAddr(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack IpAddr */ -#define cmPkPort(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Port */ -#define cmPkCmd(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Cmd */ -#define cmPkFlags(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Flags */ -#define cmPkTtl(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Ttl */ -#define cmPkPrec(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Prec */ -#define cmPkWindow(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack Window */ +#define cmPkIpAddr(x, mBuf) oduPackUInt32(x, mBuf) /* pack IpAddr */ +#define cmPkPort(x, mBuf) oduPackUInt16(x, mBuf) /* pack Port */ +#define cmPkCmd(x, mBuf) oduPackUInt8(x, mBuf) /* pack Cmd */ +#define cmPkFlags(x, mBuf) oduPackUInt8(x, mBuf) /* pack Flags */ +#define cmPkTtl(x, mBuf) oduPackUInt8(x, mBuf) /* pack Ttl */ +#define cmPkPrec(x, mBuf) oduPackUInt8(x, mBuf) /* pack Prec */ +#define cmPkWindow(x, mBuf) oduPackUInt32(x, mBuf) /* pack Window */ /* ISUP specific typedefs */ -#define cmPkCirId(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack CirId */ -#define cmPkCic(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack Cic */ -#define cmPkSiInstId(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack SiInstId */ +#define cmPkCirId(x, mBuf) oduPackUInt16(x, mBuf) /* pack CirId */ +#define cmPkCic(x, mBuf) oduPackUInt16(x, mBuf) /* pack Cic */ +#define cmPkSiInstId(x, mBuf) oduPackUInt32(x, mBuf) /* pack SiInstId */ /* TUP specific typedefs */ -#define cmPkTpInstId(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack TpInstId */ +#define cmPkTpInstId(x, mBuf) oduPackUInt32(x, mBuf) /* pack TpInstId */ /* PNNI specific typedefs */ -#define cmPkPnPortId(x, mBuf) oduUnpackUInt32(x, mBuf) +#define cmPkPnPortId(x, mBuf) oduPackUInt32(x, mBuf) /* unpacking macros */ /* system services typedefs */ -#define oduUnpackBool(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Bool */ +#define oduUnpackBool(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Bool */ #define cmUnpkStatus(x, mBuf) SUnpkS16(x, mBuf) /* unpack Status */ -#define cmUnpkTicks(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Ticks */ +#define cmUnpkTicks(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack Ticks */ #define cmUnpkQLen(x, mBuf) SUnpkS16(x, mBuf) /* unpack QLen */ #define cmUnpkOrder(x, mBuf) SUnpkS16(x, mBuf) /* unpack Order */ -#define cmUnpkData(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Data */ -#define cmUnpkRandom(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Random */ +#define cmUnpkData(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Data */ +#define cmUnpkRandom(x, mBuf) oduUnpackUInt16(x, mBuf) /* unpack Random */ #define cmUnpkSeq(x, mBuf) SUnpkS16(x, mBuf) /* unpack Seq */ #define cmUnpkReason(x, mBuf) SUnpkS16(x, mBuf) /* unpack Reason */ -#define cmUnpkProcId(x, mBuf) oduPackUInt16(x, mBuf) /* unpack ProcId */ +#define cmUnpkProcId(x, mBuf) oduUnpackUInt16(x, mBuf) /* unpack ProcId */ #define cmUnpkVectNmb(x, mBuf) SUnpkS16(x, mBuf) /* unpack VectNmb */ -#define cmUnpkPrior(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Prior */ +#define cmUnpkPrior(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Prior */ #define cmUnpkPriority(x, mBuf) cmUnpkPrior(x, mBuf) /* unpack Priority */ -#define cmUnpkRoute(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Route */ +#define cmUnpkRoute(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Route */ #define cmUnpkTtype(x, mBuf) SUnpkS16(x, mBuf) /* unpack Ttype */ #define cmUnpkSema(x, mBuf) SUnpkS8(x, mBuf) /* unpack Sema */ #define cmUnpkTxt(x, mBuf) SUnpkS8(x, mBuf) /* unpack Txt */ -#define cmUnpkEnt(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ent */ -#define cmUnpkInst(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Inst */ +#define cmUnpkEnt(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Ent */ +#define cmUnpkInst(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Inst */ #define cmUnpkElmnt(x, mBuf) SUnpkS16(x, mBuf) /* unpack Elmnt */ #define cmUnpkElmntInst1(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst1 */ #define cmUnpkElmntInst2(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst2 */ #define cmUnpkElmntInst3(x, mBuf) SUnpkS16(x, mBuf) /* unpack ElmntInst3 */ -#define cmUnpkRegion(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Region */ -#define cmUnpkPool(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Pool */ +#define cmUnpkRegion(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Region */ +#define cmUnpkPool(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Pool */ #ifdef LONG_MSG #define cmUnpkMsgLen(x, mBuf) SUnpkS32(x, mBuf) /* unpack MsgLen */ #else #define cmUnpkMsgLen(x, mBuf) SUnpkS16(x, mBuf) /* unpack MsgLen */ #endif #ifdef DOS -#define cmUnpkSize(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Size */ +#define cmUnpkSize(x, mBuf) oduUnpackUInt16(x, mBuf) /* unpack Size */ #else -#define cmUnpkSize(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Size */ +#define cmUnpkSize(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack Size */ #endif /* DOS */ /* general typedefs */ -#define cmUnpkSelector(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Selector */ -#define cmUnpkEvent(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Event */ +#define cmUnpkSelector(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Selector */ +#define cmUnpkEvent(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Event */ #define cmUnpkCntr(x, mBuf) SUnpkS32(x, mBuf) /* unpack Cntr */ -#define cmUnpkStsCntr(x, mBuf) oduPackUInt32(x, mBuf) /* unpack StsCntr */ +#define cmUnpkStsCntr(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack StsCntr */ #define cmUnpkLnkNmb(x, mBuf) SUnpkS16(x, mBuf) /* unpack LnkNmb */ #define cmUnpkSuId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SuId */ #define cmUnpkSpId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SpId */ #define cmUnpkSuInstId(x, mBuf) SUnpkS16(x, mBuf) /* unpack SuInstId */ #define cmUnpkSpInstInd(x, mBuf) SUnpkS16(x, mBuf) /* unpack SpInstInd */ -#define cmUnpkSapi(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Sapi */ -#define cmUnpkTei(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Tei */ -#define cmUnpkCes(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ces */ -#define cmUnpkDlci(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Dlci */ -#define cmUnpkCalRef(x, mBuf) oduPackUInt16(x, mBuf) /* unpack CalRef */ +#define cmUnpkSapi(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Sapi */ +#define cmUnpkTei(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Tei */ +#define cmUnpkCes(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Ces */ +#define cmUnpkDlci(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack Dlci */ +#define cmUnpkCalRef(x, mBuf) oduUnpackUInt16(x, mBuf) /* unpack CalRef */ #define cmUnpkOrigin(x, mBuf) SUnpkS16(x, mBuf) /* unpack Origin */ #define cmUnpkSwtch(x, mBuf) SUnpkS16(x, mBuf) /* unpack Swtch */ -#define cmUnpkCause(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Cause */ -#define cmUnpkDgn(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Dgn */ +#define cmUnpkCause(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Cause */ +#define cmUnpkDgn(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Dgn */ #define cmUnpkAction(x, mBuf) SUnpkS16(x, mBuf) /* unpack Action */ #define cmUnpkSeqS16(x, mBuf) SUnpkS16(x, mBuf) /* unpack SeqS16 */ -#define cmUnpkSeqUInt16(x, mBuf) oduPackUInt16(x, mBuf) /* unpack SeqUInt16 */ +#define cmUnpkSeqUInt16(x, mBuf) oduUnpackUInt16(x, mBuf) /* unpack SeqUInt16 */ #define cmUnpkSeqS24(x, mBuf) SUnpkS32(x, mBuf) /* unpack SeqS24 */ -#define cmUnpkSeqUInt24(x, mBuf) oduPackUInt32(x, mBuf) /* unpack SeqUInt24 */ -#define cmUnpkSetUpArb(x, mBuf) oduPackUInt8(x, mBuf) /* unpack SetUpArb */ -#define cmUnpkEvntType(x, mBuf) oduPackUInt8(x, mBuf) /* unpack EvntType */ -#define cmUnpkState(x, mBuf) oduPackUInt8(x, mBuf) /* unpack State */ -#define cmUnpkMode(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Mode */ +#define cmUnpkSeqUInt24(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack SeqUInt24 */ +#define cmUnpkSetUpArb(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack SetUpArb */ +#define cmUnpkEvntType(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack EvntType */ +#define cmUnpkState(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack State */ +#define cmUnpkMode(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Mode */ #define cmUnpkConnId(x, mBuf) SUnpkS32(x, mBuf) /* unpack ConnId */ /* scc specific typedefs */ @@ -229,34 +229,34 @@ /* tcp/ip specific typedefs */ -#define cmUnpkIpAddr(x, mBuf) oduPackUInt32(x, mBuf) /* unpack IpAddr */ -#define cmUnpkPort(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Port */ -#define cmUnpkCmd(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Cmd */ -#define cmUnpkFlags(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Flags */ -#define cmUnpkTtl(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ttl */ -#define cmUnpkPrec(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Prec */ -#define cmUnpkWindow(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Window */ +#define cmUnpkIpAddr(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack IpAddr */ +#define cmUnpkPort(x, mBuf) oduUnpackUInt16(x, mBuf) /* unpack Port */ +#define cmUnpkCmd(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Cmd */ +#define cmUnpkFlags(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Flags */ +#define cmUnpkTtl(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Ttl */ +#define cmUnpkPrec(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack Prec */ +#define cmUnpkWindow(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack Window */ /* ISUP specific typedefs */ -#define cmUnpkCirId(x, mBuf) oduPackUInt16(x, mBuf) /* unpack CirId */ -#define cmUnpkCic(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Cic */ -#define cmUnpkSiInstId(x, mBuf) oduPackUInt32(x, mBuf) /* unpack SiInstId */ +#define cmUnpkCirId(x, mBuf) oduUnpackUInt16(x, mBuf) /* unpack CirId */ +#define cmUnpkCic(x, mBuf) oduUnpackUInt16(x, mBuf) /* unpack Cic */ +#define cmUnpkSiInstId(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack SiInstId */ /* TUP specific typedefs */ -#define cmUnpkTpInstId(x, mBuf) oduPackUInt32(x, mBuf) /* unpack TpInstId */ +#define cmUnpkTpInstId(x, mBuf) oduUnpackUInt32(x, mBuf) /* unpack TpInstId */ /* PNNI specific typedefs */ -#define cmUnpkPnPortId(x, mBuf) oduPackUInt32(x, mBuf) +#define cmUnpkPnPortId(x, mBuf) oduUnpackUInt32(x, mBuf) #define cmCmpPnNodeId(nodeId1, nodeId2) \ cmCmpStr(&(nodeId1)->id[0], PN_NODEID_LEN, \ &(nodeId2)->id[0], PN_NODEID_LEN) /* PLOA - HCC profileId */ -#define cmPkProfileId(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack ProfileId */ +#define cmPkProfileId(x, mBuf) oduPackUInt8(x, mBuf) /* pack ProfileId */ -#define cmUnpkProfileId(x, mBuf) oduPackUInt8(x, mBuf) /* unpack ProfileId */ +#define cmUnpkProfileId(x, mBuf) oduUnpackUInt8(x, mBuf) /* unpack ProfileId */ /* packing and unpacking for token strings */ @@ -269,15 +269,15 @@ /* 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); \ } #define CMUNPKTKNSTR(tknStr, mBuf) \ @@ -285,17 +285,17 @@ Cntr i; \ \ /* 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 = 1; i <= (S16) tknStr->len; i++) \ { \ - CMCHKUNPK(oduPackUInt8, &tknStr->val[tknStr->len - i], mBuf); \ + CMCHKUNPK(oduUnpackUInt8, &tknStr->val[tknStr->len - i], mBuf); \ } \ } \ \