From 59d0cf1c5477bb6cc5d2b2d9094e52e60b3bc8d9 Mon Sep 17 00:00:00 2001 From: LTS <laurent.thomas@open-cells.com> Date: Tue, 3 Jan 2017 14:26:17 +0100 Subject: [PATCH] fix T macro calls --- common/utils/T/T.h | 12 ------------ targets/RT/USER/lte-ue.c | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/common/utils/T/T.h b/common/utils/T/T.h index 819615131e7..bd090ac2215 100644 --- a/common/utils/T/T.h +++ b/common/utils/T/T.h @@ -188,12 +188,6 @@ extern T_cache_t *T_cache; #define T_HEADER(x) \ 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; \ if (clock_gettime(CLOCK_REALTIME, &T_HEADER_time)) abort(); \ memcpy(T_LOCAL_buf, &T_HEADER_time, sizeof(struct timespec)); \ @@ -205,12 +199,6 @@ extern T_cache_t *T_cache; #define T_HEADER(x) \ 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)); \ } while (0) diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c index b398d5127ea..cfd42967554 100644 --- a/targets/RT/USER/lte-ue.c +++ b/targets/RT/USER/lte-ue.c @@ -642,7 +642,7 @@ static void *UE_thread_rxn_txnp4(void *arg) { AssertFatal(pthread_mutex_lock(&proc->mutex_rxtx) ==0,""); 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 ) - 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->subframe_rx; AssertFatal(pthread_mutex_unlock(&proc->mutex_rxtx) ==0,""); -- GitLab