U8, U16, U32 data type changes
[o-du/l2.git] / src / cm / gen.x
index 28e23bb..8681788 100755 (executable)
@@ -45,9 +45,9 @@ extern "C" {
 
 typedef S8 Txt;                   /* text */
 
-typedef U8 Ent;                   /* entity */
+typedef uint8_t Ent;                   /* entity */
 
-typedef U8 Inst;                  /* instance */
+typedef uint8_t Inst;                  /* instance */
 
 typedef struct entityId           /* entity id */
 {
@@ -73,34 +73,34 @@ typedef struct elmntId            /* element id */
    ElmntInst3 elmntInst3;         /* element instance 3 */
 } ElmntId;
 
-typedef U8 Region;                /* region */
+typedef uint8_t Region;                /* region */
 
-typedef U8 Pool;                  /* pool */
+typedef uint8_t Pool;                  /* pool */
 
-typedef U8 Prior;                 /* priority */
+typedef uint8_t Prior;                 /* priority */
 
 typedef Prior Priority;           /* priority */
 
-typedef U8 Route;                 /* route */
+typedef uint8_t Route;                 /* route */
 
-typedef U8 Data;                  /* data */
+typedef uint8_t Data;                  /* data */
 
-typedef U8 Selector;              /* selector */
+typedef uint8_t Selector;              /* selector */
 
 typedef S16 Reason;               /* reason */
 
-typedef U16 ProcId;               /* processor id */
+typedef uint16_t ProcId;               /* processor id */
 
-typedef U8 Event;                 /* event */
+typedef uint8_t Event;                 /* event */
 
-typedef U32 TranId;               /* transaction Id */
+typedef uint32_t TranId;               /* transaction Id */
 
 typedef S16 IntNum;               /* Interface Number */
 
-typedef U16 TranNum;              /* Transaction Number */
+typedef uint16_t TranNum;              /* Transaction Number */
 
-typedef U16     CmIntfId;         /* Interface identifier       */
-typedef U16     CmIntfVer;        /* Interface version          */
+typedef uint16_t     CmIntfId;         /* Interface identifier       */
+typedef uint16_t     CmIntfVer;        /* Interface version          */
 
 #ifdef TDS_ROLL_UPGRADE_SUPPORT
 typedef struct  cmIntf            /* Attributes of an interface */
@@ -113,22 +113,22 @@ typedef struct  cmIntf            /* Attributes of an interface */
 /* post structure *** ALIGNED & ORDERED *** */
 typedef struct pst                /* parameters for SPstTsk */
 {
-   ProcId dstProcId;              /* destination processor id (U16) */
-   ProcId srcProcId;              /* source processor id      (U16) */
+   ProcId dstProcId;              /* destination processor id (uint16_t) */
+   ProcId srcProcId;              /* source processor id      (uint16_t) */
 
-   Ent dstEnt;                    /* destination entity       (U8)  */
-   Inst dstInst;                  /* destination instance     (U8)  */
-   Ent srcEnt;                    /* source entity            (U8)  */
-   Inst srcInst;                  /* source instance          (U8)  */
+   Ent dstEnt;                    /* destination entity       (uint8_t)  */
+   Inst dstInst;                  /* destination instance     (uint8_t)  */
+   Ent srcEnt;                    /* source entity            (uint8_t)  */
+   Inst srcInst;                  /* source instance          (uint8_t)  */
 
-   Prior prior;                   /* priority                 (U8)  */   
-   Route route;                   /* route                    (U8)  */
-   Event event;                   /* event                    (U8)  */
-   Region region;                 /* region                   (U8)  */
+   Prior prior;                   /* priority                 (uint8_t)  */   
+   Route route;                   /* route                    (uint8_t)  */
+   Event event;                   /* event                    (uint8_t)  */
+   Region region;                 /* region                   (uint8_t)  */
 
-   Pool pool;                     /* pool                     (U8)  */
-   Selector selector;             /* selector                 (U8)  */
-   CmIntfVer intfVer;             /* interface version        (U16) */
+   Pool pool;                     /* pool                     (uint8_t)  */
+   Selector selector;             /* selector                 (uint8_t)  */
+   CmIntfVer intfVer;             /* interface version        (uint16_t) */
 } Pst;
 
 /* systemId structure */
@@ -148,20 +148,20 @@ typedef struct systemId           /* system id */
  */
 typedef struct protAddr
 {
-   U16      protType;                  /* Protocol Type */
-   U8       len;                       /* Protocol Address Length in bytes */
-   U8       preLen;                    /* prefix length in bits */
-   U8       address[MAX_PROTADDR_LEN]; /* Protocol Address */ 
+   uint16_t      protType;                  /* Protocol Type */
+   uint8_t       len;                       /* Protocol Address Length in bytes */
+   uint8_t       preLen;                    /* prefix length in bits */
+   uint8_t       address[MAX_PROTADDR_LEN]; /* Protocol Address */ 
 #ifdef CM_ARI2
    Bool     autoSysIdPres;         /* Is Autonomous System Id Present */
-   U32      autoSysId;                 /* Autonomous System Id */
+   uint32_t      autoSysId;                 /* Autonomous System Id */
 #endif /* CM_ARI2 */
 
 }ProtAddr;
 
 typedef struct protAddrTbl
 {
-   U8         count;                 /* Number of addresses */
+   uint8_t         count;                 /* Number of addresses */
    ProtAddr   addr[MAX_PROT_ADDRS];  /* Protocol Address List */
 }ProtAddrTbl;
 
@@ -169,20 +169,20 @@ typedef struct protAddrTbl
 
 typedef struct addrs              /* address */
 {
-   U8 length;                     /* length (bytes or nibbles) */
-   U8 strg[ADRLEN];               /* address */
+   uint8_t length;                     /* length (bytes or nibbles) */
+   uint8_t strg[ADRLEN];               /* address */
 } Addrs;
 
 typedef struct shrtAddr           /* short address */
 {
-   U8 length;                     /* length bytes */
-   U8 strg[SHRTADRLEN];           /* address */
+   uint8_t length;                     /* length bytes */
+   uint8_t strg[SHRTADRLEN];           /* address */
 } ShrtAddrs;
 
 typedef struct lngAddr            /* long address */
 {
-   U8 length;                     /* length bytes */
-   U8 strg[LNGADRLEN];            /* address */
+   uint8_t length;                     /* length bytes */
+   uint8_t strg[LNGADRLEN];            /* address */
 } LngAddrs;
 
 /* bndCfg structure */
@@ -190,9 +190,9 @@ typedef struct lngAddr            /* long address */
 typedef struct bndCfg             /* bind configuration */
 {
    Txt *usrId;                    /* user id */
-   U8 bufOwnshp;                  /* buffer ownership */
-   U8 flcTyp;                     /* flow control type */
-   U8 wdw;                        /* window */
+   uint8_t bufOwnshp;                  /* buffer ownership */
+   uint8_t flcTyp;                     /* flow control type */
+   uint8_t wdw;                        /* window */
    Ent ent;                       /* entity */
    Inst inst;                     /* instance */
    Region region;                 /* region */
@@ -207,9 +207,9 @@ typedef struct bndCfg             /* bind configuration */
 /* Circular Buffer Structure */
 #ifdef CBUF_ENABLE
 typedef struct cb {
-   U32 cBufIdx;
-   U32 cBufSize;
-   U8 *cBufPtr;
+   uint32_t cBufIdx;
+   uint32_t cBufSize;
+   uint8_t *cBufPtr;
    S8 tmpBuf[CBUFPRNTSZE];
 }cBuffer;
 #endif /* CBUF_ENABLE */
@@ -231,13 +231,13 @@ typedef struct tskInit            /* task initialization */
    Bool usta;                     /* unsolicited status */
    Bool trc;                      /* trace */
 #ifdef DEBUGP
-   U32 dbgMask;                   /* debug mask */
+   uint32_t dbgMask;                   /* debug mask */
    Txt prntBuf[255];          /* print buffer */
 #endif
    Txt *prntCirBuf; /* print buffer for each system task */
 #ifdef SS_DIAG
    /* gen_x_001.main_96 :Added logmask */
-   U32 logMask;                   /* Logging mask */
+   uint32_t logMask;                   /* Logging mask */
 #endif
    BndCfg lmBnd;                  /* layer management bind */
    ProcId procId;                 /* processor id */
@@ -258,7 +258,7 @@ typedef struct tskInit            /* task initialization */
 \f
 typedef S32 Cntr;                 /* counter */
  
-typedef U32 StsCntr;              /* Statistics counter */
+typedef uint32_t StsCntr;              /* Statistics counter */
 
 typedef S16 LnkNmb;               /* link number */
 
@@ -272,100 +272,100 @@ typedef S16 SuInstId;             /* service user instance id */
 
 typedef S16 SpInstId;             /* service provider instance id */
 
-typedef U16 PortId;               /* port id */
+typedef uint16_t PortId;               /* port id */
 
-typedef U8 Sapi;                  /* service access point id */
+typedef uint8_t Sapi;                  /* service access point id */
  
-typedef U8 Tei;                   /* terminal endpoint id */
+typedef uint8_t Tei;                   /* terminal endpoint id */
 
-typedef U8 Ces;                   /* connection endpoint suffix */
+typedef uint8_t Ces;                   /* connection endpoint suffix */
 
-typedef U32 Dlci;                 /* data link control identifier */ 
+typedef uint32_t Dlci;                 /* data link control identifier */ 
 
-typedef U16 CalRef;               /* call Reference */
+typedef uint16_t CalRef;               /* call Reference */
 
 typedef S16 Origin;               /* origin */
 
-typedef U16 NwId;                 /* Network Identifier */
+typedef uint16_t NwId;                 /* Network Identifier */
 
 typedef S16 Swtch;                /* switch */
 
-typedef U8 Cause;                 /* cause code */
+typedef uint8_t Cause;                 /* cause code */
 
-typedef U8 Dgn;                   /* diagnostic code */
+typedef uint8_t Dgn;                   /* diagnostic code */
 
 typedef S16 Action;               /* action */
 
 typedef S16 SeqS16;               /* signed 16 bit sequence number */
  
-typedef U16 SeqU16;               /* unsigned 16 bit sequence number */
+typedef uint16_t SeqUInt16;               /* unsigned 16 bit sequence number */
  
 typedef S32 SeqS24;               /* signed 24 bit sequence number */
  
-typedef U32 SeqU24;               /* unsigned 24 bit sequence number */
+typedef uint32_t SeqUInt24;               /* unsigned 24 bit sequence number */
  
-typedef U8 SetUpArb;              /* set up arbitration (PASSIVE/ACTIVE) */
+typedef uint8_t SetUpArb;              /* set up arbitration (PASSIVE/ACTIVE) */
  
-typedef U8 EvntType;              /* event type */
+typedef uint8_t EvntType;              /* event type */
 
-typedef U8 State;                 /* state */
+typedef uint8_t State;                 /* state */
 
-typedef U8 Mode;                  /* mode */
+typedef uint8_t Mode;                  /* mode */
 
 typedef S32 ConnId;               /* connection id */
 
-typedef U32 UConnId;              /* unsigned connection id */
+typedef uint32_t UConnId;              /* unsigned connection id */
 
-typedef U16 ProtId;               /* protocol id */
+typedef uint16_t ProtId;               /* protocol id */
 
-typedef U16 ChannelId;            /* channel id */
+typedef uint16_t ChannelId;            /* channel id */
 
-typedef U8  Arr64U8[64];            /* Array of 64 of type U8*/
+typedef uint8_t  Arr64UInt8[64];            /* Array of 64 of type uint8_t*/
 
-typedef U16 Efa;                  /* Envelope Address Function */
+typedef uint16_t Efa;                  /* Envelope Address Function */
 
-typedef U32 BitState;             /* Sa Bit ID and Value */
+typedef uint32_t BitState;             /* Sa Bit ID and Value */
 
-typedef U8  CChanId;               /* V5UA Channel ID */
+typedef uint8_t  CChanId;               /* V5UA Channel ID */
 
-typedef U16 MibOpCode;            /* Op code for Mib Request MIB_REQUEST_GET,
+typedef uint16_t MibOpCode;            /* Op code for Mib Request MIB_REQUEST_GET,
                                      MIB_REQUEST_GET_FIRST, MIB_REQUEST */
 
-typedef U16 MibStatus;            /* Status returned in Mib Cfm */
+typedef uint16_t MibStatus;            /* Status returned in Mib Cfm */
 
-typedef U16 MibTblType;           /* table type */
+typedef uint16_t MibTblType;           /* table type */
 
 typedef S32 MibReqId;             /* request identifier */
 
-typedef U8  UstaType;             /* unsolicited status type */
+typedef uint8_t  UstaType;             /* unsolicited status type */
 typedef S8  ChannelNo;            /* Channel Number */
 
 /* ATM typedefs */
 
 #ifndef CMFILE_REORG_1
 
-typedef U16 AtmVpci;              /* ATM virtual path connection id */
-typedef U16 AtmVpi;               /* ATM virtual path id */
+typedef uint16_t AtmVpci;              /* ATM virtual path connection id */
+typedef uint16_t AtmVpi;               /* ATM virtual path id */
 
 
-typedef U16 AtmVci;               /* ATM virtual channel id */
+typedef uint16_t AtmVci;               /* ATM virtual channel id */
 
-typedef U8 AtmLp;                 /* ATM loss priority */
+typedef uint8_t AtmLp;                 /* ATM loss priority */
 
-typedef U8 AtmCi;                 /* ATM congestion indication */
+typedef uint8_t AtmCi;                 /* ATM congestion indication */
 
-typedef U8 AtmRs;                 /* ATM reception status */
+typedef uint8_t AtmRs;                 /* ATM reception status */
 
-typedef U8 AtmUu;                 /* ATM user-to-user field in CPCS PDUs */
+typedef uint8_t AtmUu;                 /* ATM user-to-user field in CPCS PDUs */
 
-typedef U32 AtmUui;               /* ATM user-to-user indication field in SSCOP PDUs */
+typedef uint32_t AtmUui;               /* ATM user-to-user indication field in SSCOP PDUs */
 
-typedef U8 AtmPt;                 /* ATM cell payload type */
+typedef uint8_t AtmPt;                 /* ATM cell payload type */
 
 typedef struct atmQos             /* ATM quality of service */
 {
-   U8 qosFwd;                     /* qos in forward  direction */
-   U8 qosBwd;                     /* qos in backward direction */
+   uint8_t qosFwd;                     /* qos in forward  direction */
+   uint8_t qosBwd;                     /* qos in backward direction */
 } AtmQos;
 
 /* Vitual channel structure */
@@ -386,39 +386,39 @@ typedef struct atmVccId         /* VCC id */
 /* VCC table */
 typedef struct atmVccTbl                  /* VCC table */
 {
-   U16        count;                      /* number of VCCs */
+   uint16_t        count;                      /* number of VCCs */
    AtmVccId   tbl[MAX_ATMVCCTBL_SZ];      /* VCC list */
 } AtmVccTbl;
 
 /* Generic ATM address */
 typedef struct atmAddr
 {
-   U8    type;                  /* type of Address (AESA or E.164) */
-   U8    len;                   /* length (bytes) */
-   U8    strg[ADRLEN];          /* address string */
+   uint8_t    type;                  /* type of Address (AESA or E.164) */
+   uint8_t    len;                   /* length (bytes) */
+   uint8_t    strg[ADRLEN];          /* address string */
 } AtmAddr;
 
 /* ATM address table */
 typedef struct atmAddrTbl            /* ATM address table */
 {
-   U16      count;                   /* number of ATM addresses */
+   uint16_t      count;                   /* number of ATM addresses */
    AtmAddr  tbl[MAX_ATMADDRTBL_SZ];  /* ATM address list */
 } AtmAddrTbl;
 
 typedef struct atmTfcDesc         /* ATM traffic descriptor */
 {
-   U32  fwdPeakCellRate0;         /* forward  peak  cell rate, CLP = 0   */
-   U32  bwdPeakCellRate0;         /* backward peak  cell rate, CLP = 0   */
-   U32  fwdPeakCellRate1;         /* forward  peak  cell rate, CLP = 0+1 */
-   U32  bwdPeakCellRate1;         /* backward peak  cell rate, CLP = 0+1 */
-   U32  fwdSustCellRate0;         /* forward  sust. cell rate, CLP = 0   */
-   U32  bwdSustCellRate0;         /* backward sust. cell rate, CLP = 0   */
-   U32  fwdSustCellRate1;         /* forward  sust. cell rate, CLP = 0+1 */
-   U32  bwdSustCellRate1;         /* backward sust. cell rate, CLP = 0+1 */
-   U32  fwdMeanBurstSize0;        /* forward  mean burst size, CLP = 0   */
-   U32  bwdMeanBurstSize0;        /* backward mean burst size, CLP = 0   */
-   U32  fwdMeanBurstSize1;        /* forward  mean burst size, CLP = 0+1 */
-   U32  bwdMeanBurstSize1;        /* backward mean burst size, CLP = 0+1 */
+   uint32_t  fwdPeakCellRate0;         /* forward  peak  cell rate, CLP = 0   */
+   uint32_t  bwdPeakCellRate0;         /* backward peak  cell rate, CLP = 0   */
+   uint32_t  fwdPeakCellRate1;         /* forward  peak  cell rate, CLP = 0+1 */
+   uint32_t  bwdPeakCellRate1;         /* backward peak  cell rate, CLP = 0+1 */
+   uint32_t  fwdSustCellRate0;         /* forward  sust. cell rate, CLP = 0   */
+   uint32_t  bwdSustCellRate0;         /* backward sust. cell rate, CLP = 0   */
+   uint32_t  fwdSustCellRate1;         /* forward  sust. cell rate, CLP = 0+1 */
+   uint32_t  bwdSustCellRate1;         /* backward sust. cell rate, CLP = 0+1 */
+   uint32_t  fwdMeanBurstSize0;        /* forward  mean burst size, CLP = 0   */
+   uint32_t  bwdMeanBurstSize0;        /* backward mean burst size, CLP = 0   */
+   uint32_t  fwdMeanBurstSize1;        /* forward  mean burst size, CLP = 0+1 */
+   uint32_t  bwdMeanBurstSize1;        /* backward mean burst size, CLP = 0+1 */
    Bool bstEffortReq;             /* best effort requested */
    Bool fwdTagReq;                /* tagging requested in forward  direction */
    Bool bwdTagReq;                /* tagging requested in backward direction */
@@ -443,45 +443,45 @@ typedef S16 StopBits;             /* stop bits */
 
 /* tcp/ip typedefs */
 
-typedef U32 IpAddr;               /* IP address */
+typedef uint32_t IpAddr;               /* IP address */
 
-typedef U16 Port;                 /* TCP/UDP port */
+typedef uint16_t Port;                 /* TCP/UDP port */
 
-typedef U8 Cmd;                   /* command */
+typedef uint8_t Cmd;                   /* command */
 
-typedef U8 Flags;                 /* TCP/UDP flags */
+typedef uint8_t Flags;                 /* TCP/UDP flags */
 
-typedef U8 Ttl;                   /* time to live */
+typedef uint8_t Ttl;                   /* time to live */
 
-typedef U8 Prec;                  /* TCP/UDP precedence */
+typedef uint8_t Prec;                  /* TCP/UDP precedence */
 
-typedef U32 Window;               /* TCP/UDP window */
+typedef uint32_t Window;               /* TCP/UDP window */
 
-typedef U8 MtpStatus;             /* MTP status */
+typedef uint8_t MtpStatus;             /* MTP status */
 
-typedef U8 Credit;                /* credit */
+typedef uint8_t Credit;                /* credit */
 
 /* ISUP typedefs */
 
-typedef U32 CirId;                /* circuit Id */
+typedef uint32_t CirId;                /* circuit Id */
 
-typedef U16 Cic;                  /* cic */
+typedef uint16_t Cic;                  /* cic */
 
-typedef U32 SiInstId;             /* instance id */
+typedef uint32_t SiInstId;             /* instance id */
 
 /* B-ISUP typedefs */
 
-typedef U32 BiInstId;             /* instance id */
+typedef uint32_t BiInstId;             /* instance id */
 
 /* TUP typedefs */
 
-typedef U32 TpInstId;             /* instance id */
+typedef uint32_t TpInstId;             /* instance id */
 
 /* LLC/SNAP definitions */
 
-typedef U32 Oui;                 /* 3-octet OUI in SNAP header */
-typedef U16 Pid;                 /* 2-octet protocol id in SNAP header */
-typedef U32 LlcId;               /* LLC id */
+typedef uint32_t Oui;                 /* 3-octet OUI in SNAP header */
+typedef uint16_t Pid;                 /* 2-octet protocol id in SNAP header */
+typedef uint32_t LlcId;               /* LLC id */
 
 
 #ifndef CMFILE_REORG_1
@@ -489,16 +489,16 @@ typedef U32 LlcId;               /* LLC id */
 /* q.93b typedefs */
  
 typedef S32 AmInstId;             /* service user/provider instance id */
-typedef U16 AmEndptRefType;       /* endpoint reference */
-typedef U32 AmSeqNmb;             /* sequence number */
+typedef uint16_t AmEndptRefType;       /* endpoint reference */
+typedef uint32_t AmSeqNmb;             /* sequence number */
  
 /* q.saal typedefs */
  
-typedef U16 AsErrorCode;          /* q.saal error code (Q.SAAL1 Appendix 1) */
+typedef uint16_t AsErrorCode;          /* q.saal error code (Q.SAAL1 Appendix 1) */
 
 /* ume typedefs */
 
-typedef U32 UmInteger;            /* ume integer */
+typedef uint32_t UmInteger;            /* ume integer */
  
 typedef struct umObjId            /* ume object identifier */
 {
@@ -515,51 +515,51 @@ typedef struct umMib UmMib;       /* ume mib */
 
 /* general typedefs */
 
-typedef U16 LecId;               /* LEC Id */
-typedef U8  Protocol;            /* protocol */
-typedef U8  Version;             /* version */
-typedef U16 OpCode;              /* op code in control frames */
-typedef U16 LaneStatus;          /* status in control frames */
-typedef U32 TransId;             /* transaction id */
-typedef U16 LaneFlags;           /* flags in control frames */
-typedef U8  LanType;             /* LAN type */
-typedef U8  MtuIdx;              /* max frame size - index */
-typedef U16 MtuVal;              /* max frame size - value */
-typedef U16 Tag;                 /* tag indicating LAN destination type */
-typedef U8  VccNature;           /* VCC nature - SVC, PVC, etc. */
-typedef U8  VccType;             /* VCC type - control, data, etc */
-typedef U8  ProfileId;           /* HCC profile id */
+typedef uint16_t LecId;               /* LEC Id */
+typedef uint8_t  Protocol;            /* protocol */
+typedef uint8_t  Version;             /* version */
+typedef uint16_t OpCode;              /* op code in control frames */
+typedef uint16_t LaneStatus;          /* status in control frames */
+typedef uint32_t TransId;             /* transaction id */
+typedef uint16_t LaneFlags;           /* flags in control frames */
+typedef uint8_t  LanType;             /* LAN type */
+typedef uint8_t  MtuIdx;              /* max frame size - index */
+typedef uint16_t MtuVal;              /* max frame size - value */
+typedef uint16_t Tag;                 /* tag indicating LAN destination type */
+typedef uint8_t  VccNature;           /* VCC nature - SVC, PVC, etc. */
+typedef uint8_t  VccType;             /* VCC type - control, data, etc */
+typedef uint8_t  ProfileId;           /* HCC profile id */
 
 
 typedef struct lanName          /* LAN name */
 {
-   U8 length;                   /* length of string */
-   U8 strg[MAX_LANNAME];        /* name string */
+   uint8_t length;                   /* length of string */
+   uint8_t strg[MAX_LANNAME];        /* name string */
 } LanName;
 
 /* LAN destination typedefs */
 
 typedef struct macAddr          /* MAC address */
 {
-   U8 strg[MACADDRLEN];         /* address string */
+   uint8_t strg[MACADDRLEN];         /* address string */
 } MacAddr;
 
 typedef struct macAddrTblEntry  /* entry in table of MAC addresses */
 {
-   U8 proxyClass;               /* proxy class - local, learned */
+   uint8_t proxyClass;               /* proxy class - local, learned */
    MacAddr macAddr;             /* MAC address */
 } MacAddrTblEntry;
 
 typedef struct macAddrTbl       /* table of MAC addresses */
 {
-   U8 count;                    /* number of entries */
+   uint8_t count;                    /* number of entries */
    MacAddrTblEntry tbl[MAX_MACADDRTBL]; /* table of MAC addresses */
 } MacAddrTbl;
 
 typedef struct rd               /* route designator */
 {
-   U16 lanId;                   /* LAN id, segment id - 12 bits */
-   U8  bridgeId;                /* bridge id - 4 bits */
+   uint16_t lanId;                   /* LAN id, segment id - 12 bits */
+   uint8_t  bridgeId;                /* bridge id - 4 bits */
 } Rd;
 
 typedef struct rdTblEntry       /* entry in table of route designators */
@@ -569,7 +569,7 @@ typedef struct rdTblEntry       /* entry in table of route designators */
 
 typedef struct rdTbl            /* table of route designators */
 {
-   U8 count;                    /* number of entries */
+   uint8_t count;                    /* number of entries */
    RdTblEntry tbl[MAX_RDTBL];/* table of route designator */
 } RdTbl;
 
@@ -602,15 +602,15 @@ typedef struct laneCtrlHdr      /* control frame header */
    Addrs      dstAtmAddr;       /* target ATM address */
    LanType    lanType;          /* LAN type */
    MtuIdx     mtuIdx;           /* MTU */
-   U8         nmbTLV;           /* number of TLV entries in list */
+   uint8_t         nmbTLV;           /* number of TLV entries in list */
    LanName    lanName;          /* LAN name */
 } LaneCtrlHdr;
 
 typedef struct laneTLVEnt       /* type-length-value entry */
 {
-   U32 type;                    /* type of value */
-   U8  length;                  /* length of value */
-   U8  value[MAX_TLV_LEN];      /* value */
+   uint32_t type;                    /* type of value */
+   uint8_t  length;                  /* length of value */
+   uint8_t  value[MAX_TLV_LEN];      /* value */
 } LaneTLVEnt;
 
 typedef struct laneCfg          /* configuration frame */
@@ -630,12 +630,12 @@ typedef struct laneCtrlFrame    /* all control frames */
 /* PNNI typedefs */
 
 /* pnni port id */
-typedef U32 PnPortId;
+typedef uint32_t PnPortId;
 
 /* pnni node Id */
 typedef struct pnNodeId
 {
-   U8 id[PN_NODEID_LEN];
+   uint8_t id[PN_NODEID_LEN];
 } PnNodeId;
 
 #endif /* CMFILE_REORG_1 */
@@ -647,239 +647,239 @@ typedef struct pnNodeId
 typedef struct octStrg            /* octet string */
 {
    S32 length;                    /* length */
-   U8 val[MF_SIZE_TKNSTR];        /* value */
+   uint8_t val[MF_SIZE_TKNSTR];        /* value */
 } OctStrg;
 
 typedef struct tknHdr             /* token header */
 {
-   U8   pres;                     /* present */
-   U8   spare1;                   /* for 16 bit alignment */
-   U16  spare2;                   /* for 32 bit alignment */
+   uint8_t   pres;                     /* present */
+   uint8_t   spare1;                   /* for 16 bit alignment */
+   uint16_t  spare2;                   /* for 32 bit alignment */
 #ifdef ALIGN_64BIT
-   U32  spare3;                   /* for 64 bit alignment */
+   uint32_t  spare3;                   /* for 64 bit alignment */
 #endif
 } TknHdr;
 
 typedef struct elmtHdr            /* element header */
 {
-   U8   pres;                     /* present */
-   U8   actnInd;                  /* action indicator */
-   U16  compInd;                  /* for alignment */
+   uint8_t   pres;                     /* present */
+   uint8_t   actnInd;                  /* action indicator */
+   uint16_t  compInd;                  /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare;                    /* for 64 bit alignment */
+   uint32_t  spare;                    /* for 64 bit alignment */
 #endif
 } ElmtHdr;
 
 /* token typedefs */
 
-typedef struct tknU8              /* token U8 */
+typedef struct tknUInt8              /* token uint8_t */
 {
-   U8   pres;                     /* present flag */
-   U8   val;                      /* value */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   val;                      /* value */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
-} TknU8;
+} TknUInt8;
 
 typedef struct tknS8              /* token S8 */
 {
-   U8   pres;                     /* present flag */
+   uint8_t   pres;                     /* present flag */
    S8   val;                      /* value */
-   U16  spare1;                   /* for alignment */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
 } TknS8;
 
-typedef struct tknU16             /* token U16 */
+typedef struct tknUInt16             /* token uint16_t */
 {
-   U8   pres;                     /* present flag */
-   U8   spare1;                   /* for alignment */
-   U16  val;                      /* value */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   spare1;                   /* for alignment */
+   uint16_t  val;                      /* value */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
-} TknU16;
+} TknUInt16;
 
-typedef struct tknU32             /* token U32 */
+typedef struct tknUInt32             /* token uint32_t */
 {
-   U8   pres;                     /* present flag */
-   U8   spare1;                   /* for alignment */
-   U16  spare2;                   /* for alignment */
-   U32  val;                      /* value */
-} TknU32;
+   uint8_t   pres;                     /* present flag */
+   uint8_t   spare1;                   /* for alignment */
+   uint16_t  spare2;                   /* for alignment */
+   uint32_t  val;                      /* value */
+} TknUInt32;
 
 typedef struct tknS32             /* token S32 */
 {
-   U8   pres;                     /* present flag */
-   U8   spare1;                   /* for alignment */
-   U16  spare2;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   spare1;                   /* for alignment */
+   uint16_t  spare2;                   /* for alignment */
    S32  val;                      /* value */
 } TknS32;
 
 typedef struct tknStrS            /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
