Skip to content

O
OpenXG-RAN
Commit f875675d authored by Lionel Gauthier's avatar Lionel Gauthier
Browse files
Options

revert since last commit modified indentation #@ f k&r astyle 33 chars length #§%! 

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7134 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent fe9ab65d
Show whitespace changes
Inline Side-by-side
Showing with 3070 additions and 3073 deletions
openair3/RAL-LTE/INTERFACE-802.21/INCLUDE/MIH_C_Types.h
View file @ f875675d
...@@ -78,9 +78,7 @@ typedef u_int16_t MI ...@@ -78,9 +78,7 @@ typedef u_int16_t MI
/*! \struct MIH_C_BITMAP24_T /*! \struct MIH_C_BITMAP24_T
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
*/ */
typedef struct MIH_C_BITMAP24 { typedef struct MIH_C_BITMAP24 {u_int8_t val[3];}__attribute__((__packed__)) MIH_C_BITMAP24_T;
u_int8_t val[3];
} __attribute__((__packed__)) MIH_C_BITMAP24_T;
/*! \var typedef u_int32_t MIH_C_BITMAP32_T; /*! \var typedef u_int32_t MIH_C_BITMAP32_T;
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief A type definition for u_int32_t. * \brief A type definition for u_int32_t.
...@@ -93,22 +91,18 @@ typedef u_int64_t MI ...@@ -93,22 +91,18 @@ typedef u_int64_t MI
/*! \struct MIH_C_BITMAP128_T /*! \struct MIH_C_BITMAP128_T
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
*/ */
typedef struct MIH_C_BITMAP128 { typedef struct MIH_C_BITMAP128 {u_int64_t val[2];}__attribute__((__packed__)) MIH_C_BITMAP128_T;
u_int64_t val[2];
} __attribute__((__packed__)) MIH_C_BITMAP128_T;
/*! \struct MIH_C_BITMAP256_T /*! \struct MIH_C_BITMAP256_T
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
*/ */
typedef struct MIH_C_BITMAP256 { typedef struct MIH_C_BITMAP256 {u_int64_t val[4];}__attribute__((__packed__)) MIH_C_BITMAP256_T;
u_int64_t val[4];
} __attribute__((__packed__)) MIH_C_BITMAP256_T;
#ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C #ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C
/*! \def TYPEDEF_BITMAP6(DATA_TYPE_NAME) /*! \def TYPEDEF_BITMAP6(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP8_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP8_T.
*/ */
#define TYPEDEF_BITMAP6(DATA_TYPE_NAME) typedef MIH_C_BITMAP8_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP6(DATA_TYPE_NAME) typedef MIH_C_BITMAP8_T DATA_TYPE_NAME ## _T;\
void MIH_C_BITMAP8_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP);\ void MIH_C_BITMAP8_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP);\
void MIH_C_BITMAP8_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP);\ void MIH_C_BITMAP8_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP);\
inline unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\ inline unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\
...@@ -118,11 +112,11 @@ typedef struct MIH_C_BITMAP256 { ...@@ -118,11 +112,11 @@ typedef struct MIH_C_BITMAP256 {
MIH_C_BITMAP8_encode(bbP, bitmapP);};\ MIH_C_BITMAP8_encode(bbP, bitmapP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP8_decode(bbP, bitmapP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP8_decode(bbP, bitmapP);};
/*! \def TYPEDEF_BITMAP8(DATA_TYPE_NAME) /*! \def TYPEDEF_BITMAP8(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP8_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP8_T.
*/ */
#define TYPEDEF_BITMAP8(DATA_TYPE_NAME) typedef MIH_C_BITMAP8_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP8(DATA_TYPE_NAME) typedef MIH_C_BITMAP8_T DATA_TYPE_NAME ## _T;\
void MIH_C_BITMAP8_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP);\ void MIH_C_BITMAP8_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP);\
void MIH_C_BITMAP8_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP);\ void MIH_C_BITMAP8_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\
...@@ -132,11 +126,11 @@ typedef struct MIH_C_BITMAP256 { ...@@ -132,11 +126,11 @@ typedef struct MIH_C_BITMAP256 {
MIH_C_BITMAP8_encode(bbP, bitmapP);};\ MIH_C_BITMAP8_encode(bbP, bitmapP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP8_decode(bbP, bitmapP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP8_decode(bbP, bitmapP);};
/*! \def TYPEDEF_BITMAP16(DATA_TYPE_NAME) /*! \def TYPEDEF_BITMAP16(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP16_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP16_T.
*/ */
#define TYPEDEF_BITMAP16(DATA_TYPE_NAME) typedef MIH_C_BITMAP16_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP16(DATA_TYPE_NAME) typedef MIH_C_BITMAP16_T DATA_TYPE_NAME ## _T;\
void MIH_C_BITMAP16_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP16_T* dataP);\ void MIH_C_BITMAP16_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP16_T* dataP);\
void MIH_C_BITMAP16_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP16_T* dataP);\ void MIH_C_BITMAP16_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP16_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\
...@@ -146,11 +140,11 @@ typedef struct MIH_C_BITMAP256 { ...@@ -146,11 +140,11 @@ typedef struct MIH_C_BITMAP256 {
MIH_C_BITMAP16_encode(bbP, bitmapP);};\ MIH_C_BITMAP16_encode(bbP, bitmapP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP16_decode(bbP, bitmapP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP16_decode(bbP, bitmapP);};
/*! \def TYPEDEF_BITMAP20(DATA_TYPE_NAME) /*! \def TYPEDEF_BITMAP20(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP24_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP24_T.
*/ */
#define TYPEDEF_BITMAP20(DATA_TYPE_NAME) typedef MIH_C_BITMAP24_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP20(DATA_TYPE_NAME) typedef MIH_C_BITMAP24_T DATA_TYPE_NAME ## _T;\
void MIH_C_BITMAP24_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP24_T* dataP);\ void MIH_C_BITMAP24_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP24_T* dataP);\
void MIH_C_BITMAP24_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP24_T* dataP);\ void MIH_C_BITMAP24_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP24_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\
...@@ -160,11 +154,11 @@ typedef struct MIH_C_BITMAP256 { ...@@ -160,11 +154,11 @@ typedef struct MIH_C_BITMAP256 {
MIH_C_BITMAP24_encode(bbP, bitmapP);};\ MIH_C_BITMAP24_encode(bbP, bitmapP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP24_decode(bbP, bitmapP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP24_decode(bbP, bitmapP);};
/*! \def TYPEDEF_BITMAP32(DATA_TYPE_NAME) /*! \def TYPEDEF_BITMAP32(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP32_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP32_T.
*/ */
#define TYPEDEF_BITMAP32(DATA_TYPE_NAME) typedef MIH_C_BITMAP32_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP32(DATA_TYPE_NAME) typedef MIH_C_BITMAP32_T DATA_TYPE_NAME ## _T;\
void MIH_C_BITMAP32_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP32_T* dataP);\ void MIH_C_BITMAP32_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP32_T* dataP);\
void MIH_C_BITMAP32_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP32_T* dataP);\ void MIH_C_BITMAP32_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP32_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\
...@@ -174,11 +168,11 @@ typedef struct MIH_C_BITMAP256 { ...@@ -174,11 +168,11 @@ typedef struct MIH_C_BITMAP256 {
MIH_C_BITMAP32_encode(bbP, bitmapP);};\ MIH_C_BITMAP32_encode(bbP, bitmapP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP32_decode(bbP, bitmapP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP32_decode(bbP, bitmapP);};
/*! \def TYPEDEF_BITMAP64(DATA_TYPE_NAME) /*! \def TYPEDEF_BITMAP64(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP64_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP64_T.
*/ */
#define TYPEDEF_BITMAP64(DATA_TYPE_NAME) typedef MIH_C_BITMAP64_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP64(DATA_TYPE_NAME) typedef MIH_C_BITMAP64_T DATA_TYPE_NAME ## _T;\
void MIH_C_BITMAP64_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP64_T* dataP);\ void MIH_C_BITMAP64_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP64_T* dataP);\
void MIH_C_BITMAP64_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP64_T* dataP);\ void MIH_C_BITMAP64_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP64_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP) {\
...@@ -191,62 +185,62 @@ typedef struct MIH_C_BITMAP256 { ...@@ -191,62 +185,62 @@ typedef struct MIH_C_BITMAP256 {
MIH_C_BITMAP64_encode(bbP, bitmapP);};\ MIH_C_BITMAP64_encode(bbP, bitmapP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP64_decode(bbP, bitmapP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP64_decode(bbP, bitmapP);};
/*! \def TYPEDEF_BITMAP128(DATA_TYPE_NAME) /*! \def TYPEDEF_BITMAP128(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP128_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP128_T.
*/ */
#define TYPEDEF_BITMAP128(DATA_TYPE_NAME) typedef MIH_C_BITMAP128_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP128(DATA_TYPE_NAME) typedef MIH_C_BITMAP128_T DATA_TYPE_NAME ## _T;\
void MIH_C_BITMAP128_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP128_T* dataP);\ void MIH_C_BITMAP128_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP128_T* dataP);\
void MIH_C_BITMAP128_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP128_T* dataP);\ void MIH_C_BITMAP128_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP128_T* dataP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP128_encode(bbP, bitmapP);};\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP128_encode(bbP, bitmapP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP128_decode(bbP, bitmapP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP128_decode(bbP, bitmapP);};
/*! \def TYPEDEF_BITMAP256(DATA_TYPE_NAME) /*! \def TYPEDEF_BITMAP256(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP256_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_BITMAP256_T.
*/ */
#define TYPEDEF_BITMAP256(DATA_TYPE_NAME) typedef MIH_C_BITMAP256_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP256(DATA_TYPE_NAME) typedef MIH_C_BITMAP256_T DATA_TYPE_NAME ## _T;\
void MIH_C_BITMAP256_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP);\ void MIH_C_BITMAP256_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP);\
void MIH_C_BITMAP256_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP);\ void MIH_C_BITMAP256_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP256_encode(bbP, bitmapP);};\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP256_encode(bbP, bitmapP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP256_decode(bbP, bitmapP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *bitmapP) {MIH_C_BITMAP256_decode(bbP, bitmapP);};
#else #else
#define TYPEDEF_BITMAP6(DATA_TYPE_NAME) typedef MIH_C_BITMAP8_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP6(DATA_TYPE_NAME) typedef MIH_C_BITMAP8_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);
#define TYPEDEF_BITMAP8(DATA_TYPE_NAME) typedef MIH_C_BITMAP8_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP8(DATA_TYPE_NAME) typedef MIH_C_BITMAP8_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);
#define TYPEDEF_BITMAP16(DATA_TYPE_NAME) typedef MIH_C_BITMAP16_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP16(DATA_TYPE_NAME) typedef MIH_C_BITMAP16_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);
#define TYPEDEF_BITMAP20(DATA_TYPE_NAME) typedef MIH_C_BITMAP24_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP20(DATA_TYPE_NAME) typedef MIH_C_BITMAP24_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);
#define TYPEDEF_BITMAP32(DATA_TYPE_NAME) typedef MIH_C_BITMAP32_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP32(DATA_TYPE_NAME) typedef MIH_C_BITMAP32_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);
#define TYPEDEF_BITMAP64(DATA_TYPE_NAME) typedef MIH_C_BITMAP64_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP64(DATA_TYPE_NAME) typedef MIH_C_BITMAP64_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *bitmapP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);
#define TYPEDEF_BITMAP128(DATA_TYPE_NAME) typedef MIH_C_BITMAP128_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP128(DATA_TYPE_NAME) typedef MIH_C_BITMAP128_T DATA_TYPE_NAME ## _T;\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);
#define TYPEDEF_BITMAP256(DATA_TYPE_NAME) typedef MIH_C_BITMAP256_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BITMAP256(DATA_TYPE_NAME) typedef MIH_C_BITMAP256_T DATA_TYPE_NAME ## _T;\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T* bitmapP);
#endif #endif
...@@ -291,11 +285,11 @@ typedef int32_t MIH_C_INTEGER4_T; ...@@ -291,11 +285,11 @@ typedef int32_t MIH_C_INTEGER4_T;
typedef int64_t MIH_C_INTEGER8_T; typedef int64_t MIH_C_INTEGER8_T;
#ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C #ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C
/*! \def TYPEDEF_INTEGER1(DATA_TYPE_NAME) /*! \def TYPEDEF_INTEGER1(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_INTEGER1_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_INTEGER1_T.
*/ */
#define TYPEDEF_INTEGER1(DATA_TYPE_NAME) typedef MIH_C_INTEGER1_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_INTEGER1(DATA_TYPE_NAME) typedef MIH_C_INTEGER1_T DATA_TYPE_NAME ## _T;\
void MIH_C_INTEGER1_encode(Bit_Buffer_t* bbP, MIH_C_INTEGER1_T* dataP);\ void MIH_C_INTEGER1_encode(Bit_Buffer_t* bbP, MIH_C_INTEGER1_T* dataP);\
void MIH_C_INTEGER1_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER1_T* dataP);\ void MIH_C_INTEGER1_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER1_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\
...@@ -307,11 +301,11 @@ typedef int64_t MIH_C_INTEGER8_T; ...@@ -307,11 +301,11 @@ typedef int64_t MIH_C_INTEGER8_T;
MIH_C_INTEGER1_decode(bbP, (MIH_C_INTEGER1_T*)dataP);\ MIH_C_INTEGER1_decode(bbP, (MIH_C_INTEGER1_T*)dataP);\
}; };
/*! \def TYPEDEF_INTEGER2(DATA_TYPE_NAME) /*! \def TYPEDEF_INTEGER2(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_INTEGER2_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_INTEGER2_T.
*/ */
#define TYPEDEF_INTEGER2(DATA_TYPE_NAME) typedef MIH_C_INTEGER2_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_INTEGER2(DATA_TYPE_NAME) typedef MIH_C_INTEGER2_T DATA_TYPE_NAME ## _T;\
void MIH_C_INTEGER2_encode(Bit_Buffer_t* bbP, MIH_C_INTEGER2_T* dataP);\ void MIH_C_INTEGER2_encode(Bit_Buffer_t* bbP, MIH_C_INTEGER2_T* dataP);\
void MIH_C_INTEGER2_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER2_T* dataP);\ void MIH_C_INTEGER2_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER2_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\
...@@ -323,11 +317,11 @@ typedef int64_t MIH_C_INTEGER8_T; ...@@ -323,11 +317,11 @@ typedef int64_t MIH_C_INTEGER8_T;
MIH_C_INTEGER2_decode(bbP, (MIH_C_INTEGER2_T*)dataP);\ MIH_C_INTEGER2_decode(bbP, (MIH_C_INTEGER2_T*)dataP);\
}; };
/*! \def TYPEDEF_INTEGER4(DATA_TYPE_NAME) /*! \def TYPEDEF_INTEGER4(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_INTEGER4_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_INTEGER4_T.
*/ */
#define TYPEDEF_INTEGER4(DATA_TYPE_NAME) typedef MIH_C_INTEGER4_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_INTEGER4(DATA_TYPE_NAME) typedef MIH_C_INTEGER4_T DATA_TYPE_NAME ## _T;\
void MIH_C_INTEGER4_encode(Bit_Buffer_t* bbP, MIH_C_INTEGER4_T* dataP);\ void MIH_C_INTEGER4_encode(Bit_Buffer_t* bbP, MIH_C_INTEGER4_T* dataP);\
void MIH_C_INTEGER4_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER4_T* dataP);\ void MIH_C_INTEGER4_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER4_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\
...@@ -339,11 +333,11 @@ typedef int64_t MIH_C_INTEGER8_T; ...@@ -339,11 +333,11 @@ typedef int64_t MIH_C_INTEGER8_T;
MIH_C_INTEGER4_decode(bbP, (MIH_C_INTEGER4_T*)dataP);\ MIH_C_INTEGER4_decode(bbP, (MIH_C_INTEGER4_T*)dataP);\
}; };
/*! \def TYPEDEF_INTEGER8(DATA_TYPE_NAME) /*! \def TYPEDEF_INTEGER8(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_INTEGER48T. * \brief Defines DATA_TYPE_NAME as a MIH_C_INTEGER48T.
*/ */
#define TYPEDEF_INTEGER8(DATA_TYPE_NAME) typedef MIH_C_INTEGER8_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_INTEGER8(DATA_TYPE_NAME) typedef MIH_C_INTEGER8_T DATA_TYPE_NAME ## _T;\
void MIH_C_INTEGER8_encode(Bit_Buffer_t* bbP, MIH_C_INTEGER8_T* dataP);\ void MIH_C_INTEGER8_encode(Bit_Buffer_t* bbP, MIH_C_INTEGER8_T* dataP);\
void MIH_C_INTEGER8_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER8_T* dataP);\ void MIH_C_INTEGER8_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER8_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\
...@@ -358,22 +352,22 @@ typedef int64_t MIH_C_INTEGER8_T; ...@@ -358,22 +352,22 @@ typedef int64_t MIH_C_INTEGER8_T;
MIH_C_INTEGER8_decode(bbP, (MIH_C_INTEGER8_T*)dataP);\ MIH_C_INTEGER8_decode(bbP, (MIH_C_INTEGER8_T*)dataP);\
}; };
#else #else
#define TYPEDEF_INTEGER1(DATA_TYPE_NAME) typedef MIH_C_INTEGER1_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_INTEGER1(DATA_TYPE_NAME) typedef MIH_C_INTEGER1_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
#define TYPEDEF_INTEGER2(DATA_TYPE_NAME) typedef MIH_C_INTEGER2_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_INTEGER2(DATA_TYPE_NAME) typedef MIH_C_INTEGER2_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
#define TYPEDEF_INTEGER4(DATA_TYPE_NAME) typedef MIH_C_INTEGER4_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_INTEGER4(DATA_TYPE_NAME) typedef MIH_C_INTEGER4_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
#define TYPEDEF_INTEGER8(DATA_TYPE_NAME) typedef MIH_C_INTEGER8_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_INTEGER8(DATA_TYPE_NAME) typedef MIH_C_INTEGER8_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
...@@ -420,11 +414,11 @@ typedef u_int32_t MIH_C_UNSIGNED_INT4_T; ...@@ -420,11 +414,11 @@ typedef u_int32_t MIH_C_UNSIGNED_INT4_T;
typedef u_int64_t MIH_C_UNSIGNED_INT8_T; typedef u_int64_t MIH_C_UNSIGNED_INT8_T;
#ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C #ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C
/*! \def TYPEDEF_UNSIGNED_INT1(DATA_TYPE_NAME) /*! \def TYPEDEF_UNSIGNED_INT1(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_UNSIGNED_INT1_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_UNSIGNED_INT1_T.
*/ */
#define TYPEDEF_UNSIGNED_INT1(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT1_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_UNSIGNED_INT1(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT1_T DATA_TYPE_NAME ## _T;\
void MIH_C_UNSIGNED_INT1_encode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT1_T* dataP);\ void MIH_C_UNSIGNED_INT1_encode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT1_T* dataP);\
void MIH_C_UNSIGNED_INT1_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT1_T* dataP);\ void MIH_C_UNSIGNED_INT1_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT1_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\
...@@ -436,11 +430,11 @@ typedef u_int64_t MIH_C_UNSIGNED_INT8_T; ...@@ -436,11 +430,11 @@ typedef u_int64_t MIH_C_UNSIGNED_INT8_T;
MIH_C_UNSIGNED_INT1_decode(bbP, dataP);\ MIH_C_UNSIGNED_INT1_decode(bbP, dataP);\
}; };
/*! \def TYPEDEF_UNSIGNED_INT2(DATA_TYPE_NAME) /*! \def TYPEDEF_UNSIGNED_INT2(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_UNSIGNED_INT2_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_UNSIGNED_INT2_T.
*/ */
#define TYPEDEF_UNSIGNED_INT2(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT2_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_UNSIGNED_INT2(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT2_T DATA_TYPE_NAME ## _T;\
void MIH_C_UNSIGNED_INT2_encode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT2_T* dataP);\ void MIH_C_UNSIGNED_INT2_encode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT2_T* dataP);\
void MIH_C_UNSIGNED_INT2_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT2_T* dataP);\ void MIH_C_UNSIGNED_INT2_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT2_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\
...@@ -452,11 +446,11 @@ typedef u_int64_t MIH_C_UNSIGNED_INT8_T; ...@@ -452,11 +446,11 @@ typedef u_int64_t MIH_C_UNSIGNED_INT8_T;
MIH_C_UNSIGNED_INT2_decode(bbP, dataP);\ MIH_C_UNSIGNED_INT2_decode(bbP, dataP);\
}; };
/*! \def TYPEDEF_UNSIGNED_INT4(DATA_TYPE_NAME) /*! \def TYPEDEF_UNSIGNED_INT4(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_UNSIGNED_INT4_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_UNSIGNED_INT4_T.
*/ */
#define TYPEDEF_UNSIGNED_INT4(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT4_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_UNSIGNED_INT4(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT4_T DATA_TYPE_NAME ## _T;\
void MIH_C_UNSIGNED_INT4_encode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT4_T* dataP);\ void MIH_C_UNSIGNED_INT4_encode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT4_T* dataP);\
void MIH_C_UNSIGNED_INT4_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT4_T* dataP);\ void MIH_C_UNSIGNED_INT4_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT4_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\
...@@ -468,11 +462,11 @@ typedef u_int64_t MIH_C_UNSIGNED_INT8_T; ...@@ -468,11 +462,11 @@ typedef u_int64_t MIH_C_UNSIGNED_INT8_T;
MIH_C_UNSIGNED_INT4_decode(bbP, dataP);\ MIH_C_UNSIGNED_INT4_decode(bbP, dataP);\
}; };
/*! \def TYPEDEF_UNSIGNED_INT8(DATA_TYPE_NAME) /*! \def TYPEDEF_UNSIGNED_INT8(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a MIH_C_UNSIGNED_INT8_T. * \brief Defines DATA_TYPE_NAME as a MIH_C_UNSIGNED_INT8_T.
*/ */
#define TYPEDEF_UNSIGNED_INT8(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT8_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_UNSIGNED_INT8(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT8_T DATA_TYPE_NAME ## _T;\
void MIH_C_UNSIGNED_INT8_encode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT8_T* dataP);\ void MIH_C_UNSIGNED_INT8_encode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT8_T* dataP);\
void MIH_C_UNSIGNED_INT8_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT8_T* dataP);\ void MIH_C_UNSIGNED_INT8_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT8_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP) {\
...@@ -484,22 +478,22 @@ typedef u_int64_t MIH_C_UNSIGNED_INT8_T; ...@@ -484,22 +478,22 @@ typedef u_int64_t MIH_C_UNSIGNED_INT8_T;
MIH_C_UNSIGNED_INT8_decode(bbP, dataP);\ MIH_C_UNSIGNED_INT8_decode(bbP, dataP);\
}; };
#else #else
#define TYPEDEF_UNSIGNED_INT1(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT1_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_UNSIGNED_INT1(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT1_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
#define TYPEDEF_UNSIGNED_INT2(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT2_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_UNSIGNED_INT2(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT2_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
#define TYPEDEF_UNSIGNED_INT4(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT4_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_UNSIGNED_INT4(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT4_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
#define TYPEDEF_UNSIGNED_INT8(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT8_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_UNSIGNED_INT8(DATA_TYPE_NAME) typedef MIH_C_UNSIGNED_INT8_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* buffP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
...@@ -532,7 +526,7 @@ void MIH_C_LIST_LENGTH_decode(Bit_Buffer_t *bbP, u_int16_t *lengthP); ...@@ -532,7 +526,7 @@ void MIH_C_LIST_LENGTH_decode(Bit_Buffer_t *bbP, u_int16_t *lengthP);
u_int16_t MIH_C_LIST_LENGTH_get_encode_length(u_int16_t lengthP); u_int16_t MIH_C_LIST_LENGTH_get_encode_length(u_int16_t lengthP);
#ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C #ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C
/*! \def TYPEDEF_LIST(DATA_TYPE_NAME, MAX_LENGTH) /*! \def TYPEDEF_LIST(DATA_TYPE_NAME, MAX_LENGTH)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a LIST of MAX_LENGTH elements of DATA_TYPE_NAME type, and its functions for de/serializing this type. * \brief Defines DATA_TYPE_NAME as a LIST of MAX_LENGTH elements of DATA_TYPE_NAME type, and its functions for de/serializing this type.
*/ */
...@@ -593,7 +587,7 @@ u_int16_t MIH_C_LIST_LENGTH_get_encode_length(u_int16_t lengthP); ...@@ -593,7 +587,7 @@ u_int16_t MIH_C_LIST_LENGTH_get_encode_length(u_int16_t lengthP);
//----------------------- OCTET(size) ----------------------------------------- //----------------------- OCTET(size) -----------------------------------------
#ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C #ifdef MIH_C_F1_BASIC_DATA_TYPES_CODEC_C
/*! \def TYPEDEF_OCTET(DATA_TYPE_NAME, MAX_LENGTH) /*! \def TYPEDEF_OCTET(DATA_TYPE_NAME, MAX_LENGTH)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a LIST of MAX_LENGTH octet elements, and its functions for de/serializing this type. * \brief Defines DATA_TYPE_NAME as a LIST of MAX_LENGTH octet elements, and its functions for de/serializing this type.
*/ */
...@@ -626,18 +620,18 @@ u_int16_t MIH_C_LIST_LENGTH_get_encode_length(u_int16_t lengthP); ...@@ -626,18 +620,18 @@ u_int16_t MIH_C_LIST_LENGTH_get_encode_length(u_int16_t lengthP);
TYPEDEF_UNSIGNED_INT1(MIH_C_ENUMERATED) TYPEDEF_UNSIGNED_INT1(MIH_C_ENUMERATED)
#ifdef MIH_C_F2_GENERAL_DATA_TYPES_CODEC_C #ifdef MIH_C_F2_GENERAL_DATA_TYPES_CODEC_C
/*! \def TYPEDEF_ENUMERATED(DATA_TYPE_NAME) /*! \def TYPEDEF_ENUMERATED(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as MIH_C_ENUMERATED_T, and its functions for de/serializing this type. * \brief Defines DATA_TYPE_NAME as MIH_C_ENUMERATED_T, and its functions for de/serializing this type.
*/ */
#define TYPEDEF_ENUMERATED(DATA_TYPE_NAME) typedef MIH_C_ENUMERATED_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_ENUMERATED(DATA_TYPE_NAME) typedef MIH_C_ENUMERATED_T DATA_TYPE_NAME ## _T;\
void MIH_C_ENUMERATED_encode(Bit_Buffer_t* bbP, MIH_C_ENUMERATED_T* dataP);\ void MIH_C_ENUMERATED_encode(Bit_Buffer_t* bbP, MIH_C_ENUMERATED_T* dataP);\
void MIH_C_ENUMERATED_decode(Bit_Buffer_t* bbP, MIH_C_ENUMERATED_T* dataP);\ void MIH_C_ENUMERATED_decode(Bit_Buffer_t* bbP, MIH_C_ENUMERATED_T* dataP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP) {\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP) {\
MIH_C_ENUMERATED_encode(bbP, dataP);};\ MIH_C_ENUMERATED_encode(bbP, dataP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP) {MIH_C_ENUMERATED_decode(bbP, dataP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP) {MIH_C_ENUMERATED_decode(bbP, dataP);};
#else #else
#define TYPEDEF_ENUMERATED(DATA_TYPE_NAME) typedef MIH_C_ENUMERATED_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_ENUMERATED(DATA_TYPE_NAME) typedef MIH_C_ENUMERATED_T DATA_TYPE_NAME ## _T;\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
#endif #endif
...@@ -655,11 +649,11 @@ TYPEDEF_ENUMERATED(MIH_C_BOOLEAN) ...@@ -655,11 +649,11 @@ TYPEDEF_ENUMERATED(MIH_C_BOOLEAN)
#define MIH_C_BOOLEAN_TRUE (MIH_C_ENUMERATED_T)1 #define MIH_C_BOOLEAN_TRUE (MIH_C_ENUMERATED_T)1
#define MIH_C_BOOLEAN_FALSE (MIH_C_ENUMERATED_T)0 #define MIH_C_BOOLEAN_FALSE (MIH_C_ENUMERATED_T)0
#ifdef MIH_C_F2_GENERAL_DATA_TYPES_CODEC_C #ifdef MIH_C_F2_GENERAL_DATA_TYPES_CODEC_C
/*! \def TYPEDEF_BOOLEAN(DATA_TYPE_NAME) /*! \def TYPEDEF_BOOLEAN(DATA_TYPE_NAME)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as MIH_C_BOOLEAN_T, and its functions for de/serializing this type. * \brief Defines DATA_TYPE_NAME as MIH_C_BOOLEAN_T, and its functions for de/serializing this type.
*/ */
#define TYPEDEF_BOOLEAN(DATA_TYPE_NAME) typedef MIH_C_BOOLEAN_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BOOLEAN(DATA_TYPE_NAME) typedef MIH_C_BOOLEAN_T DATA_TYPE_NAME ## _T;\
void MIH_C_BOOLEAN_encode(Bit_Buffer_t* bbP, MIH_C_BOOLEAN_T* dataP);\ void MIH_C_BOOLEAN_encode(Bit_Buffer_t* bbP, MIH_C_BOOLEAN_T* dataP);\
void MIH_C_BOOLEAN_decode(Bit_Buffer_t* bbP, MIH_C_BOOLEAN_T* dataP);\ void MIH_C_BOOLEAN_decode(Bit_Buffer_t* bbP, MIH_C_BOOLEAN_T* dataP);\
unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* bufP) {\ unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* bufP) {\
...@@ -675,7 +669,7 @@ TYPEDEF_ENUMERATED(MIH_C_BOOLEAN) ...@@ -675,7 +669,7 @@ TYPEDEF_ENUMERATED(MIH_C_BOOLEAN)
MIH_C_BOOLEAN_encode(bbP, dataP);};\ MIH_C_BOOLEAN_encode(bbP, dataP);};\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP) {MIH_C_ENUMERATED_decode(bbP, dataP);}; void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP) {MIH_C_ENUMERATED_decode(bbP, dataP);};
#else #else
#define TYPEDEF_BOOLEAN(DATA_TYPE_NAME) typedef MIH_C_BOOLEAN_T DATA_TYPE_NAME ## _T;\ #define TYPEDEF_BOOLEAN(DATA_TYPE_NAME) typedef MIH_C_BOOLEAN_T DATA_TYPE_NAME ## _T;\
extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* bufP);\ extern unsigned int DATA_TYPE_NAME ## 2String(DATA_TYPE_NAME ## _T *dataP, char* bufP);\
void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\ void DATA_TYPE_NAME ## _encode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);\
void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP); void DATA_TYPE_NAME ## _decode(Bit_Buffer_t *bbP, DATA_TYPE_NAME ## _T *dataP);
...@@ -690,7 +684,7 @@ TYPEDEF_ENUMERATED(MIH_C_BOOLEAN) ...@@ -690,7 +684,7 @@ TYPEDEF_ENUMERATED(MIH_C_BOOLEAN)
//----------------------- OCTET_STRING ---------------------------------------- //----------------------- OCTET_STRING ----------------------------------------
#ifdef MIH_C_F2_GENERAL_DATA_TYPES_CODEC_C #ifdef MIH_C_F2_GENERAL_DATA_TYPES_CODEC_C
/*! \def TYPEDEF_OCTET_STRING(DATA_TYPE_NAME, MAX_LENGTH) /*! \def TYPEDEF_OCTET_STRING(DATA_TYPE_NAME, MAX_LENGTH)
* \ingroup MIH_C_F1_BASIC_DATA_TYPES * \ingroup MIH_C_F1_BASIC_DATA_TYPES
* \brief Defines DATA_TYPE_NAME as a LIST of MAX_LENGTH char elements, and its functions for de/serializing this type. * \brief Defines DATA_TYPE_NAME as a LIST of MAX_LENGTH char elements, and its functions for de/serializing this type.
*/ */
...@@ -895,7 +889,7 @@ typedef enum { ...@@ -895,7 +889,7 @@ typedef enum {
MIH_C_CHOICE_3GPP_ADDR, MIH_C_CHOICE_3GPP_ADDR,
MIH_C_CHOICE_3GPP2_ADDR, MIH_C_CHOICE_3GPP2_ADDR,
MIH_C_CHOICE_OTHER_L2_ADDR MIH_C_CHOICE_OTHER_L2_ADDR
} MIH_C_LINK_ADDR_CHOICE_ENUM_T; } MIH_C_LINK_ADDR_CHOICE_ENUM_T;
//------------------------------------------- //-------------------------------------------
/*! \struct MIH_C_LINK_ADDR /*! \struct MIH_C_LINK_ADDR
* \ingroup MIH_C_F3_DATA_TYPES_FOR_ADDRESS_CODEC * \ingroup MIH_C_F3_DATA_TYPES_FOR_ADDRESS_CODEC
...@@ -2384,7 +2378,8 @@ TYPEDEF_INTEGER4(MIH_C_EIRP) ...@@ -2384,7 +2378,8 @@ TYPEDEF_INTEGER4(MIH_C_EIRP)
* The UNSIGNED_INT(2) is used for the TTG - transmit/receive transition gap. * The UNSIGNED_INT(2) is used for the TTG - transmit/receive transition gap.
* The UNSIGNED_INT(1) is used for the RTG - receive/transmit transition gap. * The UNSIGNED_INT(1) is used for the RTG - receive/transmit transition gap.
*/ */
typedef struct MIH_C_GAP { typedef struct MIH_C_GAP
{
UNSIGNED_INT2(ttg); UNSIGNED_INT2(ttg);
UNSIGNED_INT1(rtg); UNSIGNED_INT1(rtg);
} MIH_C_GAP_T; } MIH_C_GAP_T;
...@@ -2479,7 +2474,8 @@ typedef MIH_C_IP_ADDR_T MIH_C_ACC_RTR_T; ...@@ -2479,7 +2474,8 @@ typedef MIH_C_IP_ADDR_T MIH_C_ACC_RTR_T;
* \ingroup MIH_C_F13_DATA_TYPES_FOR_INFORMATION_ELEMENTS * \ingroup MIH_C_F13_DATA_TYPES_FOR_INFORMATION_ELEMENTS
* \brief IP Configuration Methods supported by the access network. * \brief IP Configuration Methods supported by the access network.
*/ */
typedef struct MIH_C_IP_CONFIG { typedef struct MIH_C_IP_CONFIG
{
MIH_C_IP_CFG_MTHDS_T ip_cfg_mthds; MIH_C_IP_CFG_MTHDS_T ip_cfg_mthds;
MIH_C_CHOICE_T choice_dhcp_serv; MIH_C_CHOICE_T choice_dhcp_serv;
union { union {
...@@ -2539,7 +2535,8 @@ TYPEDEF_BITMAP64(MIH_C_SUBTYPE) ...@@ -2539,7 +2535,8 @@ TYPEDEF_BITMAP64(MIH_C_SUBTYPE)
* \brief A type to represent a network type and its subtype. * \brief A type to represent a network type and its subtype.
* See Table F.14 for details. * See Table F.14 for details.
*/ */
typedef struct MIH_C_NETWORK_TYPE { typedef struct MIH_C_NETWORK_TYPE
{
MIH_C_CHOICE_T choice_link_type; MIH_C_CHOICE_T choice_link_type;
union { union {
MIH_C_NULL_T null_attr; MIH_C_NULL_T null_attr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment