maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix T macro calls

Browse Source
This commit is contained in:
LTS
2017-01-03 14:26:17 +01:00
parent 2612df9ef2
commit 59d0cf1c54
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/T/T.h
-12
View File
@@ -188,12 +188,6 @@ extern T_cache_t *T_cache;
#define T_HEADER(x) \ #define T_HEADER(x) \
do { \ do { \
if (!__builtin_types_compatible_p(typeof(x), struct T_header *)) { \
printf("%s:%d:%s: " \
"bad use of T, pass a message ID as first parameter\n", \
__FILE__, __LINE__, __FUNCTION__); \
abort(); \
} \
struct timespec T_HEADER_time; \ struct timespec T_HEADER_time; \
if (clock_gettime(CLOCK_REALTIME, &T_HEADER_time)) abort(); \ if (clock_gettime(CLOCK_REALTIME, &T_HEADER_time)) abort(); \
memcpy(T_LOCAL_buf, &T_HEADER_time, sizeof(struct timespec)); \ memcpy(T_LOCAL_buf, &T_HEADER_time, sizeof(struct timespec)); \
@@ -205,12 +199,6 @@ extern T_cache_t *T_cache;
#define T_HEADER(x) \ #define T_HEADER(x) \
do { \ do { \
if (!__builtin_types_compatible_p(typeof(x), struct T_header *)) { \
printf("%s:%d:%s: " \
"bad use of T, pass a message ID as first parameter\n", \
__FILE__, __LINE__, __FUNCTION__); \
abort(); \
} \
T_PUT_int(1, (int)(uintptr_t)(x)); \ T_PUT_int(1, (int)(uintptr_t)(x)); \
} while (0) } while (0)
targets/RT/USER/lte-ue.c
+1 -1
View File
@@ -642,7 +642,7 @@ static void *UE_thread_rxn_txnp4(void *arg) {
AssertFatal(pthread_mutex_lock(&proc->mutex_rxtx) ==0,""); AssertFatal(pthread_mutex_lock(&proc->mutex_rxtx) ==0,"");
pthread_cond_wait( &proc->cond_rxtx, &proc->mutex_rxtx ); pthread_cond_wait( &proc->cond_rxtx, &proc->mutex_rxtx );
if ( (instance_cnt_rxtx+proc->sub_frame_step)%10 != proc->subframe_rx && instance_cnt_rxtx!=-1 ) if ( (instance_cnt_rxtx+proc->sub_frame_step)%10 != proc->subframe_rx && instance_cnt_rxtx!=-1 )
LOG_W(PHY,"REAL TIME NOT MATCHED: missed a sub-frame: expecting %d, got %d\n", LOG_W(PHY,"REAL TIME NOT MATCHED: missed a sub-frame: expecting %lld, got %d\n",
(instance_cnt_rxtx+proc->sub_frame_step)%10, proc->subframe_rx); (instance_cnt_rxtx+proc->sub_frame_step)%10, proc->subframe_rx);
instance_cnt_rxtx=proc->subframe_rx; instance_cnt_rxtx=proc->subframe_rx;
AssertFatal(pthread_mutex_unlock(&proc->mutex_rxtx) ==0,""); AssertFatal(pthread_mutex_unlock(&proc->mutex_rxtx) ==0,"");