Merge "[Epic-ID: ODUHIGH-405][Task-ID: ODUHIGH-437] Establishing communication betwee...
[o-du/l2.git] / src / cm / cm_tkns.x
index dd88436..15afb71 100755 (executable)
@@ -39,54 +39,54 @@ extern "C" {
 /* typedefs */
 
 /* Token Present */
-typedef TknU8 TknPres;
+typedef TknUInt8 TknPres;
 /* Do not remove TknBool definition. If cm_gprs.x is used then include this
  * file before cm_gprs.x */
-typedef TknU8 TknBool;
+typedef TknUInt8 TknBool;
 
 typedef struct tknS16        
 {
-   U8   pres;                     /* present flag */
-   U8   spare1;                   /* for alignment */
+   uint8_t   pres;                     /* present flag */
+   uint8_t   spare1;                   /* for alignment */
    S16  val;                      /* value */
 #ifdef ALIGN_64BIT
-   U32  spare2;                   /* for 64 bit alignment */
+   uint32_t  spare2;                   /* for 64 bit alignment */
 #endif
 } TknS16;
 
 /* Token TknStr8 */
 typedef struct tknStr8            /* 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[8];                  /* string value - 4 byte alligned */
+   uint8_t   val[8];                  /* string value - 4 byte alligned */
 } TknStr8;
 
 /* Token TknStr16 */
 typedef struct tknStr16            /* 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[16];                  /* string value - 4 byte alligned */
+   uint8_t   val[16];                  /* string value - 4 byte alligned */
 } TknStr16;
 
 typedef struct tknStrOSXL
 {
-   U8   pres;                    /* present flag */
-   U8   spare1;                  /* spare */
-   U16   len;                    /* length */
+   uint8_t   pres;                    /* present flag */
+   uint8_t   spare1;                  /* spare */
+   uint16_t   len;                    /* length */
 #ifdef ALIGN_64BIT
-   U32  spare2;                  /* for 64 bit alignment */
+   uint32_t  spare2;                  /* for 64 bit alignment */
 #endif
-   U8   *val;                    /* string value - 4 byte alligned */
+   uint8_t   *val;                    /* string value - 4 byte alligned */
 } TknStrOSXL;
 
 /* Token TknBStr32 : length field indicates number of Bits present */
@@ -103,25 +103,25 @@ typedef TknStrOSXL TknStrBSXL;
 /* Token TknStrBMP4 */
 typedef struct tknStrBMP4         /* 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
-   U16   val[4];                  /* string value - 4 byte alligned */
+   uint16_t   val[4];                  /* string value - 4 byte alligned */
 } TknStrBMP4;
 
 /* Token TknStrBMPXL */
 typedef struct tknStrBMPXL
 {
-   U8   pres;                    /* present flag */
-   U8   spare1;                  /* spare */
-   U16   len;                    /* length */
+   uint8_t   pres;                    /* present flag */
+   uint8_t   spare1;                  /* spare */
+   uint16_t   len;                    /* length */
 #ifdef ALIGN_64BIT
-   U32  spare2;                  /* for 64 bit alignment */
+   uint32_t  spare2;                  /* for 64 bit alignment */
 #endif
-   U16   *val;                   /* string value - 4 byte alligned */
+   uint16_t   *val;                   /* string value - 4 byte alligned */
 } TknStrBMPXL;
 
 
@@ -132,56 +132,56 @@ typedef struct tknStrBMPXL
 /* Token TknStrUNI4 */
 typedef struct tknStrUNI4         /* 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
-   U32   val[4];                  /* string value - 4 byte alligned */
+   uint32_t   val[4];                  /* string value - 4 byte alligned */
 } TknStrUNI4;
 
 typedef struct tknStrUNIXL       /* Universal String */
 {
-   U8   pres;                    /* present flag */
-   U8   spare1;                  /* spare */
-   U16  len;                     /* length */
+   uint8_t   pres;                    /* present flag */
+   uint8_t   spare1;                  /* spare */
+   uint16_t  len;                     /* length */
 #ifdef ALIGN_64BIT
-   U32  spare2;                  /* for 64 bit alignment */
+   uint32_t  spare2;                  /* for 64 bit alignment */
 #endif
-   U32  *val;                    /* string value- 4 byte alligned */ 
+   uint32_t  *val;                    /* string value- 4 byte alligned */ 
 } TknStrUNIXL;
 
 /* common packing functions */
