From 7b860bf1998ebd2d468752bdb924fd96a3fb4823 Mon Sep 17 00:00:00 2001 From: winckel <winckel@eurecom.fr> Date: Tue, 3 Dec 2013 15:11:05 +0000 Subject: [PATCH] Corrected some conversion defines. git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4566 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair-cn/UTILS/conversions.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openair-cn/UTILS/conversions.h b/openair-cn/UTILS/conversions.h index 54ea2052ed..556bcf1c9a 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) -- GitLab