-   U8   val[(MF_SIZE_TKNSTRS + 7) & 0xff8]; /* string value */
+   uint32_t  spare2;                   /* for 64 bit alignment */
+   uint8_t   val[(MF_SIZE_TKNSTRS + 7) & 0xff8]; /* string value */
 #else
-   U8   val[(MF_SIZE_TKNSTRS + 3) & 0xffc]; /* string value */
+   uint8_t   val[(MF_SIZE_TKNSTRS + 3) & 0xffc]; /* string value */
 #endif
 } TknStrS;
 
 typedef struct tknStrM            /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
-   U8   val[(MF_SIZE_TKNSTRM + 7) & 0xff8]; /* string value */
+   uint32_t  spare2;                   /* for 64 bit alignment */
+   uint8_t   val[(MF_SIZE_TKNSTRM + 7) & 0xff8]; /* string value */
 #else
-   U8   val[(MF_SIZE_TKNSTRM + 3) & 0xffc]; /* string value */
+   uint8_t   val[(MF_SIZE_TKNSTRM + 3) & 0xffc]; /* string value */
 #endif
 } TknStrM;
 
 typedef struct tknStr             /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
-   U8   val[(MF_SIZE_TKNSTR + 7) & 0xff8]; /* string value */
+   uint32_t  spare2;                   /* for 64 bit alignment */
+   uint8_t   val[(MF_SIZE_TKNSTR + 7) & 0xff8]; /* string value */
 #else