-EXTERN S16 cmPkTknPres      ARGS((TknPres      *tknPres,       Buffer *mBuf));
-EXTERN S16 cmPkTknS16       ARGS((TknS16       *tknS16,        Buffer *mBuf));
-EXTERN S16 cmPkTknBStr32    ARGS((TknBStr32    *tknbStr32,     Buffer *mBuf));
-EXTERN S16 cmPkTknStr8      ARGS((TknStr8      *tknStr8,       Buffer *mBuf));
-EXTERN S16 cmPkTknStr16     ARGS((TknStr16     *tknStr16,      Buffer *mBuf));
-EXTERN S16 cmPkTknStrOSXL   ARGS((TknStrOSXL   *tknStrOSXL,    Buffer *mBuf));
-EXTERN S16 cmPkTknStrBSXL   ARGS((TknStrBSXL   *tknStrBSXL,    Buffer *mBuf));
-EXTERN S16 cmPkTknStrBMP4   ARGS((TknStrBMP4   *tknStrBMP4,    Buffer *mBuf));
-EXTERN S16 cmPkTknStrBMPXL  ARGS((TknStrBMPXL  *tknStrBMPXL,   Buffer *mBuf));
-EXTERN S16 cmPkTknStrUNI4   ARGS((TknStrUNI4   *tknStrUNI4,    Buffer *mBuf));
-EXTERN S16 cmPkTknStrUNIXL  ARGS((TknStrUNIXL  *tknStrUNIXL,   Buffer *mBuf));
+S16 cmPkTknPres      ARGS((TknPres      *tknPres,       Buffer *mBuf));
+S16 cmPkTknS16       ARGS((TknS16       *tknS16,        Buffer *mBuf));
+S16 cmPkTknBStr32    ARGS((TknBStr32    *tknbStr32,     Buffer *mBuf));
+S16 cmPkTknStr8      ARGS((TknStr8      *tknStr8,       Buffer *mBuf));
+S16 cmPkTknStr16     ARGS((TknStr16     *tknStr16,      Buffer *mBuf));
+S16 cmPkTknStrOSXL   ARGS((TknStrOSXL   *tknStrOSXL,    Buffer *mBuf));
+S16 cmPkTknStrBSXL   ARGS((TknStrBSXL   *tknStrBSXL,    Buffer *mBuf));
+S16 cmPkTknStrBMP4   ARGS((TknStrBMP4   *tknStrBMP4,    Buffer *mBuf));
+S16 cmPkTknStrBMPXL  ARGS((TknStrBMPXL  *tknStrBMPXL,   Buffer *mBuf));
+S16 cmPkTknStrUNI4   ARGS((TknStrUNI4   *tknStrUNI4,    Buffer *mBuf));
+S16 cmPkTknStrUNIXL  ARGS((TknStrUNIXL  *tknStrUNIXL,   Buffer *mBuf));
 
 
 \f
 /* common unpacking functions */
-EXTERN S16 cmUnpkTknPres      ARGS((TknPres      *tknPres,       Buffer *mBuf));
-EXTERN S16 cmUnpkTknS16       ARGS((TknS16       *tknS16,        Buffer *mBuf));
-EXTERN S16 cmUnpkTknBStr32    ARGS((TknBStr32    *tknBStr32,     Buffer *mBuf));
-EXTERN S16 cmUnpkTknStr8      ARGS((TknStr8      *tknStr8,       Buffer *mBuf));
-EXTERN S16 cmUnpkTknStr16     ARGS((TknStr16     *tknStr16,      Buffer *mBuf));
-EXTERN S16 cmUnpkTknStrOSXL   ARGS((TknStrOSXL   *tknStrOSXL,    Buffer *mBuf,
+S16 cmUnpkTknPres      ARGS((TknPres      *tknPres,       Buffer *mBuf));
+S16 cmUnpkTknS16       ARGS((TknS16       *tknS16,        Buffer *mBuf));
+S16 cmUnpkTknBStr32    ARGS((TknBStr32    *tknBStr32,     Buffer *mBuf));
+S16 cmUnpkTknStr8      ARGS((TknStr8      *tknStr8,       Buffer *mBuf));
+S16 cmUnpkTknStr16     ARGS((TknStr16     *tknStr16,      Buffer *mBuf));
+S16 cmUnpkTknStrOSXL   ARGS((TknStrOSXL   *tknStrOSXL,    Buffer *mBuf,
                                        Ptr ptr));
-EXTERN S16 cmUnpkTknStrBSXL   ARGS((TknStrBSXL   *tknStrBSXL,    Ptr ptr, 
+S16 cmUnpkTknStrBSXL   ARGS((TknStrBSXL   *tknStrBSXL,    Ptr ptr, 
                                        Buffer *mBuf));
-EXTERN S16 cmUnpkTknStrBMP4   ARGS((TknStrBMP4   *tknStrBMP4,    Buffer *mBuf));
-EXTERN S16 cmUnpkTknStrBMPXL  ARGS((TknStrBMPXL  *tknStrBMPXL,   Buffer *mBuf,
+S16 cmUnpkTknStrBMP4   ARGS((TknStrBMP4   *tknStrBMP4,    Buffer *mBuf));
+S16 cmUnpkTknStrBMPXL  ARGS((TknStrBMPXL  *tknStrBMPXL,   Buffer *mBuf,
                                        Ptr ptr));
-EXTERN S16 cmUnpkTknStrUNI4   ARGS((TknStrUNI4   *tknStrUNI4,    Buffer *mBuf));
-EXTERN S16 cmUnpkTknStrUNIXL  ARGS((TknStrUNIXL  *tknStrUNIXL,   Buffer *mBuf,
+S16 cmUnpkTknStrUNI4   ARGS((TknStrUNI4   *tknStrUNI4,    Buffer *mBuf));
+S16 cmUnpkTknStrUNIXL  ARGS((TknStrUNIXL  *tknStrUNIXL,   Buffer *mBuf,
                                        Ptr ptr));