commit 303fec1d79b7ac30a09713e5db9fff299f7227fb
author Ruchi Kandoi <kandoiruchi@google.com> Wed Dec 14 13:22:38 2016 -0800
committer Ruchi Kandoi <kandoiruchi@google.com> Tue Jan 10 12:44:46 2017 -0800
tree 7053a08e5ac7b467b3275a3c0ad653bb7339f234
parent 3800a82eee4de7a6558fb618930a90542c26fe77

nfc: Remove defined(MACRO) and define undefined macros

Test: compiles
Change-Id: I5ea9a8f38cfc41e8a71eeb1c11f96755474b4121
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>

src/gki/common/gki_time.c

diff --git a/src/gki/common/gki_time.c b/src/gki/common/gki_time.c
index 4e8d82e..e842795 100644
--- a/src/gki/common/gki_time.c
+++ b/src/gki/common/gki_time.c
@@ -47,7 +47,7 @@
 
     gki_cb.com.OSTicksTilExp = 0;       /* Remaining time (of OSTimeCurTimeout) before next timer expires */
     gki_cb.com.OSNumOrigTicks = 0;
-#if (defined(GKI_DELAY_STOP_SYS_TICK) && (GKI_DELAY_STOP_SYS_TICK > 0))
+#if (GKI_DELAY_STOP_SYS_TICK > 0)
     gki_cb.com.OSTicksTilStop = 0;      /* clear inactivity delay timer */
 #endif
 
@@ -216,7 +216,7 @@
 
     if(gki_timers_is_timer_running() == false)
     {
-#if (defined(GKI_DELAY_STOP_SYS_TICK) && (GKI_DELAY_STOP_SYS_TICK > 0))
+#if (GKI_DELAY_STOP_SYS_TICK > 0)
         /* if inactivity delay timer is not running, start system tick */
         if(gki_cb.com.OSTicksTilStop == 0)
         {
@@ -227,7 +227,7 @@
                 gki_cb.com.system_tick_running = true;
                 (gki_cb.com.p_tick_cb)(true);
             }
-#if (defined(GKI_DELAY_STOP_SYS_TICK) && (GKI_DELAY_STOP_SYS_TICK > 0))
+#if (GKI_DELAY_STOP_SYS_TICK > 0)
         }
         else
         {
@@ -345,7 +345,7 @@
     {
         if (gki_cb.com.p_tick_cb)
         {
-#if (defined(GKI_DELAY_STOP_SYS_TICK) && (GKI_DELAY_STOP_SYS_TICK > 0))
+#if (GKI_DELAY_STOP_SYS_TICK > 0)
             /* if inactivity delay timer is not running */
             if ((gki_cb.com.system_tick_running)&&(gki_cb.com.OSTicksTilStop == 0))
             {
@@ -403,7 +403,7 @@
 
     gki_cb.com.timer_nesting = 1;
 
-#if (defined(GKI_DELAY_STOP_SYS_TICK) && (GKI_DELAY_STOP_SYS_TICK > 0))
+#if (GKI_DELAY_STOP_SYS_TICK > 0)
     /* if inactivity delay timer is set and expired */
     if (gki_cb.com.OSTicksTilStop)
     {
@@ -469,7 +469,7 @@
             if (gki_cb.com.OSTaskTmr0[task_id] <= 0)
             {
                 /* Set Timer 0 Expired event mask and reload timer */
-#if (defined(GKI_TIMER_UPDATES_FROM_ISR) &&  GKI_TIMER_UPDATES_FROM_ISR == TRUE)
+#if (GKI_TIMER_UPDATES_FROM_ISR == TRUE)
                 GKI_isend_event (task_id, TIMER_0_EVT_MASK);
 #else
                 GKI_send_event (task_id, TIMER_0_EVT_MASK);
@@ -492,7 +492,7 @@
             if (gki_cb.com.OSTaskTmr1[task_id] <= 0)
             {
                 /* Set Timer 1 Expired event mask and reload timer */
-#if (defined(GKI_TIMER_UPDATES_FROM_ISR) &&  GKI_TIMER_UPDATES_FROM_ISR == TRUE)
+#if (GKI_TIMER_UPDATES_FROM_ISR == TRUE)
                 GKI_isend_event (task_id, TIMER_1_EVT_MASK);
 #else
                 GKI_send_event (task_id, TIMER_1_EVT_MASK);
@@ -515,7 +515,7 @@
             if (gki_cb.com.OSTaskTmr2[task_id] <= 0)
             {
                 /* Set Timer 2 Expired event mask and reload timer */
-#if (defined(GKI_TIMER_UPDATES_FROM_ISR) &&  GKI_TIMER_UPDATES_FROM_ISR == TRUE)
+#if (GKI_TIMER_UPDATES_FROM_ISR == TRUE)
                 GKI_isend_event (task_id, TIMER_2_EVT_MASK);
 #else
                 GKI_send_event (task_id, TIMER_2_EVT_MASK);
@@ -538,7 +538,7 @@
             if (gki_cb.com.OSTaskTmr3[task_id] <= 0)
             {
                 /* Set Timer 3 Expired event mask and reload timer */
-#if (defined(GKI_TIMER_UPDATES_FROM_ISR) &&  GKI_TIMER_UPDATES_FROM_ISR == TRUE)
+#if (GKI_TIMER_UPDATES_FROM_ISR == TRUE)
                 GKI_isend_event (task_id, TIMER_3_EVT_MASK);
 #else
                 GKI_send_event (task_id, TIMER_3_EVT_MASK);