diff --git a/openair-cn/UTILS/conversions.h b/openair-cn/UTILS/conversions.h index 54ea2052edc6567ea7e534bd818afa2c7dd22531..556bcf1c9a9145e18fd5b5116dad2d03a6696300 100644 --- a/openair-cn/UTILS/conversions.h +++ b/openair-cn/UTILS/conversions.h @@ -231,18 +231,18 @@ do { \ (bITsTRING)->buf = calloc(3, sizeof(uint8_t)); \ (bITsTRING)->buf[0] = ((mACRO) >> 12); \ (bITsTRING)->buf[1] = (mACRO) >> 4; \ - (bITsTRING)->buf[2] = (mACRO) & 0x0f; \ + (bITsTRING)->buf[2] = ((mACRO) & 0x0f) << 4; \ (bITsTRING)->size = 3; \ (bITsTRING)->bits_unused = 4; \ } while(0) -#define MACRO_ENB_ID_TO_CELL_IDENTITY(mACRO, bITsTRING) \ +#define MACRO_ENB_ID_TO_CELL_IDENTITY(mACRO, bITsTRING) \ do { \ (bITsTRING)->buf = calloc(4, sizeof(uint8_t)); \ (bITsTRING)->buf[0] = 0; \ (bITsTRING)->buf[1] = ((mACRO) >> 12); \ (bITsTRING)->buf[2] = (mACRO) >> 4; \ - (bITsTRING)->buf[3] = (mACRO) & 0x0f; \ + (bITsTRING)->buf[3] = ((mACRO) & 0x0f) << 4; \ (bITsTRING)->size = 4; \ (bITsTRING)->bits_unused = 4; \ } while(0)