-   U8   val[(MF_SIZE_TKNSTR + 3) & 0xffc]; /* string value */
+   uint8_t   val[(MF_SIZE_TKNSTR + 3) & 0xffc]; /* string value */
 #endif
 } TknStr;
 
 typedef struct tknStrE            /* token string extended */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
-   U8   val[(MF_SIZE_TKNSTRE + 7) & 0xff8]; /* string value */
+   uint32_t  spare2;                   /* for 64 bit alignment */
+   uint8_t   val[(MF_SIZE_TKNSTRE + 7) & 0xff8]; /* string value */
 #else
-   U8   val[(MF_SIZE_TKNSTRE + 3) & 0xffc]; /* string value */
+   uint8_t   val[(MF_SIZE_TKNSTRE + 3) & 0xffc]; /* string value */
 #endif
 } TknStrE;
 
 typedef struct tknStrXL           /* token string extra long */
 {
-   U16  len;                      /* length */
-   U8   pres;                     /* present flag */
-   U8   spare1;                   /* for alignment */
+   uint16_t  len;                      /* length */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
-   U8   *val;                     /* string value (use allocated memory) */
+   uint8_t   *val;                     /* string value (use allocated memory) */
 } TknStrXL;
  
 typedef struct tknStr4            /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
-   U8   val[8];                   /* string value - 8 byte alligned */
+   uint32_t  spare2;                   /* for 64 bit alignment */
+   uint8_t   val[8];                   /* string value - 8 byte alligned */
 #else
-   U8   val[4];                   /* string value - 4 byte alligned */
+   uint8_t   val[4];                   /* string value - 4 byte alligned */
 #endif /* ALIGN_64BIT */
 } TknStr4;
 
 typedef struct tknStr12           /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
-   U8   val[16];                  /* string value - 8 byte alligned */
+   uint32_t  spare2;                   /* for 64 bit alignment */
+   uint8_t   val[16];                  /* string value - 8 byte alligned */
 #else
-   U8   val[12];                  /* string value - 4 byte alligned */
+   uint8_t   val[12];                  /* string value - 4 byte alligned */
 #endif /* ALIGN_64BIT */
 } TknStr12;
 
 typedef struct tknStr32           /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
-   U8   val[32];                  /* string value - 4 byte alligned */
+   uint8_t   val[32];                  /* string value - 4 byte alligned */
 } TknStr32;
 
 typedef struct tknStr64           /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
-   U8   val[64];                  /* string value - 4 byte alligned */
+   uint8_t   val[64];                  /* string value - 4 byte alligned */
 } TknStr64;
 
 typedef struct tknStr132          /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
-   U8   val[136];                 /* string value - 8 byte alligned */
+   uint32_t  spare2;                   /* for 64 bit alignment */
+   uint8_t   val[136];                 /* string value - 8 byte alligned */
 #else
-   U8   val[132];                 /* string value - 4 byte alligned */
+   uint8_t   val[132];                 /* string value - 4 byte alligned */
 #endif /* ALIGN_64BIT */
 } TknStr132;
 
 typedef struct tknStr256          /* token string */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
-   U8   val[256];                 /* string value - 4 byte alligned */
+   uint8_t   val[256];                 /* string value - 4 byte alligned */
 } TknStr256;
 
 typedef struct tknOid             /* Object Identifier */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* length */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* length */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
-   /* gen_x_001.main_81 : changed val from U32 to U16 with comilation flag
-    * TKNOID_U16 */
-#ifndef TKNOID_U16
-   U32  val[32];                  /* max 32 integers of less than 64k value */
+   /* gen_x_001.main_81 : changed val from uint32_t to uint16_t with comilation flag
+    * TKNOID_UINT16 */
+#ifndef TKNOID_UINT16
+   uint32_t  val[32];                  /* max 32 integers of less than 64k value */
 #else
