Commit 8073aefe authored by knopp's avatar knopp
Browse files

applied patches from S. Held, addition of scansim.c and PHY files for UE band scanning

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6475 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 2ff16039
...@@ -222,9 +222,9 @@ void openair_rrc_top_init(int eMBMS_active, char *uecap_xer, uint8_t cba_group_a ...@@ -222,9 +222,9 @@ void openair_rrc_top_init(int eMBMS_active, char *uecap_xer, uint8_t cba_group_a
// fill UE capability // fill UE capability
UECap = fill_ue_capability (uecap_xer); UECap = fill_ue_capability (uecap_xer);
UE_rrc_inst[module_id].UECap = UECap;
for (module_id = 0; module_id < NB_UE_INST; module_id++) { for (module_id = 0; module_id < NB_UE_INST; module_id++) {
UE_rrc_inst[module_id].UECap = UECap;
UE_rrc_inst[module_id].UECapability = UECap->sdu; UE_rrc_inst[module_id].UECapability = UECap->sdu;
UE_rrc_inst[module_id].UECapability_size = UECap->sdu_size; UE_rrc_inst[module_id].UECapability_size = UECap->sdu_size;
} }
......
...@@ -37,12 +37,12 @@ unsigned int MIH_C_BITMAP82String(MIH_C_BITMAP8_T* dataP, char* bufP) { ...@@ -37,12 +37,12 @@ unsigned int MIH_C_BITMAP82String(MIH_C_BITMAP8_T* dataP, char* bufP) {
return sprintf(bufP, "0x%02X", *dataP); return sprintf(bufP, "0x%02X", *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
printf("[MIH_C] %s: %02X\n", __FUNCTION__, *dataP); printf("[MIH_C] %s: %02X\n", __FUNCTION__, *dataP);
BitBuffer_write8(bbP, *dataP); BitBuffer_write8(bbP, *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
printf("[MIH_C] %s: %04X\n", __FUNCTION__, *dataP); printf("[MIH_C] %s: %04X\n", __FUNCTION__, *dataP);
BitBuffer_write16(bbP, *dataP); BitBuffer_write16(bbP, *dataP);
} }
...@@ -52,7 +52,7 @@ unsigned int MIH_C_BITMAP162String(MIH_C_BITMAP16_T* dataP, char* bufP) { ...@@ -52,7 +52,7 @@ unsigned int MIH_C_BITMAP162String(MIH_C_BITMAP16_T* dataP, char* bufP) {
return sprintf(bufP, "0x%04X", *dataP); return sprintf(bufP, "0x%04X", *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
printf("[MIH_C] %s: %02X%02X%02X\n", __FUNCTION__, dataP->val[0],dataP->val[1], dataP->val[2]); printf("[MIH_C] %s: %02X%02X%02X\n", __FUNCTION__, dataP->val[0],dataP->val[1], dataP->val[2]);
MIH_C_BITMAP8_encode(bbP, &dataP->val[0]); MIH_C_BITMAP8_encode(bbP, &dataP->val[0]);
...@@ -65,26 +65,26 @@ unsigned int MIH_C_BITMAP242String(MIH_C_BITMAP24_T* dataP, char* bufP) { ...@@ -65,26 +65,26 @@ unsigned int MIH_C_BITMAP242String(MIH_C_BITMAP24_T* dataP, char* bufP) {
return sprintf(bufP, "0x%02X%02X%02X", dataP->val[0], dataP->val[1], dataP->val[2]); return sprintf(bufP, "0x%02X%02X%02X", dataP->val[0], dataP->val[1], dataP->val[2]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
printf("[MIH_C] %s: %08X\n", __FUNCTION__, *dataP); printf("[MIH_C] %s: %08X\n", __FUNCTION__, *dataP);
BitBuffer_write32(bbP, *dataP); BitBuffer_write32(bbP, *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
printf("[MIH_C] %s: %16X\n", __FUNCTION__, *dataP); printf("[MIH_C] %s: %16X\n", __FUNCTION__, *dataP);
BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)(*dataP>>32)); BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)(*dataP>>32));
BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)*dataP); BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)*dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
printf("[MIH_C] %s: %16X%16X\n", __FUNCTION__, dataP->val[0], dataP->val[1]); printf("[MIH_C] %s: %16X%16X\n", __FUNCTION__, dataP->val[0], dataP->val[1]);
MIH_C_BITMAP64_encode(bbP, &dataP->val[0]); MIH_C_BITMAP64_encode(bbP, &dataP->val[0]);
MIH_C_BITMAP64_encode(bbP, &dataP->val[1]); MIH_C_BITMAP64_encode(bbP, &dataP->val[1]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
printf("[MIH_C] %s: %16X%16X%16X%16X\n", __FUNCTION__, dataP->val[0], dataP->val[1], dataP->val[2], dataP->val[3]); printf("[MIH_C] %s: %16X%16X%16X%16X\n", __FUNCTION__, dataP->val[0], dataP->val[1], dataP->val[2], dataP->val[3]);
MIH_C_BITMAP64_encode(bbP, &dataP->val[0]); MIH_C_BITMAP64_encode(bbP, &dataP->val[0]);
...@@ -93,40 +93,40 @@ inline void MIH_C_BITMAP256_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP) ...@@ -93,40 +93,40 @@ inline void MIH_C_BITMAP256_encode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP)
MIH_C_BITMAP64_encode(bbP, &dataP->val[3]); MIH_C_BITMAP64_encode(bbP, &dataP->val[3]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_CHOICE_encode(Bit_Buffer_t* bbP, MIH_C_CHOICE_T* dataP) { void MIH_C_CHOICE_encode(Bit_Buffer_t* bbP, MIH_C_CHOICE_T* dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_write8(bbP, *dataP); BitBuffer_write8(bbP, *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_write8(bbP, *dataP); BitBuffer_write8(bbP, *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_write16(bbP, *dataP); BitBuffer_write16(bbP, *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_write32(bbP, *dataP); BitBuffer_write32(bbP, *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)(*dataP>>32)); BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)(*dataP>>32));
BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)*dataP); BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)*dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_NULL_encode(Bit_Buffer_t* bbP, MIH_C_NULL_T* dataP) {;} void MIH_C_NULL_encode(Bit_Buffer_t* bbP, MIH_C_NULL_T* dataP) {;}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_OCTET_encode(Bit_Buffer_t* bbP, MIH_C_F1_Generic_Octet_t *dataP, int lengthP) { void MIH_C_OCTET_encode(Bit_Buffer_t* bbP, MIH_C_F1_Generic_Octet_t *dataP, int lengthP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_writeMem(bbP, dataP->val, lengthP); BitBuffer_writeMem(bbP, dataP->val, lengthP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
printf("[MIH_C] %s: %02X\n", __FUNCTION__, *dataP); printf("[MIH_C] %s: %02X\n", __FUNCTION__, *dataP);
BitBuffer_write8(bbP, *dataP); BitBuffer_write8(bbP, *dataP);
} }
...@@ -136,7 +136,7 @@ unsigned int MIH_C_UNSIGNED_INT12String(MIH_C_UNSIGNED_INT1_T* dataP, char* bufP ...@@ -136,7 +136,7 @@ unsigned int MIH_C_UNSIGNED_INT12String(MIH_C_UNSIGNED_INT1_T* dataP, char* bufP
return sprintf(bufP, "0x%02X", *dataP); return sprintf(bufP, "0x%02X", *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_write16(bbP, *dataP); BitBuffer_write16(bbP, *dataP);
} }
...@@ -146,7 +146,7 @@ unsigned int MIH_C_UNSIGNED_INT22String(MIH_C_UNSIGNED_INT2_T* dataP, char* bufP ...@@ -146,7 +146,7 @@ unsigned int MIH_C_UNSIGNED_INT22String(MIH_C_UNSIGNED_INT2_T* dataP, char* bufP
return sprintf(bufP, "0x%04X", *dataP); return sprintf(bufP, "0x%04X", *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_write32(bbP, *dataP); BitBuffer_write32(bbP, *dataP);
} }
...@@ -156,7 +156,7 @@ unsigned int MIH_C_UNSIGNED_INT42String(MIH_C_UNSIGNED_INT4_T* dataP, char* bufP ...@@ -156,7 +156,7 @@ unsigned int MIH_C_UNSIGNED_INT42String(MIH_C_UNSIGNED_INT4_T* dataP, char* bufP
return sprintf(bufP, "0x%08X", *dataP); return sprintf(bufP, "0x%08X", *dataP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)(*dataP>>32)); BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)(*dataP>>32));
BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)*dataP); BitBuffer_write32(bbP, (MIH_C_UNSIGNED_INT4_T)*dataP);
...@@ -170,33 +170,33 @@ unsigned int MIH_C_UNSIGNED_INT82String(MIH_C_UNSIGNED_INT8_T* dataP, char* bufP ...@@ -170,33 +170,33 @@ unsigned int MIH_C_UNSIGNED_INT82String(MIH_C_UNSIGNED_INT8_T* dataP, char* bufP
return buffer_index;\ return buffer_index;\
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_BITMAP8_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP) {*dataP = BitBuffer_read(bbP, 8);} void MIH_C_BITMAP8_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP8_T* dataP) {*dataP = BitBuffer_read(bbP, 8);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_BITMAP16_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP16_T* dataP) {*dataP = BitBuffer_read(bbP, 16);} void MIH_C_BITMAP16_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP16_T* dataP) {*dataP = BitBuffer_read(bbP, 16);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_BITMAP8_decode(bbP, &dataP->val[0]); MIH_C_BITMAP8_decode(bbP, &dataP->val[0]);
MIH_C_BITMAP8_decode(bbP, &dataP->val[1]); MIH_C_BITMAP8_decode(bbP, &dataP->val[1]);
MIH_C_BITMAP8_decode(bbP, &dataP->val[2]); MIH_C_BITMAP8_decode(bbP, &dataP->val[2]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_BITMAP32_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP32_T* dataP) {*dataP = BitBuffer_read(bbP, 32);} void MIH_C_BITMAP32_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP32_T* dataP) {*dataP = BitBuffer_read(bbP, 32);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
*dataP = BitBuffer_read(bbP, 32); *dataP = BitBuffer_read(bbP, 32);
*dataP = *dataP << 32; *dataP = *dataP << 32;
*dataP = *dataP | BitBuffer_read(bbP, 32); *dataP = *dataP | BitBuffer_read(bbP, 32);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_BITMAP64_decode(bbP, &dataP->val[0]); MIH_C_BITMAP64_decode(bbP, &dataP->val[0]);
MIH_C_BITMAP64_decode(bbP, &dataP->val[1]); MIH_C_BITMAP64_decode(bbP, &dataP->val[1]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_BITMAP64_decode(bbP, &dataP->val[0]); MIH_C_BITMAP64_decode(bbP, &dataP->val[0]);
MIH_C_BITMAP64_decode(bbP, &dataP->val[1]); MIH_C_BITMAP64_decode(bbP, &dataP->val[1]);
...@@ -204,42 +204,42 @@ inline void MIH_C_BITMAP256_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP) ...@@ -204,42 +204,42 @@ inline void MIH_C_BITMAP256_decode(Bit_Buffer_t* bbP, MIH_C_BITMAP256_T* dataP)
MIH_C_BITMAP64_decode(bbP, &dataP->val[3]); MIH_C_BITMAP64_decode(bbP, &dataP->val[3]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_CHOICE_decode(Bit_Buffer_t* bbP, MIH_C_CHOICE_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_CHOICE_T)*8);} void MIH_C_CHOICE_decode(Bit_Buffer_t* bbP, MIH_C_CHOICE_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_CHOICE_T)*8);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_INTEGER1_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER1_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_INTEGER1_T)*8);} void MIH_C_INTEGER1_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER1_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_INTEGER1_T)*8);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_INTEGER2_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER2_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_INTEGER2_T)*8);} void MIH_C_INTEGER2_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER2_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_INTEGER2_T)*8);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_INTEGER4_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER4_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_INTEGER4_T)*8);} void MIH_C_INTEGER4_decode(Bit_Buffer_t* bbP, MIH_C_INTEGER4_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_INTEGER4_T)*8);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
*dataP = BitBuffer_read(bbP, sizeof(MIH_C_INTEGER4_T)*8); *dataP = BitBuffer_read(bbP, sizeof(MIH_C_INTEGER4_T)*8);
*dataP = *dataP << (sizeof(MIH_C_INTEGER4_T)*8); *dataP = *dataP << (sizeof(MIH_C_INTEGER4_T)*8);
*dataP = *dataP | BitBuffer_read(bbP, sizeof(MIH_C_INTEGER4_T)*8); *dataP = *dataP | BitBuffer_read(bbP, sizeof(MIH_C_INTEGER4_T)*8);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_NULL_decode(Bit_Buffer_t* bbP) {;} void MIH_C_NULL_decode(Bit_Buffer_t* bbP) {;}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_OCTET_decode(Bit_Buffer_t* bbP, MIH_C_F1_Generic_Octet_t *dataP, int lengthP) { void MIH_C_OCTET_decode(Bit_Buffer_t* bbP, MIH_C_F1_Generic_Octet_t *dataP, int lengthP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BitBuffer_readMem(bbP, dataP->val, lengthP); BitBuffer_readMem(bbP, dataP->val, lengthP);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_UNSIGNED_INT1_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT1_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT1_T)*8);} void MIH_C_UNSIGNED_INT1_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT1_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT1_T)*8);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_UNSIGNED_INT2_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT2_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT2_T)*8);} void MIH_C_UNSIGNED_INT2_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT2_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT2_T)*8);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_UNSIGNED_INT4_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT4_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT4_T)*8);} void MIH_C_UNSIGNED_INT4_decode(Bit_Buffer_t* bbP, MIH_C_UNSIGNED_INT4_T* dataP) {*dataP = BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT4_T)*8);}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline 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) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
*dataP = BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT4_T)*8); *dataP = BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT4_T)*8);
*dataP = *dataP << 32; *dataP = *dataP << 32;
*dataP = *dataP | BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT4_T)*8); *dataP = *dataP | BitBuffer_read(bbP, sizeof(MIH_C_UNSIGNED_INT4_T)*8);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_LIST_LENGTH_encode(Bit_Buffer_t* bbP, u_int16_t lengthP) { void MIH_C_LIST_LENGTH_encode(Bit_Buffer_t* bbP, u_int16_t lengthP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
unsigned int num_more_bytes; unsigned int num_more_bytes;
int length; int length;
...@@ -268,7 +268,7 @@ inline void MIH_C_LIST_LENGTH_encode(Bit_Buffer_t* bbP, u_int16_t lengthP) { ...@@ -268,7 +268,7 @@ inline void MIH_C_LIST_LENGTH_encode(Bit_Buffer_t* bbP, u_int16_t lengthP) {
} }
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline u_int16_t MIH_C_LIST_LENGTH_get_encode_num_bytes(u_int16_t lengthP) { u_int16_t MIH_C_LIST_LENGTH_get_encode_num_bytes(u_int16_t lengthP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
unsigned int num_more_bytes; unsigned int num_more_bytes;
if (lengthP <= 128) { if (lengthP <= 128) {
...@@ -283,7 +283,7 @@ inline u_int16_t MIH_C_LIST_LENGTH_get_encode_num_bytes(u_int16_t lengthP) { ...@@ -283,7 +283,7 @@ inline u_int16_t MIH_C_LIST_LENGTH_get_encode_num_bytes(u_int16_t lengthP) {
} }
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_LIST_LENGTH_decode(Bit_Buffer_t* bbP, u_int16_t *lengthP) { void MIH_C_LIST_LENGTH_decode(Bit_Buffer_t* bbP, u_int16_t *lengthP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
unsigned int num_more_bytes; unsigned int num_more_bytes;
MIH_C_UNSIGNED_INT1_T byte1; MIH_C_UNSIGNED_INT1_T byte1;
......
...@@ -44,14 +44,14 @@ unsigned int MIH_C_3GPP_2G_CELL_ID2String(MIH_C_3GPP_2G_CELL_ID_T *dataP, char* ...@@ -44,14 +44,14 @@ unsigned int MIH_C_3GPP_2G_CELL_ID2String(MIH_C_3GPP_2G_CELL_ID_T *dataP, char*
return buffer_index; return buffer_index;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_3GPP_2G_CELL_ID_encode(Bit_Buffer_t* bbP, MIH_C_3GPP_2G_CELL_ID_T *dataP) { void MIH_C_3GPP_2G_CELL_ID_encode(Bit_Buffer_t* bbP, MIH_C_3GPP_2G_CELL_ID_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_PLMN_ID_encode(bbP, &dataP->plmn_id); MIH_C_PLMN_ID_encode(bbP, &dataP->plmn_id);
MIH_C_LAC_encode(bbP, &dataP->lac); MIH_C_LAC_encode(bbP, &dataP->lac);
MIH_C_CI_encode(bbP, &dataP->ci); MIH_C_CI_encode(bbP, &dataP->ci);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_3GPP_2G_CELL_ID_decode(Bit_Buffer_t* bbP, MIH_C_3GPP_2G_CELL_ID_T *dataP) { void MIH_C_3GPP_2G_CELL_ID_decode(Bit_Buffer_t* bbP, MIH_C_3GPP_2G_CELL_ID_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_PLMN_ID_decode(bbP, &dataP->plmn_id); MIH_C_PLMN_ID_decode(bbP, &dataP->plmn_id);
MIH_C_LAC_decode(bbP, &dataP->lac); MIH_C_LAC_decode(bbP, &dataP->lac);
...@@ -66,13 +66,13 @@ unsigned int MIH_C_3GPP_3G_CELL_ID2String(MIH_C_3GPP_3G_CELL_ID_T *dataP, char* ...@@ -66,13 +66,13 @@ unsigned int MIH_C_3GPP_3G_CELL_ID2String(MIH_C_3GPP_3G_CELL_ID_T *dataP, char*
return buffer_index; return buffer_index;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_3GPP_3G_CELL_ID_encode(Bit_Buffer_t* bbP, MIH_C_3GPP_3G_CELL_ID_T *dataP) { void MIH_C_3GPP_3G_CELL_ID_encode(Bit_Buffer_t* bbP, MIH_C_3GPP_3G_CELL_ID_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_PLMN_ID_encode(bbP, &dataP->plmn_id); MIH_C_PLMN_ID_encode(bbP, &dataP->plmn_id);
MIH_C_CELL_ID_encode(bbP, &dataP->cell_id); MIH_C_CELL_ID_encode(bbP, &dataP->cell_id);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_3GPP_3G_CELL_ID_decode(Bit_Buffer_t* bbP, MIH_C_3GPP_3G_CELL_ID_T *dataP) { void MIH_C_3GPP_3G_CELL_ID_decode(Bit_Buffer_t* bbP, MIH_C_3GPP_3G_CELL_ID_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_PLMN_ID_decode(bbP, &dataP->plmn_id); MIH_C_PLMN_ID_decode(bbP, &dataP->plmn_id);
MIH_C_CELL_ID_decode(bbP, &dataP->cell_id); MIH_C_CELL_ID_decode(bbP, &dataP->cell_id);
...@@ -112,7 +112,7 @@ unsigned int MIH_C_LINK_ADDR2String(MIH_C_LINK_ADDR_T *dataP, char* bufP) { ...@@ -112,7 +112,7 @@ unsigned int MIH_C_LINK_ADDR2String(MIH_C_LINK_ADDR_T *dataP, char* bufP) {
return buffer_index; return buffer_index;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_LINK_ADDR_encode(Bit_Buffer_t* bbP, MIH_C_LINK_ADDR_T *dataP) { void MIH_C_LINK_ADDR_encode(Bit_Buffer_t* bbP, MIH_C_LINK_ADDR_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_CHOICE_encode(bbP, &dataP->choice); MIH_C_CHOICE_encode(bbP, &dataP->choice);
switch (dataP->choice) { switch (dataP->choice) {
...@@ -139,7 +139,7 @@ inline void MIH_C_LINK_ADDR_encode(Bit_Buffer_t* bbP, MIH_C_LINK_ADDR_T *dataP) ...@@ -139,7 +139,7 @@ inline void MIH_C_LINK_ADDR_encode(Bit_Buffer_t* bbP, MIH_C_LINK_ADDR_T *dataP)
} }
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_LINK_ADDR_decode(Bit_Buffer_t* bbP, MIH_C_LINK_ADDR_T *dataP) { void MIH_C_LINK_ADDR_decode(Bit_Buffer_t* bbP, MIH_C_LINK_ADDR_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_CHOICE_decode(bbP, &dataP->choice); MIH_C_CHOICE_decode(bbP, &dataP->choice);
switch (dataP->choice) { switch (dataP->choice) {
......
...@@ -42,13 +42,13 @@ unsigned int MIH_C_MIN_PK_TX_DELAY2String(MIH_C_MIN_PK_TX_DELAY_T *dataP, char* ...@@ -42,13 +42,13 @@ unsigned int MIH_C_MIN_PK_TX_DELAY2String(MIH_C_MIN_PK_TX_DELAY_T *dataP, char*
return buffer_index; return buffer_index;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_MIN_PK_TX_DELAY_encode(Bit_Buffer_t* bbP, MIH_C_MIN_PK_TX_DELAY_T *dataP) { void MIH_C_MIN_PK_TX_DELAY_encode(Bit_Buffer_t* bbP, MIH_C_MIN_PK_TX_DELAY_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_COS_ID_encode(bbP, &dataP->cos_id); MIH_C_COS_ID_encode(bbP, &dataP->cos_id);
MIH_C_UNSIGNED_INT2_encode(bbP, &dataP->value); MIH_C_UNSIGNED_INT2_encode(bbP, &dataP->value);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_MIN_PK_TX_DELAY_decode(Bit_Buffer_t* bbP, MIH_C_MIN_PK_TX_DELAY_T *dataP) { void MIH_C_MIN_PK_TX_DELAY_decode(Bit_Buffer_t* bbP, MIH_C_MIN_PK_TX_DELAY_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_COS_ID_decode(bbP, &dataP->cos_id); MIH_C_COS_ID_decode(bbP, &dataP->cos_id);
MIH_C_UNSIGNED_INT2_decode(bbP, &dataP->value); MIH_C_UNSIGNED_INT2_decode(bbP, &dataP->value);
...@@ -64,13 +64,13 @@ unsigned int MIH_C_AVG_PK_TX_DELAY2String(MIH_C_AVG_PK_TX_DELAY_T *dataP, char* ...@@ -64,13 +64,13 @@ unsigned int MIH_C_AVG_PK_TX_DELAY2String(MIH_C_AVG_PK_TX_DELAY_T *dataP, char*
return buffer_index; return buffer_index;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_AVG_PK_TX_DELAY_encode(Bit_Buffer_t* bbP, MIH_C_AVG_PK_TX_DELAY_T *dataP) { void MIH_C_AVG_PK_TX_DELAY_encode(Bit_Buffer_t* bbP, MIH_C_AVG_PK_TX_DELAY_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_COS_ID_encode(bbP, &dataP->cos_id); MIH_C_COS_ID_encode(bbP, &dataP->cos_id);
MIH_C_UNSIGNED_INT2_encode(bbP, &dataP->value); MIH_C_UNSIGNED_INT2_encode(bbP, &dataP->value);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_AVG_PK_TX_DELAY_decode(Bit_Buffer_t* bbP, MIH_C_AVG_PK_TX_DELAY_T *dataP) { void MIH_C_AVG_PK_TX_DELAY_decode(Bit_Buffer_t* bbP, MIH_C_AVG_PK_TX_DELAY_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_COS_ID_decode(bbP, &dataP->cos_id); MIH_C_COS_ID_decode(bbP, &dataP->cos_id);
MIH_C_UNSIGNED_INT2_decode(bbP, &dataP->value); MIH_C_UNSIGNED_INT2_decode(bbP, &dataP->value);
...@@ -86,13 +86,13 @@ unsigned int MIH_C_MAX_PK_TX_DELAY2String(MIH_C_MAX_PK_TX_DELAY_T *dataP, char* ...@@ -86,13 +86,13 @@ unsigned int MIH_C_MAX_PK_TX_DELAY2String(MIH_C_MAX_PK_TX_DELAY_T *dataP, char*
return buffer_index; return buffer_index;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_MAX_PK_TX_DELAY_encode(Bit_Buffer_t* bbP, MIH_C_MAX_PK_TX_DELAY_T *dataP) { void MIH_C_MAX_PK_TX_DELAY_encode(Bit_Buffer_t* bbP, MIH_C_MAX_PK_TX_DELAY_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_COS_ID_encode(bbP, &dataP->cos_id); MIH_C_COS_ID_encode(bbP, &dataP->cos_id);
MIH_C_UNSIGNED_INT2_encode(bbP, &dataP->value); MIH_C_UNSIGNED_INT2_encode(bbP, &dataP->value);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_MAX_PK_TX_DELAY_decode(Bit_Buffer_t* bbP, MIH_C_MAX_PK_TX_DELAY_T *dataP) { void MIH_C_MAX_PK_TX_DELAY_decode(Bit_Buffer_t* bbP, MIH_C_MAX_PK_TX_DELAY_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_COS_ID_decode(bbP, &dataP->cos_id); MIH_C_COS_ID_decode(bbP, &dataP->cos_id);
MIH_C_UNSIGNED_INT2_decode(bbP, &dataP->value); MIH_C_UNSIGNED_INT2_decode(bbP, &dataP->value);
...@@ -108,13 +108,13 @@ unsigned int MIH_C_PK_DELAY_JITTER2String(MIH_C_PK_DELAY_JITTER_T *dataP, char* ...@@ -108,13 +108,13 @@ unsigned int MIH_C_PK_DELAY_JITTER2String(MIH_C_PK_DELAY_JITTER_T *dataP, char*
return buffer_index; return buffer_index;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_PK_DELAY_JITTER_encode(Bit_Buffer_t* bbP, MIH_C_PK_DELAY_JITTER_T *dataP) { void MIH_C_PK_DELAY_JITTER_encode(Bit_Buffer_t* bbP, MIH_C_PK_DELAY_JITTER_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_COS_ID_encode(bbP, &dataP->cos_id); MIH_C_COS_ID_encode(bbP, &dataP->cos_id);
MIH_C_UNSIGNED_INT2_encode(bbP, &dataP->value); MIH_C_UNSIGNED_INT2_encode(bbP, &dataP->value);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
inline void MIH_C_PK_DELAY_JITTER_decode(Bit_Buffer_t* bbP, MIH_C_PK_DELAY_JITTER_T *dataP) { void MIH_C_PK_DELAY_JITTER_decode(Bit_Buffer_t* bbP, MIH_C_PK_DELAY_JITTER_T *dataP) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
MIH_C_COS_ID_decode(bbP, &dataP->cos_id); MIH_C_COS_ID_decode(bbP, &dataP->cos_id);
MIH_C_UNSIGNED_INT2_decode(bbP, &dataP->value); MIH_C_UNSIGNED_INT2_decode(bbP, &dataP->value);
...@@ -130,13 +130,13 @@ unsigned int MIH_C_PK_LOSS_RATE2String(MIH_C_