Avoided using #ifdef inside a macro.
authorFlorian Pose <fp@igh-essen.com>
Wed, 01 Oct 2008 08:44:44 +0000
changeset 1237 33e8349b44bd
parent 1236 5007e4913a4c
child 1238 02711963a059
Avoided using #ifdef inside a macro.
master/master.c
--- a/master/master.c	Wed Oct 01 08:40:30 2008 +0000
+++ b/master/master.c	Wed Oct 01 08:44:44 2008 +0000
@@ -1377,16 +1377,15 @@
             ec_master_output_stats(master);
 
             if (unlikely(master->debug_level > 0)) {
+                unsigned int time_us;
+#ifdef EC_HAVE_CYCLES
+                time_us = (unsigned int) (master->main_device.cycles_poll -
+                        datagram->cycles_sent) * 1000 / cpu_khz;
+#else
+                time_us = (unsigned int) (diff_ms * 1000);
+#endif
                 EC_DBG("TIMED OUT datagram %08x, index %02X waited %u us.\n",
-                        (unsigned int) datagram, datagram->index,
-#ifdef EC_HAVE_CYCLES
-                        (unsigned int) (master->main_device.cycles_poll
-                            - datagram->cycles_sent) * 1000 / cpu_khz
-#else
-                        (unsigned int) (diff_ms * 1000)
-#endif
-                        );
-                
+                        (unsigned int) datagram, datagram->index, time_us);
             }
         }
     }