From 68cbcacb9514543db5e0d9335df4feea6978dfc2 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Mon, 19 Apr 2010 21:52:46 +0200 Subject: [PATCH] Moved ABS() macro to globals. --- master/fsm_slave_config.c | 6 ++---- master/globals.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/master/fsm_slave_config.c b/master/fsm_slave_config.c index 01125536..ebbd8fa1 100644 --- a/master/fsm_slave_config.c +++ b/master/fsm_slave_config.c @@ -416,8 +416,6 @@ void ec_fsm_slave_config_state_dc_clear_assign( /*****************************************************************************/ -#define ABS(X) ((X) >= 0 ? (X) : -(X)) - /** Configure 32 bit time offset. */ u64 ec_fsm_slave_config_dc_offset32( @@ -445,7 +443,7 @@ u64 ec_fsm_slave_config_dc_offset32( slave->ring_position, system_time32, correction, (u32) slave->master->app_time, time_diff); - if (ABS(time_diff) > EC_SYSTEM_TIME_TOLERANCE_NS) { + if (EC_ABS(time_diff) > EC_SYSTEM_TIME_TOLERANCE_NS) { new_offset = time_diff + old_offset32; if (slave->master->debug_level) EC_DBG("Slave %u: Setting time offset to %u (was %u)\n", @@ -486,7 +484,7 @@ u64 ec_fsm_slave_config_dc_offset64( slave->master->app_time, time_diff); - if (ABS(time_diff) > EC_SYSTEM_TIME_TOLERANCE_NS) { + if (EC_ABS(time_diff) > EC_SYSTEM_TIME_TOLERANCE_NS) { new_offset = time_diff + old_offset; if (slave->master->debug_level) EC_DBG("Slave %u: Setting time offset to %llu (was %llu)\n", diff --git a/master/globals.h b/master/globals.h index a794ac95..d134bed6 100644 --- a/master/globals.h +++ b/master/globals.h @@ -260,6 +260,12 @@ enum { /*****************************************************************************/ +/** Absolute value. + */ +#define EC_ABS(X) ((X) >= 0 ? (X) : -(X)) + +/*****************************************************************************/ + extern char *ec_master_version_str; /*****************************************************************************/