-   U16  val[32];                  /* max 32 integers of less than 64k value */
+   uint16_t  val[32];                  /* max 32 integers of less than 64k value */
 #endif
 } TknOid;
 
 typedef struct tknBits            /* token bits */
 {
-   U8   pres;                     /* present flag */
-   U8   len;                      /* for alignment */
-   U16  spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   len;                      /* for alignment */
+   uint16_t  spare1;                   /* for alignment */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
-   U8   val[(MF_SIZE_TKNBITS + 7) & 0xff8]; /* string value */
+   uint32_t  spare2;                   /* for 64 bit alignment */
+   uint8_t   val[(MF_SIZE_TKNBITS + 7) & 0xff8]; /* string value */
 #else
-   U8   val[(MF_SIZE_TKNBITS + 3) & 0xffc]; /* string value */
+   uint8_t   val[(MF_SIZE_TKNBITS + 3) & 0xffc]; /* string value */
 #endif
 } TknBits;
 
@@ -892,8 +892,8 @@ typedef struct elmtStr            /* element string */
 typedef struct cdPtyNmb           /* called party number tokens */
 {
    ElmtHdr eh;                    /* element header */
-   TknU8 nmbPlanId;               /* numbering plan identification */
-   TknU8 typeNmb0;                /* type of number */
+   TknUInt8 nmbPlanId;               /* numbering plan identification */
+   TknUInt8 typeNmb0;                /* type of number */
 #ifdef CDPTYNMB_32DIGIT
    TknStrM nmbDigits;             /* number digits */
 #else
@@ -904,17 +904,17 @@ typedef struct cdPtyNmb           /* called party number tokens */
 typedef struct redirNmb           /* redirecting number tokens */
 {
    ElmtHdr eh;                    /* element header */
-   TknU8 nmbPlanId;               /* numbering plan identification */
-   TknU8 typeNmb;                 /* type of number */
-   TknU8 screenInd;               /* screening indicator */
-   TknU8 presInd;                 /* presentation indicator */
-   TknU8 rsnRedirect;             /* reason for redirection */
+   TknUInt8 nmbPlanId;               /* numbering plan identification */
+   TknUInt8 typeNmb;                 /* type of number */
+   TknUInt8 screenInd;               /* screening indicator */
+   TknUInt8 presInd;                 /* presentation indicator */
+   TknUInt8 rsnRedirect;             /* reason for redirection */
    TknStrS nmbDigits;             /* number digits */
 } RedirNmb;
 
 typedef struct srvClass           /* service class */          
 {                                                       
-   U8 type;                       /* type */                 
+   uint8_t type;                       /* type */                 
    union                                                
    {                                                    
       struct                      /* frame relay */                                
@@ -933,14 +933,14 @@ typedef struct srvClass           /* service class */
 
 typedef struct _ip           /* ip header */
 {
-   U8     ip_hl;            /* header length */
+   uint8_t     ip_hl;            /* header length */
    Prec   ip_tos;           /* type of service */
-   U16    ip_len;           /* total length */
-   U16    ip_id;            /* identification */
-   U16    ip_off;           /* fragment offset field */
+   uint16_t    ip_len;           /* total length */
+   uint16_t    ip_id;            /* identification */
+   uint16_t    ip_off;           /* fragment offset field */
    Ttl    ip_ttl;           /* time to live */
-   U8     ip_p;             /* protocol */
-   U16    ip_sum;           /* checksum */
+   uint8_t     ip_p;             /* protocol */
+   uint16_t    ip_sum;           /* checksum */
    IpAddr ip_src;           /* source address */
    IpAddr ip_dst;           /* dest address */
 } Ip;
@@ -955,328 +955,328 @@ typedef struct _ip           /* ip header */
 typedef struct amCdPtySad       /* Called Party Sub Address Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   oddEvenInd;          /* odd/even indicator */
-   TknU8   typeSad;             /* type of sub address */
+   TknUInt8   oddEvenInd;          /* odd/even indicator */
+   TknUInt8   typeSad;             /* type of sub address */
    TknStrS  sadInfo;            /* address/number information */
 } AmCdPtySad;
  
 typedef struct amBHiLyrInfo     /* Broadband High Layer Information Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   hiLyrInfoType;       /* high layer information type */
+   TknUInt8   hiLyrInfoType;       /* high layer information type */
    TknStrS  hiLyrInfo;          /* high layer information */
 } AmBHiLyrInfo;
  
 typedef struct amBBearCap       /* Broadband Bearer Capability Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   bearClass;           /* bearer class */
-   TknU8   timingReq;           /* timing requirement */
-   TknU8   tfcType;             /* traffic type */
-   TknU8   atmTfrCap;           /* ATM transfer capability */
-   TknU8   usrPlaneConCfg;      /* user plane connection configuration */
-   TknU8   suscClip;            /* susceptability to clipping */
+   TknUInt8   bearClass;           /* bearer class */
+   TknUInt8   timingReq;           /* timing requirement */
+   TknUInt8   tfcType;             /* traffic type */
+   TknUInt8   atmTfrCap;           /* ATM transfer capability */
+   TknUInt8   usrPlaneConCfg;      /* user plane connection configuration */
+   TknUInt8   suscClip;            /* susceptability to clipping */
 } AmBBearCap;
 
 typedef struct amQosParam       /* Quality of Service Parameter Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   qosClassFwd;         /* quality of service class forward */
-   TknU8   qosClassBwd;         /* quality of service class backward */
+   TknUInt8   qosClassFwd;         /* quality of service class forward */
+   TknUInt8   qosClassBwd;         /* quality of service class backward */
 } AmQosParam;
 
 typedef struct amEtoeDly        /* End To End Transit Delay Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   cumTransDlyId;       /* cumulative transit delay id */
-   TknU16  cumTransDly;         /* cumulative transit delay value */
-   TknU8   reqTransDlyId;       /* requested max end to end transit delay id */
-   TknU16  reqTransDly;         /* maximum end to end transit delay value */
-   TknU8   pnniAccFMCTDId;      /* PNNI acceptable forward max. CTD ID */
-   TknU32  pnniAccFMCTD;        /* PNNI acceptable forward max. CTD */
-   TknU8   pnniCumFMCTDId;      /* PNNI acceptable forward max. CTD ID */
-   TknU32  pnniCumFMCTD;        /* PNNI acceptable forward max. CTD */
-   TknU8   netGenInd;           /* network generated indicator */
+   TknUInt8   cumTransDlyId;       /* cumulative transit delay id */
+   TknUInt16  cumTransDly;         /* cumulative transit delay value */
+   TknUInt8   reqTransDlyId;       /* requested max end to end transit delay id */
+   TknUInt16  reqTransDly;         /* maximum end to end transit delay value */
+   TknUInt8   pnniAccFMCTDId;      /* PNNI acceptable forward max. CTD ID */
+   TknUInt32  pnniAccFMCTD;        /* PNNI acceptable forward max. CTD */
+   TknUInt8   pnniCumFMCTDId;      /* PNNI acceptable forward max. CTD ID */
+   TknUInt32  pnniCumFMCTD;        /* PNNI acceptable forward max. CTD */
+   TknUInt8   netGenInd;           /* network generated indicator */
 } AmEtoeDly;
 
 typedef struct amOamTfcDesc     /* OAM Traffic Descriptor Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   usrNetFaultMgmt;     /* user network fault management indicator */
-   TknU8   compInd;             /* compliance indicator */
-   TknU8   shapingInd;          /* shaping indicator */
-   TknU8   bwdEtoeOamF5FlInd;   /* backward e-to-e OAM F5 flow indicator */
-   TknU8   fwdEtoeOamF5FlInd;   /* forward e-to-e OAM F5 flow indicator */
+   TknUInt8   usrNetFaultMgmt;     /* user network fault management indicator */
+   TknUInt8   compInd;             /* compliance indicator */
+   TknUInt8   shapingInd;          /* shaping indicator */
+   TknUInt8   bwdEtoeOamF5FlInd;   /* backward e-to-e OAM F5 flow indicator */
+   TknUInt8   fwdEtoeOamF5FlInd;   /* forward e-to-e OAM F5 flow indicator */
 } AmOamTfcDesc;
 
 typedef struct amEndptRef       /* Endpoint Reference Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   endptRefType;        /* endpoint reference type */
-   TknU16  endptRefVal;         /* endpoint reference value */
+   TknUInt8   endptRefType;        /* endpoint reference type */
+   TknUInt16  endptRefVal;         /* endpoint reference value */
 } AmEndptRef;
 
 typedef struct amAalParam       /* AAL Parameters Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   aalType;             /* AAL type */
+   TknUInt8   aalType;             /* AAL type */
 
    /* Token definition for AAL-1 */
-   TknU8   subTypeId;           /* Subtype Identifier */
-   TknU8   subType;             /* Subtype */
-   TknU8   cbrRateId;           /* CBR Rate Identifier */
-   TknU8   cbrRate;             /* CBR Rate */
-   TknU8   multId;              /* Multiplier Identifier */
-   TknU16  multVal;             /* Multiplier value */
-   TknU8   srcClkFreqMetId;     /* Source clock Frequency method identifier */
-   TknU8   srcClkFreqMet;       /* Source Clock frequency method */
-   TknU8   errCrMetId;          /* Error correction method identifier */
-   TknU8   errCrMet;            /* Error correction method */
-   TknU8   strDatTxBlkszId;     /* Structured data transfer blocksize Id. */
-   TknU8   strDatTxBlksz0;      /* Structured data transfer blocksize - oct 1*/
+   TknUInt8   subTypeId;           /* Subtype Identifier */
+   TknUInt8   subType;             /* Subtype */
+   TknUInt8   cbrRateId;           /* CBR Rate Identifier */
+   TknUInt8   cbrRate;             /* CBR Rate */
+   TknUInt8   multId;              /* Multiplier Identifier */
+   TknUInt16  multVal;             /* Multiplier value */
+   TknUInt8   srcClkFreqMetId;     /* Source clock Frequency method identifier */
+   TknUInt8   srcClkFreqMet;       /* Source Clock frequency method */
+   TknUInt8   errCrMetId;          /* Error correction method identifier */
+   TknUInt8   errCrMet;            /* Error correction method */
+   TknUInt8   strDatTxBlkszId;     /* Structured data transfer blocksize Id. */
+   TknUInt8   strDatTxBlksz0;      /* Structured data transfer blocksize - oct 1*/
 
    /* Token definition for AAL-1, except in UNI 3.0 */
-   TknU8   strDatTxBlksz1;      /* Structured data transfer blocksize - oct 2*/
+   TknUInt8   strDatTxBlksz1;      /* Structured data transfer blocksize - oct 2*/
 
    /* Token definition for AAL-1 */
-   TknU8   prtFillCellId;       /* Partially filled cells Identifier */
-   TknU8   prtFillCellMet;      /* Partially filled cells method */
+   TknUInt8   prtFillCellId;       /* Partially filled cells Identifier */
+   TknUInt8   prtFillCellMet;      /* Partially filled cells method */
 
    /* Token definition for AAL-3/4 and AAL-5 */
-   TknU8   fwdMaxCpcsSduSzId;   /* Forward maximum CPCS-SDU size identifier */
-   TknU16  fwdMaxCpcsSduSz;     /* Forward maximum CPCS-SDU size */
-   TknU8   bwdMaxCpcsSduSzId;   /* Forward maximum CPCS-SDU size identifier */
-   TknU16  bwdMaxCpcsSduSz;     /* Forward maximum CPCS-SDU size */
+   TknUInt8   fwdMaxCpcsSduSzId;   /* Forward maximum CPCS-SDU size identifier */
+   TknUInt16  fwdMaxCpcsSduSz;     /* Forward maximum CPCS-SDU size */
+   TknUInt8   bwdMaxCpcsSduSzId;   /* Forward maximum CPCS-SDU size identifier */
+   TknUInt16  bwdMaxCpcsSduSz;     /* Forward maximum CPCS-SDU size */
 
    /* Token definition for AAL-3/4 only */
