merge -c1473 trunk: Avoided using #ifdef inside a macro.
--- a/master/master.c Tue Sep 30 14:10:50 2008 +0000
+++ b/master/master.c Thu Oct 02 07:06:37 2008 +0000
@@ -1375,16 +1375,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);
}
}
}