-   TknU8   midRangeId;          /* MID Range identifier */
-   TknU16  loMidRange;          /* MID Range value */
+   TknUInt8   midRangeId;          /* MID Range identifier */
+   TknUInt16  loMidRange;          /* MID Range value */
 
    /* Token definition for AAL-3/4 only, except in UNI 3.0 */
-   TknU16  hiMidRange;          /* MID Range value */
+   TknUInt16  hiMidRange;          /* MID Range value */
 
    /* Token definition for AAL-3/4 and AAL-5 and only for UNI 3.0 */
-   TknU8   modeId;              /* Mode identifier */
-   TknU8   mode;                /* Mode - Streaming/Message */
+   TknUInt8   modeId;              /* Mode identifier */
+   TknUInt8   mode;                /* Mode - Streaming/Message */
 
    /* Token definition for AAL-3/4 and AAL-5 */
-   TknU8   sscsTypeId;          /* SSCS Type Identifier */
-   TknU8   sscsType;            /* SSCS Type */
+   TknUInt8   sscsTypeId;          /* SSCS Type Identifier */
+   TknUInt8   sscsType;            /* SSCS Type */
 
    /* Token definition for User defined AAL */
-   TknU32  usrDefAalInfo;       /* User defined AAL information */
+   TknUInt32  usrDefAalInfo;       /* User defined AAL information */
 } AmAalParam;
 
 typedef struct amBLoLyrInfo     /* Broadband Low Layer Information Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   usrInfoLyr1Prot;     /* user information layer 1 protocol */
-   TknU8   lyr1Id;              /* Layer 1 id */
-   TknU8   usrInfoLyr2Prot;     /* user information layer 2 protocol */
-   TknU8   lyr2Id;              /* Layer 2 id */
-   TknU8   q933Use;             /* Q.933 use */
-   TknU8   lyr2OprMode;         /* Mode of operation */
-   TknU8   winSize;             /* Window size */
-   TknU8   usrSpecLyr2ProtInfo; /* User specified layer 2 protocol info */
-   TknU8   usrInfoLyr3Prot;     /* user information layer 3 protocol */
-   TknU8   lyr3Id;              /* Layer 3 id */
-   TknU8   lyr3OprMode;         /* Mode of operation */
-   TknU8   defPktSize;          /* Default packet size */
-   TknU8   pktWinSize;          /* Default packet size */
-   TknU8   usrSpecLyr3ProtInfo; /* User specified layer 3 protocol info */
-   TknU8   initProtId;          /* Initial protocol Identifier bits 8-2 */
-   TknU8   snapId;              /* SNAP identifier */
-   TknU32  oui;                 /* Organisation unique identifier */
-   TknU16  protId;              /* Protocol identifier */
+   TknUInt8   usrInfoLyr1Prot;     /* user information layer 1 protocol */
+   TknUInt8   lyr1Id;              /* Layer 1 id */
+   TknUInt8   usrInfoLyr2Prot;     /* user information layer 2 protocol */
+   TknUInt8   lyr2Id;              /* Layer 2 id */
+   TknUInt8   q933Use;             /* Q.933 use */
+   TknUInt8   lyr2OprMode;         /* Mode of operation */
+   TknUInt8   winSize;             /* Window size */
+   TknUInt8   usrSpecLyr2ProtInfo; /* User specified layer 2 protocol info */
+   TknUInt8   usrInfoLyr3Prot;     /* user information layer 3 protocol */
+   TknUInt8   lyr3Id;              /* Layer 3 id */
+   TknUInt8   lyr3OprMode;         /* Mode of operation */
+   TknUInt8   defPktSize;          /* Default packet size */
+   TknUInt8   pktWinSize;          /* Default packet size */
+   TknUInt8   usrSpecLyr3ProtInfo; /* User specified layer 3 protocol info */
+   TknUInt8   initProtId;          /* Initial protocol Identifier bits 8-2 */
+   TknUInt8   snapId;              /* SNAP identifier */
+   TknUInt32  oui;                 /* Organisation unique identifier */
+   TknUInt16  protId;              /* Protocol identifier */
 } AmBLoLyrInfo;
 
 typedef struct amAtmTfcDesc     /* ATM Traffic Descriptor Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   fwdPeakCellRateId0;  /* forward  peak  cell rate id, CLP = 0 */
-   TknU32  fwdPeakCellRate0;    /* forward  peak  cell rate,    CLP = 0   */
-   TknU8   bwdPeakCellRateId0;  /* backward peak  cell rate id, CLP = 0 */
-   TknU32  bwdPeakCellRate0;    /* backward peak  cell rate,    CLP = 0   */
-   TknU8   fwdPeakCellRateId1;  /* forward  peak  cell rate id, CLP = 0+1 */
-   TknU32  fwdPeakCellRate1;    /* forward  peak  cell rate,    CLP = 0+1 */
-   TknU8   bwdPeakCellRateId1;  /* backward peak  cell rate id, CLP = 0+1 */
-   TknU32  bwdPeakCellRate1;    /* backward peak  cell rate,    CLP = 0+1 */
-   TknU8   fwdSustCellRateId0;  /* forward  sust. cell rate id, CLP = 0 */
-   TknU32  fwdSustCellRate0;    /* forward  sust. cell rate,    CLP = 0   */
-   TknU8   bwdSustCellRateId0;  /* backward sust. cell rate id, CLP = 0 */
-   TknU32  bwdSustCellRate0;    /* backward sust. cell rate,    CLP = 0   */
-   TknU8   fwdSustCellRateId1;  /* forward  sust. cell rate id, CLP = 0+1 */
-   TknU32  fwdSustCellRate1;    /* forward  sust. cell rate,    CLP = 0+1 */
-   TknU8   bwdSustCellRateId1;  /* backward sust. cell rate id, CLP = 0+1 */
-   TknU32  bwdSustCellRate1;    /* backward sust. cell rate,    CLP = 0+1 */
-   TknU8   fwdMeanBurstSizeId0; /* forward  mean burst size id, CLP = 0 */
-   TknU32  fwdMeanBurstSize0;   /* forward  mean burst size,    CLP = 0   */
-   TknU8   bwdMeanBurstSizeId0; /* backward mean burst size id, CLP = 0 */
-   TknU32  bwdMeanBurstSize0;   /* backward mean burst size,    CLP = 0   */
-   TknU8   fwdMeanBurstSizeId1; /* forward  mean burst size id, CLP = 0+1 */
-   TknU32  fwdMeanBurstSize1;   /* forward  mean burst size,    CLP = 0+1 */
-   TknU8   bwdMeanBurstSizeId1; /* backward mean burst size id, CLP = 0+1 */
-   TknU32  bwdMeanBurstSize1;   /* backward mean burst size,    CLP = 0+1 */
-   TknU8   bstEffortReq;        /* best effort requested */
-   TknU8   tfcMgmtOptId;        /* traffic management options identifier */
-   TknU8   fwdTagReq;           /* tagging requested in forward  direction */
-   TknU8   bwdTagReq;           /* tagging requested in backward direction */
-   TknU8   bwdFrmDisc;          /* frame discard in backward direction */
-   TknU8   fwdFrmDisc;          /* frame discard in forward  direction */
-   TknU8   fwdAbrMinCellRateId; /* forward  ABR min. cell rate id, CLP = 0+1 */
-   TknU32  fwdAbrMinCellRate;   /* forward  ABR min. cell rate,    CLP = 0+1 */
-   TknU8   bwdAbrMinCellRateId; /* backward ABR min. cell rate id, CLP = 0+1 */
-   TknU32  bwdAbrMinCellRate;   /* backward ABR min. cell rate,    CLP = 0+1 */
+   TknUInt8   fwdPeakCellRateId0;  /* forward  peak  cell rate id, CLP = 0 */
+   TknUInt32  fwdPeakCellRate0;    /* forward  peak  cell rate,    CLP = 0   */
+   TknUInt8   bwdPeakCellRateId0;  /* backward peak  cell rate id, CLP = 0 */
+   TknUInt32  bwdPeakCellRate0;    /* backward peak  cell rate,    CLP = 0   */
+   TknUInt8   fwdPeakCellRateId1;  /* forward  peak  cell rate id, CLP = 0+1 */
+   TknUInt32  fwdPeakCellRate1;    /* forward  peak  cell rate,    CLP = 0+1 */
+   TknUInt8   bwdPeakCellRateId1;  /* backward peak  cell rate id, CLP = 0+1 */
+   TknUInt32  bwdPeakCellRate1;    /* backward peak  cell rate,    CLP = 0+1 */
+   TknUInt8   fwdSustCellRateId0;  /* forward  sust. cell rate id, CLP = 0 */
+   TknUInt32  fwdSustCellRate0;    /* forward  sust. cell rate,    CLP = 0   */
+   TknUInt8   bwdSustCellRateId0;  /* backward sust. cell rate id, CLP = 0 */
+   TknUInt32  bwdSustCellRate0;    /* backward sust. cell rate,    CLP = 0   */
+   TknUInt8   fwdSustCellRateId1;  /* forward  sust. cell rate id, CLP = 0+1 */
+   TknUInt32  fwdSustCellRate1;    /* forward  sust. cell rate,    CLP = 0+1 */
+   TknUInt8   bwdSustCellRateId1;  /* backward sust. cell rate id, CLP = 0+1 */
+   TknUInt32  bwdSustCellRate1;    /* backward sust. cell rate,    CLP = 0+1 */
+   TknUInt8   fwdMeanBurstSizeId0; /* forward  mean burst size id, CLP = 0 */
+   TknUInt32  fwdMeanBurstSize0;   /* forward  mean burst size,    CLP = 0   */
+   TknUInt8   bwdMeanBurstSizeId0; /* backward mean burst size id, CLP = 0 */
+   TknUInt32  bwdMeanBurstSize0;   /* backward mean burst size,    CLP = 0   */
+   TknUInt8   fwdMeanBurstSizeId1; /* forward  mean burst size id, CLP = 0+1 */
+   TknUInt32  fwdMeanBurstSize1;   /* forward  mean burst size,    CLP = 0+1 */
+   TknUInt8   bwdMeanBurstSizeId1; /* backward mean burst size id, CLP = 0+1 */
+   TknUInt32  bwdMeanBurstSize1;   /* backward mean burst size,    CLP = 0+1 */
+   TknUInt8   bstEffortReq;        /* best effort requested */
+   TknUInt8   tfcMgmtOptId;        /* traffic management options identifier */
+   TknUInt8   fwdTagReq;           /* tagging requested in forward  direction */
+   TknUInt8   bwdTagReq;           /* tagging requested in backward direction */
+   TknUInt8   bwdFrmDisc;          /* frame discard in backward direction */
+   TknUInt8   fwdFrmDisc;          /* frame discard in forward  direction */
+   TknUInt8   fwdAbrMinCellRateId; /* forward  ABR min. cell rate id, CLP = 0+1 */
+   TknUInt32  fwdAbrMinCellRate;   /* forward  ABR min. cell rate,    CLP = 0+1 */
+   TknUInt8   bwdAbrMinCellRateId; /* backward ABR min. cell rate id, CLP = 0+1 */
+   TknUInt32  bwdAbrMinCellRate;   /* backward ABR min. cell rate,    CLP = 0+1 */
 } AmAtmTfcDesc;
 
 typedef struct amCauseDgn       /* Cause and Diagnostics Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   location;            /* location */
-   TknU8   causeVal;            /* cause value */
+   TknUInt8   location;            /* location */
+   TknUInt8   causeVal;            /* cause value */
    TknStrM  dgnVal;              /* Diagnostics value */
 } AmCauseDgn;
 
 typedef struct amCgPtyNmb       /* Calling Party Number Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   nmbPlanId;           /* address/numbering plan identification */
-   TknU8   typeNmb;             /* type of number */
-   TknU8   screenInd;           /* screening indicator */
-   TknU8   presInd;             /* presentation indicator */
+   TknUInt8   nmbPlanId;           /* address/numbering plan identification */
+   TknUInt8   typeNmb;             /* type of number */
+   TknUInt8   screenInd;           /* screening indicator */
+   TknUInt8   presInd;             /* presentation indicator */
    TknStrS nmbDigits;           /* address/number information */
 } AmCgPtyNmb;
 
 typedef struct amCgPtySad       /* Calling Party Sub Address Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   oddEvenInd;          /* odd/even indicator */
-   TknU8   typeSad;             /* type of sub address */
+   TknUInt8   oddEvenInd;          /* odd/even indicator */
+   TknUInt8   typeSad;             /* type of sub address */
    TknStrS sadInfo;             /* address/number information */
 } AmCgPtySad;
 
 typedef struct amNBearCap       /* Narrowband Bearer Capability Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8 infoTranCap;           /* information transfer capability */
-   TknU8 codingStd;             /* coding standard */
-   TknU8 infoTranRate0;         /* information transfer rate */
-   TknU8 tranMode;              /* transfer mode */
-   TknU8 establish;             /* establishment */
-   TknU8 cfg;                   /* configuration */
-   TknU8 chanStruct;            /* structure */
-   TknU8 infoTranRate1;         /* information transfer rate */
-   TknU8 symmetry;              /* symmetry */
-   TknU8 usrInfoLyr1Prot;       /* usr information layer 1 protocol */
-   TknU8 lyr1Ident;             /* layer 1 identity */
-   TknU8 usrRate;               /* user rate */
-   TknU8 negot;                 /* negotiation */
-   TknU8 syncAsync;             /* synchronous/asynchronous */
+   TknUInt8 infoTranCap;           /* information transfer capability */
+   TknUInt8 codingStd;             /* coding standard */
+   TknUInt8 infoTranRate0;         /* information transfer rate */
+   TknUInt8 tranMode;              /* transfer mode */
+   TknUInt8 establish;             /* establishment */
+   TknUInt8 cfg;                   /* configuration */
+   TknUInt8 chanStruct;            /* structure */
+   TknUInt8 infoTranRate1;         /* information transfer rate */
+   TknUInt8 symmetry;              /* symmetry */
+   TknUInt8 usrInfoLyr1Prot;       /* usr information layer 1 protocol */
+   TknUInt8 lyr1Ident;             /* layer 1 identity */
+   TknUInt8 usrRate;               /* user rate */
+   TknUInt8 negot;                 /* negotiation */
+   TknUInt8 syncAsync;             /* synchronous/asynchronous */
 /*------------------------------------------------------------------------*/
 /* The following six tokens represent a uinon of octets 5b.1 and 5b.2 of  */
 /* the Narrow Band Bearer Capability.                                     */
 /*------------------------------------------------------------------------*/
-   TknU8 FlcRx_BandNeg;         /* flow control on reception or 
+   TknUInt8 FlcRx_BandNeg;         /* flow control on reception or 
                                    inband/outband negotiation */
-   TknU8 FlcTx_Assgn;           /* flow control on transmission or 
+   TknUInt8 FlcTx_Assgn;           /* flow control on transmission or 
                                    assignor/assignee*/
-   TknU8 NicRx_LLINeg;          /* network independent clock on reception or 
+   TknUInt8 NicRx_LLINeg;          /* network independent clock on reception or 
                                    logical link identifier negotiation */
-   TknU8 NicTx_Mode;            /* network independent clock on transmission or
+   TknUInt8 NicTx_Mode;            /* network independent clock on transmission or
                                    mode of operation */
-   TknU8 Rate_MFrm;             /* intermediate rate (low bit) or Multi 
+   TknUInt8 Rate_MFrm;             /* intermediate rate (low bit) or Multi 
                                    frame support */
-   TknU8 Rate_Hdr;              /* intermediate rate (high bit) or rate 
+   TknUInt8 Rate_Hdr;              /* intermediate rate (high bit) or rate 
                                    adaptation Hdr/ no Headr */
-   TknU8 parity;                /* parity information */
-   TknU8 nmbDatBits;            /* number of data bits excluding parity bit */
-   TknU8 nmbStopBits;           /* number of stop bits */
-   TknU8 modemType;             /* modem type */
-   TknU8 duplexMode;            /* duplex mode */
-   TknU8 usrInfoLyr2Prot;       /* user information layer 2 protocol */
-   TknU8 lyr2Ident;             /* layer 2 identity */
-   TknU8 usrInfoLyr3Prot;       /* user information layer 3 protocol */
-   TknU8 lyr3Ident0;            /* layer 3 identity */
+   TknUInt8 parity;                /* parity information */
+   TknUInt8 nmbDatBits;            /* number of data bits excluding parity bit */
+   TknUInt8 nmbStopBits;           /* number of stop bits */
+   TknUInt8 modemType;             /* modem type */
+   TknUInt8 duplexMode;            /* duplex mode */
+   TknUInt8 usrInfoLyr2Prot;       /* user information layer 2 protocol */
+   TknUInt8 lyr2Ident;             /* layer 2 identity */
+   TknUInt8 usrInfoLyr3Prot;       /* user information layer 3 protocol */
+   TknUInt8 lyr3Ident0;            /* layer 3 identity */
 } AmNBearCap;
 
 typedef struct amNLoLyrComp     /* Narrowband Low Layer Compatibility Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8 infoTranCap;           /* information transfer capability */
-   TknU8 codingStd;             /* coding standard */
-   TknU8 negInd;                /* negotiation indicator */
-   TknU8 infoTranRate0;         /* information transfer rate */
-   TknU8 tranMode;              /* transfer mode */
-   TknU8 establish;             /* establishment */
-   TknU8 cfg;                   /* configuration */
-   TknU8 chanStruct;            /* structure */
-   TknU8 infoTranRate1;         /* information transfer rate */
-   TknU8 symmetry;              /* symmetry */
-   TknU8 usrInfoLyr1Prot;       /* usr information layer 1 protocol */
-   TknU8 lyr1Ident;             /* layer 1 identity */
-   TknU8 usrRate;               /* user rate */
-   TknU8 negot;                 /* negotiation */
-   TknU8 syncAsync;             /* synchronous/asynchronous */
+   TknUInt8 infoTranCap;           /* information transfer capability */
+   TknUInt8 codingStd;             /* coding standard */
+   TknUInt8 negInd;                /* negotiation indicator */
+   TknUInt8 infoTranRate0;         /* information transfer rate */
+   TknUInt8 tranMode;              /* transfer mode */
+   TknUInt8 establish;             /* establishment */
+   TknUInt8 cfg;                   /* configuration */
+   TknUInt8 chanStruct;            /* structure */
+   TknUInt8 infoTranRate1;         /* information transfer rate */
+   TknUInt8 symmetry;              /* symmetry */
+   TknUInt8 usrInfoLyr1Prot;       /* usr information layer 1 protocol */
+   TknUInt8 lyr1Ident;             /* layer 1 identity */
+   TknUInt8 usrRate;               /* user rate */
+   TknUInt8 negot;                 /* negotiation */
+   TknUInt8 syncAsync;             /* synchronous/asynchronous */
 /*------------------------------------------------------------------------*/
 /* The following six tokens represent a uinon of octets 5b.1 and 5b.2 of  */
 /* the Narrow Band Lower Layer Compatibility                              */
 /*------------------------------------------------------------------------*/
-   TknU8 FlcRx_BandNeg;         /* flow control on reception or 
+   TknUInt8 FlcRx_BandNeg;         /* flow control on reception or 
                                    inband/outband negotiation */
-   TknU8 FlcTx_Assgn;           /* flow control on transmission or 
+   TknUInt8 FlcTx_Assgn;           /* flow control on transmission or 
                                    assignor/assignee*/
-   TknU8 NicRx_LLINeg;          /* network independent clock on reception or 
+   TknUInt8 NicRx_LLINeg;          /* network independent clock on reception or 
                                    logical link identifier negotiation */
-   TknU8 NicTx_Mode;            /* network independent clock on transmission or
+   TknUInt8 NicTx_Mode;            /* network independent clock on transmission or
                                    mode of operation */
-   TknU8 Rate_MFrm;             /* intermediate rate (low bit) or Multi 
+   TknUInt8 Rate_MFrm;             /* intermediate rate (low bit) or Multi 
                                    frame support */
-   TknU8 Rate_Hdr;              /* intermediate rate (high bit) or rate 
+   TknUInt8 Rate_Hdr;              /* intermediate rate (high bit) or rate 
                                    adaptation Hdr/ no Headr */
-   TknU8 parity;                /* parity information */
-   TknU8 nmbDatBits;            /* number of data bits excluding parity bit */
-   TknU8 nmbStopBits;           /* number of stop bits */
-   TknU8 modemType;             /* modem type */
-   TknU8 duplexMode;            /* duplex mode */
-   TknU8 usrInfoLyr2Prot;       /* user information layer 2 protocol */
-   TknU8 lyr2Ident;             /* layer 2 identity */
-   TknU8 optLyr2ProtInfo;       /* optional layer 2 protocol information */
-   TknU8 usrInfoLyr3Prot;       /* user information layer 3 protocol */
-   TknU8 lyr3Ident1;            /* layer 3 identity */
-   TknU8 optLyr3ProtInfo;       /* optional layer 3 protocol information */
+   TknUInt8 parity;                /* parity information */
+   TknUInt8 nmbDatBits;            /* number of data bits excluding parity bit */
+   TknUInt8 nmbStopBits;           /* number of stop bits */
+   TknUInt8 modemType;             /* modem type */
+   TknUInt8 duplexMode;            /* duplex mode */
+   TknUInt8 usrInfoLyr2Prot;       /* user information layer 2 protocol */
+   TknUInt8 lyr2Ident;             /* layer 2 identity */
+   TknUInt8 optLyr2ProtInfo;       /* optional layer 2 protocol information */
+   TknUInt8 usrInfoLyr3Prot;       /* user information layer 3 protocol */
+   TknUInt8 lyr3Ident1;            /* layer 3 identity */
+   TknUInt8 optLyr3ProtInfo;       /* optional layer 3 protocol information */
 } AmNLoLyrComp;
 
 typedef struct amNHiLyrComp     /* Narrowband High Layer Compatibility Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8 presMethod;            /* presentation method */
-   TknU8 interpretation;        /* interpretation */
-   TknU8 codingStd;             /* coding standard */
-   TknU8 highLyrCharId;         /* high layer characteristics identification */
-   TknU8 extHighLyrCharId;      /* extended high layer characteristics id */
+   TknUInt8 presMethod;            /* presentation method */
+   TknUInt8 interpretation;        /* interpretation */
+   TknUInt8 codingStd;             /* coding standard */
+   TknUInt8 highLyrCharId;         /* high layer characteristics identification */
+   TknUInt8 extHighLyrCharId;      /* extended high layer characteristics id */
 } AmNHiLyrComp;
 
 typedef struct amProgInd        /* Progress Indicator Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8 progLocation;          /* location */
-   TknU8 codingStd;             /* coding standard */
-   TknU8 progDesc;              /* progress description */
+   TknUInt8 progLocation;          /* location */
+   TknUInt8 codingStd;             /* coding standard */
+   TknUInt8 progDesc;              /* progress description */
 } AmProgInd;
 
 #if (DEF_SIG_PNNI | DEF_SIG_AINI)
 typedef struct amCrankback      /* Crankback Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   cbLevel;             /* crankback level */
-   TknU8   blkTransType;        /* blocked transit type */
+   TknUInt8   cbLevel;             /* crankback level */
+   TknUInt8   blkTransType;        /* blocked transit type */
 #ifdef SIG_PNNI
    TknStrS blkNodeId;           /* blocked node id */
    TknStrS blkLinkPreNodeId;    /* blocked link's preceeding node id */
-   TknU32  blkLinkPortId;       /* blocked link port id */
+   TknUInt32  blkLinkPortId;       /* blocked link port id */
    TknStrS blkLinkSuccNodeId;   /* blocked link's succeding node id */
 #endif /* SIG_PNNI */
-   TknU8   cbCause;             /* crankback cause */
+   TknUInt8   cbCause;             /* crankback cause */
 #ifdef SIG_PNNI
    TknStrM cbDgn;               /* crankback cause diagnostics */
 #endif /* SIG_PNNI */
@@ -1285,27 +1285,27 @@ typedef struct amCrankback      /* Crankback Tokens */
 typedef struct amCdPtySoftPvc   /* Called Party Soft PVPC/PVCC Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   selType;             /* VPI/VCI selection Type */
-   TknU8   vpiId;               /* VPI id */
-   TknU16  vpi;                 /* VPI */
-   TknU8   vciId;               /* VCI id */
-   TknU16  vci;                 /* VCI */
+   TknUInt8   selType;             /* VPI/VCI selection Type */
+   TknUInt8   vpiId;               /* VPI id */
+   TknUInt16  vpi;                 /* VPI */
+   TknUInt8   vciId;               /* VCI id */
+   TknUInt16  vci;                 /* VCI */
 #ifdef SPVC_FR
-   TknU8   dlciId;              /* DLCI Identifer */
-   TknU32  dlci;                /* Dlci Value */
+   TknUInt8   dlciId;              /* DLCI Identifer */
+   TknUInt32  dlci;                /* Dlci Value */
 #endif /* SPVC_FR */
 } AmCdPtySoftPvc;
 
 typedef struct amCgPtySoftPvc   /* Calling Party Soft PVPC/PVCC Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   vpiId;               /* VPI id */
-   TknU16  vpi;                 /* VPI */
-   TknU8   vciId;               /* VCI id */
-   TknU16  vci;                 /* VCI */
+   TknUInt8   vpiId;               /* VPI id */
+   TknUInt16  vpi;                 /* VPI */
+   TknUInt8   vciId;               /* VCI id */
+   TknUInt16  vci;                 /* VCI */
 #ifdef SPVC_FR
-   TknU8   dlciId;              /* DLCI Identifer */
-   TknU32  dlci;                /* Dlci Value */
+   TknUInt8   dlciId;              /* DLCI Identifer */
+   TknUInt32  dlci;                /* Dlci Value */
 #endif /* SPVC_FR */
 } AmCgPtySoftPvc;
 #endif /* DEF_SIG_PNNI | DEF_SIG_AINI */
@@ -1313,10 +1313,10 @@ typedef struct amCgPtySoftPvc   /* Calling Party Soft PVPC/PVCC Tokens */
 typedef struct amConnNmb        /* Connected Number Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   nmbPlanId;           /* address/numbering plan identification */
-   TknU8   typeNmb;             /* type of number */
-   TknU8   screenInd;           /* screening indicator */
-   TknU8   presInd;             /* presentation indicator */
+   TknUInt8   nmbPlanId;           /* address/numbering plan identification */
+   TknUInt8   typeNmb;             /* type of number */
+   TknUInt8   screenInd;           /* screening indicator */
+   TknUInt8   presInd;             /* presentation indicator */
    TknStrS nmbDigits;           /* address/number information */
 } AmConnNmb;
 
@@ -1324,8 +1324,8 @@ typedef struct amConnNmb        /* Connected Number Tokens */
 typedef struct amConnSad        /* Calling Party Sub Address Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   oddEvenInd;          /* odd/even indicator */
-   TknU8   typeSad;             /* type of sub address */
+   TknUInt8   oddEvenInd;          /* odd/even indicator */
+   TknUInt8   typeSad;             /* type of sub address */
    TknStrS sadInfo;             /* address/number information */
 } AmConnSad;
 
@@ -1340,74 +1340,74 @@ typedef AmAtmTfcDesc   AmAltAtmTfcDesc;  /* Alternative ATM Traffic Desc. */
 typedef struct amMinAccAtmTfcDesc  /* Minimum acceptable ATM Traffic Desc. */
 {
    ElmtHdr eh;                     /* element header */
-   TknU8   fwdPeakCellRateId0;     /* forward  peak  cell rate id, CLP = 0 */
-   TknU32  fwdPeakCellRate0;       /* forward  peak  cell rate,    CLP = 0   */
-   TknU8   bwdPeakCellRateId0;     /* backward peak  cell rate id, CLP = 0 */
-   TknU32  bwdPeakCellRate0;       /* backward peak  cell rate,    CLP = 0   */
-   TknU8   fwdPeakCellRateId1;     /* forward  peak  cell rate id, CLP = 0+1 */
-   TknU32  fwdPeakCellRate1;       /* forward  peak  cell rate,    CLP = 0+1 */
-   TknU8   bwdPeakCellRateId1;     /* backward peak  cell rate id, CLP = 0+1 */
-   TknU32  bwdPeakCellRate1;       /* backward peak  cell rate,    CLP = 0+1 */
+   TknUInt8   fwdPeakCellRateId0;     /* forward  peak  cell rate id, CLP = 0 */
+   TknUInt32  fwdPeakCellRate0;       /* forward  peak  cell rate,    CLP = 0   */
+   TknUInt8   bwdPeakCellRateId0;     /* backward peak  cell rate id, CLP = 0 */
+   TknUInt32  bwdPeakCellRate0;       /* backward peak  cell rate,    CLP = 0   */
+   TknUInt8   fwdPeakCellRateId1;     /* forward  peak  cell rate id, CLP = 0+1 */
+   TknUInt32  fwdPeakCellRate1;       /* forward  peak  cell rate,    CLP = 0+1 */
+   TknUInt8   bwdPeakCellRateId1;     /* backward peak  cell rate id, CLP = 0+1 */
+   TknUInt32  bwdPeakCellRate1;       /* backward peak  cell rate,    CLP = 0+1 */
 } AmMinAccAtmTfcDesc;
 
 typedef struct amExtQosParam       /* Extended QOS parameter */
 {
    ElmtHdr eh;                     /* element header */
-   TknU8   origin;                 /* origin of this IE */
-   TknU8   accFwdPpCDVId;          /* acceptable forward  peak-to-peak cell 
+   TknUInt8   origin;                 /* origin of this IE */
+   TknUInt8   accFwdPpCDVId;          /* acceptable forward  peak-to-peak cell 
                                     * delay variation identifier */
-   TknU32  accFwdPpCDV;            /* acceptable forward  peak-to-peak cell
+   TknUInt32  accFwdPpCDV;            /* acceptable forward  peak-to-peak cell
                                     * delay variation */
-   TknU8   accBwdPpCDVId;          /* acceptable backward peak-to-peak cell
+   TknUInt8   accBwdPpCDVId;          /* acceptable backward peak-to-peak cell
                                     * delay variation identifier */
-   TknU32  accBwdPpCDV;            /* acceptable backward peak-to-peak cell
+   TknUInt32  accBwdPpCDV;            /* acceptable backward peak-to-peak cell
                                     * delay variation */
-   TknU8   cumFwdPpCDVId;          /* cumulative forward  peak-to-peak cell
+   TknUInt8   cumFwdPpCDVId;          /* cumulative forward  peak-to-peak cell
                                     * delay variation identifier */
-   TknU32  cumFwdPpCDV;            /* cumulative forward  peak-to-peak cell
+   TknUInt32  cumFwdPpCDV;            /* cumulative forward  peak-to-peak cell
                                     * delay variation */
-   TknU8   cumBwdPpCDVId;          /* cumulative backward peak-to-peak cell
+   TknUInt8   cumBwdPpCDVId;          /* cumulative backward peak-to-peak cell
                                     * delay variation identifier */
-   TknU32  cumBwdPpCDV;            /* cumulative backward peak-to-peak cell
+   TknUInt32  cumBwdPpCDV;            /* cumulative backward peak-to-peak cell
                                     * delay variation */
-   TknU8   accFwdCLRId;            /* acceptable forward  cell loss ratio
+   TknUInt8   accFwdCLRId;            /* acceptable forward  cell loss ratio
                                     * identifier */
-   TknU8   accFwdCLR;              /* acceptable forward  cell loss ratio */
-   TknU8   accBwdCLRId;            /* acceptable backward cell loss ratio 
+   TknUInt8   accFwdCLR;              /* acceptable forward  cell loss ratio */
+   TknUInt8   accBwdCLRId;            /* acceptable backward cell loss ratio 
                                     * identifier */
-   TknU8   accBwdCLR;              /* acceptable backward cell loss ratio */
+   TknUInt8   accBwdCLR;              /* acceptable backward cell loss ratio */
 } AmExtQosParam;
 
 typedef struct amAbrAddParam       /* ABR additional parameters */
 {
    ElmtHdr eh;                     /* element header */
-   TknU8   fwdAddParamRecId;       /* forward  additional parameters record identifier */
-   TknU32  fwdAddParamRec;         /* forward  additional parameters record */
-   TknU8   bwdAddParamRecId;       /* backward additional parameters record identifier */
-   TknU32  bwdAddParamRec;         /* backward additional parameters record */
+   TknUInt8   fwdAddParamRecId;       /* forward  additional parameters record identifier */
+   TknUInt32  fwdAddParamRec;         /* forward  additional parameters record */
+   TknUInt8   bwdAddParamRecId;       /* backward additional parameters record identifier */
+   TknUInt32  bwdAddParamRec;         /* backward additional parameters record */
 } AmAbrAddParam;
 
 typedef struct amAbrSetupParam     /* ABR Setup parameters */
 {
    ElmtHdr eh;                     /* element header */
-   TknU8   fwdAbrICRId;            /* forward  ABR initial cell rate identifier */
-   TknU32  fwdAbrICR;              /* forward  ABR initial cell rate */
-   TknU8   bwdAbrICRId;            /* backward ABR initial cell rate identifier */
-   TknU32  bwdAbrICR;              /* backward ABR initial cell rate */
-   TknU8   fwdAbrTBEId;            /* forward  ABR transient buffer exposure identifier */
-   TknU32  fwdAbrTBE;              /* forward  ABR transient buffer exposure */
-   TknU8   bwdAbrTBEId;            /* backward ABR transient buffer exposure identifier */
-   TknU32  bwdAbrTBE;              /* backward ABR transient buffer exposure */
-   TknU8   cumRmFRTTId;            /* cumulative RM fixed round trip time identifier */
-   TknU32  cumRmFRTT;              /* cumulative RM fixed round trip time */
-   TknU8   fwdRIFId;               /* forward  rate increment factor identifier */
-   TknU8   fwdRIF;                 /* forward  rate increment factor */
-   TknU8   bwdRIFId;               /* backward rate increment factor identifier */
-   TknU8   bwdRIF;                 /* backward rate increment factor */
-   TknU8   fwdRDFId;               /* forward  rate decrement factor identifier */
-   TknU8   fwdRDF;                 /* forward  rate decrement factor */
-   TknU8   bwdRDFId;               /* backward rate decrement factor identifier */
-   TknU8   bwdRDF;                 /* backward rate decrement factor */
+   TknUInt8   fwdAbrICRId;            /* forward  ABR initial cell rate identifier */
+   TknUInt32  fwdAbrICR;              /* forward  ABR initial cell rate */
+   TknUInt8   bwdAbrICRId;            /* backward ABR initial cell rate identifier */
+   TknUInt32  bwdAbrICR;              /* backward ABR initial cell rate */
+   TknUInt8   fwdAbrTBEId;            /* forward  ABR transient buffer exposure identifier */
+   TknUInt32  fwdAbrTBE;              /* forward  ABR transient buffer exposure */
+   TknUInt8   bwdAbrTBEId;            /* backward ABR transient buffer exposure identifier */
+   TknUInt32  bwdAbrTBE;              /* backward ABR transient buffer exposure */
+   TknUInt8   cumRmFRTTId;            /* cumulative RM fixed round trip time identifier */
+   TknUInt32  cumRmFRTT;              /* cumulative RM fixed round trip time */
+   TknUInt8   fwdRIFId;               /* forward  rate increment factor identifier */
+   TknUInt8   fwdRIF;                 /* forward  rate increment factor */
+   TknUInt8   bwdRIFId;               /* backward rate increment factor identifier */
+   TknUInt8   bwdRIF;                 /* backward rate increment factor */
+   TknUInt8   fwdRDFId;               /* forward  rate decrement factor identifier */
+   TknUInt8   fwdRDF;                 /* forward  rate decrement factor */
+   TknUInt8   bwdRDFId;               /* backward rate decrement factor identifier */
+   TknUInt8   bwdRDF;                 /* backward rate decrement factor */
 } AmAbrSetupParam;
 #endif /* DEF_SIG_PNNI | DEF_SIG_AINI | DEF_UNI40 */
 
@@ -1435,8 +1435,8 @@ typedef struct aalConParam        /* connection parameters for AAL */
 typedef struct amCdPtyNmb       /* Called Party Number Tokens */
 {
    ElmtHdr eh;                  /* element header */
-   TknU8   nmbPlanId;           /* address/numbering plan identification */
-   TknU8   typeNmb;             /* type of number */
+   TknUInt8   nmbPlanId;           /* address/numbering plan identification */
+   TknUInt8   typeNmb;             /* type of number */
    TknStrS  nmbDigits;           /* address/number information */
 } AmCdPtyNmb;
 
@@ -1461,7 +1461,7 @@ typedef struct mem                /* memory */
 {
    Region region;                 /* region */
    Pool pool;                     /* pool */
-   U16 spare;                     /* spare for alignment */
+   uint16_t spare;                     /* spare for alignment */
 } Mem;  
    
 typedef Mem MemoryId;             /* memory id */
@@ -1477,10 +1477,10 @@ typedef struct resp
 
 typedef struct tds_header       /* header */
 {
-   U16 msgLen;                  /* message length   - optional */
-   U8 msgType;                  /* message type     - mandatory */
-   U8 version;                  /* version          - optional */
-   U16 seqNmb;                  /* sequence number  - optional */
+   uint16_t msgLen;                  /* message length   - optional */
+   uint8_t msgType;                  /* message type     - mandatory */
+   uint8_t version;                  /* version          - optional */
+   uint16_t seqNmb;                  /* sequence number  - optional */
    EntityId entId;              /* entity id        - mandatory */
    ElmntId elmId;               /* element id       - mandatory */
 #ifdef LMINT3
@@ -1492,7 +1492,7 @@ typedef struct tds_header       /* header */
 typedef struct tmrCfg           /* timer configuration structure */
 {
    Bool enb;                    /* enable */
-   U16 val;                     /* value */
+   uint16_t val;                     /* value */
 } TmrCfg;
 
 typedef struct asyncCfg         /* asynchronous configuration */
@@ -1508,47 +1508,47 @@ typedef struct asyncCfg         /* asynchronous configuration */
   
 typedef struct dateTime           /* date and time */
 {
-   U8 month;                      /* month */
-   U8 day;                        /* day */
-   U8 year;                       /* year */
-   U8 hour;                       /* hour - 24 hour clock */
-   U8 min;                        /* minute */
-   U8 sec;                        /* second */
-   U8 tenths;                     /* tenths of second */
+   uint8_t month;                      /* month */
+   uint8_t day;                        /* day */
+   uint8_t year;                       /* year */
+   uint8_t hour;                       /* hour - 24 hour clock */
+   uint8_t min;                        /* minute */
+   uint8_t sec;                        /* second */
+   uint8_t tenths;                     /* tenths of second */
    /*-- gen_x_001.main_90 - Added variable for microseconds in DateTime--*/
 #ifdef SS_DATETIME_USEC
-   U32 usec;                      /* micro seconds */
+   uint32_t usec;                      /* micro seconds */
 #endif /*-- SS_DATETIME_USEC --*/
 } DateTime;
 /* gen_x_001.main_94: Additions */
 /* gen_x_001.main_95: Modifications */
-typedef U64 EpcTime;
+typedef uint64_t EpcTime;
 
 /* common status */
 typedef struct cmStatus
 {
-   U16 status;       /* status of request */
-   U16 reason;       /* failure reason */
+   uint16_t status;       /* status of request */
+   uint16_t reason;       /* failure reason */
 }CmStatus;    
 
 /* common alarm */
 typedef struct cmAlarm
 {
    DateTime dt;      /* data and time */
-   U16 category;     /* alarm category*/
-   U16 event;        /* alarm event */
-   U16 cause;        /* alarm cause */
+   uint16_t category;     /* alarm category*/
+   uint16_t event;        /* alarm event */
+   uint16_t cause;        /* alarm cause */
 }CmAlarm;    
   
 /* duration structure */
   
 typedef struct duration           /* duration */
 {
-   U8 days;                       /* days */
-   U8 hours;                      /* hours */
-   U8 mins;                       /* minutes */
-   U8 secs;                       /* seconds */
-   U8 tenths;                     /* tenths of seconds */
+   uint8_t days;                       /* days */
+   uint8_t hours;                      /* hours */
+   uint8_t mins;                       /* minutes */
+   uint8_t secs;                       /* seconds */
+   uint8_t tenths;                     /* tenths of seconds */
 } Duration;
 
 
@@ -1563,9 +1563,9 @@ typedef struct ssmsgb Buffer;
 #ifdef FLAT_BUFFER_OPT
 typedef struct _flatBuffer
 {
-   U8* startAddr;
-   U8* ptr;
-   U32 len;
+   uint8_t* startAddr;
+   uint8_t* ptr;
+   uint32_t len;
 }FlatBuffer;
 #endif
 
@@ -1585,20 +1585,20 @@ typedef struct ss_buffer Buffer;  /* forward definition - buffer */
 
 typedef struct tknBuf
 {
-   U8      pres;                  /* Present Flag */
-   U8      spare1;                /* for alignment */
-   U16     spare2;                /* for 32 bit alignment */
+   uint8_t      pres;                  /* Present Flag */
+   uint8_t      spare1;                /* for alignment */
+   uint16_t     spare2;                /* for 32 bit alignment */
 #ifdef ALIGN_64BIT
-   U32     spare3;                /* for 64 bit alignment */
+   uint32_t     spare3;                /* for 64 bit alignment */
 #endif
    Buffer  *val;                  /* Buffer type (use allocated memory) */
 } TknBuf;
 
 /* defining the CmIpAddr and CmIpAddr6 */
 /* socket typedefs and structs */
-typedef U32 CmIpAddr;        /* 4 byte IP address */
+typedef uint32_t CmIpAddr;        /* 4 byte IP address */
 #ifdef IPV6_SUPPORTED
-typedef U8  CmIpAddr6[16];   /* 16 byte IPV6 address */
+typedef uint8_t  CmIpAddr6[16];   /* 16 byte IPV6 address */
 #endif /* IPV6_SUPPORTED */
 
 /* common packing functions */
@@ -1617,14 +1617,14 @@ EXTERN S16 cmPkAddrs    ARGS((Addrs    *addrs,    Buffer *mBuf));
 EXTERN S16 cmPkProtAddr ARGS((ProtAddr *protAddr, Buffer *mBuf));
 EXTERN S16 cmPkProtAddrTbl ARGS((ProtAddrTbl *protAddr, Buffer *mBuf));
 EXTERN S16 cmPkShrtAddrs ARGS((ShrtAddrs    *addrs,    Buffer *mBuf));
-EXTERN S16 cmPkAddrMask ARGS((U8    *mask,    Buffer *mBuf));
+EXTERN S16 cmPkAddrMask ARGS((uint8_t    *mask,    Buffer *mBuf));
 EXTERN S16 cmPkBndCfg   ARGS((BndCfg   *bndCfg,   Buffer *mBuf));
 EXTERN S16 cmPkPst      ARGS((Pst      *pst,      Buffer *mBuf));
 EXTERN S16 cmPkElmtHdr  ARGS((ElmtHdr  *m,        Buffer *mBuf));
-EXTERN S16 cmPkTknU8    ARGS((TknU8    *tknU8,    Buffer *mBuf));
+EXTERN S16 cmPkTknUInt8    ARGS((TknUInt8    *tknUInt8,    Buffer *mBuf));
 EXTERN S16 cmPkTknS8    ARGS((TknS8    *tknS8,    Buffer *mBuf));
-EXTERN S16 cmPkTknU16   ARGS((TknU16   *tknU16,   Buffer *mBuf));
-EXTERN S16 cmPkTknU32   ARGS((TknU32   *tknU32,   Buffer *mBuf));
+EXTERN S16 cmPkTknUInt16   ARGS((TknUInt16   *tknUInt16,   Buffer *mBuf));
+EXTERN S16 cmPkTknUInt32   ARGS((TknUInt32   *tknUInt32,   Buffer *mBuf));
 EXTERN S16 cmPkTknStr   ARGS((TknStr   *tknStr,   Buffer *mBuf));                              
 EXTERN S16 cmPkTknStrM  ARGS((TknStrM  *tknStr,   Buffer *mBuf));
 EXTERN S16 cmPkTknStrS  ARGS((TknStrS  *tknStr,   Buffer *mBuf));
@@ -1669,14 +1669,14 @@ EXTERN S16 cmUnpkAddrs    ARGS((Addrs    *addrs,    Buffer *mBuf));
 EXTERN S16 cmUnpkProtAddr ARGS((ProtAddr *protAddr, Buffer *mBuf));
 EXTERN S16 cmUnpkProtAddrTbl ARGS((ProtAddrTbl *protAddr, Buffer *mBuf));
 EXTERN S16 cmUnpkShrtAddrs ARGS((ShrtAddrs    *addrs,    Buffer *mBuf));
-EXTERN S16 cmUnpkAddrMask ARGS((U8    *mask,    Buffer *mBuf));
+EXTERN S16 cmUnpkAddrMask ARGS((uint8_t    *mask,    Buffer *mBuf));
 EXTERN S16 cmUnpkBndCfg   ARGS((BndCfg   *bndCfg,   Buffer *mBuf));
 EXTERN S16 cmUnpkPst      ARGS((Pst      *pst,      Buffer *mBuf));
 EXTERN S16 cmUnpkElmtHdr  ARGS((ElmtHdr  *m,        Buffer *mBuf));
-EXTERN S16 cmUnpkTknU8    ARGS((TknU8    *tknU8,    Buffer *mBuf));
+EXTERN S16 cmUnpkTknUInt8    ARGS((TknUInt8    *tknUInt8,    Buffer *mBuf));
 EXTERN S16 cmUnpkTknS8    ARGS((TknS8    *tknS8,    Buffer *mBuf));
-EXTERN S16 cmUnpkTknU16   ARGS((TknU16   *tknU16,   Buffer *mBuf));
-EXTERN S16 cmUnpkTknU32   ARGS((TknU32   *tknU32,   Buffer *mBuf));
+EXTERN S16 cmUnpkTknUInt16   ARGS((TknUInt16   *tknUInt16,   Buffer *mBuf));
+EXTERN S16 cmUnpkTknUInt32   ARGS((TknUInt32   *tknUInt32,   Buffer *mBuf));
 EXTERN S16 cmUnpkTknStr   ARGS((TknStr   *tknStr,   Buffer *mBuf));                              
 EXTERN S16 cmUnpkTknStrM  ARGS((TknStrM  *tknStr,   Buffer *mBuf));
 EXTERN S16 cmUnpkTknStrS  ARGS((TknStrS  *tknStr,   Buffer *mBuf));