bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved ABS() macro to globals.

This commit is contained in:
Florian Pose 2010-04-19 21:52:46 +02:00
parent 6a0b016c7c
commit 68cbcacb95
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
master/fsm_slave_config.c
View File

@ -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",

6
master/globals.h
View File

@ -260,6 +260,12 @@ enum {
/*****************************************************************************/
/** Absolute value.
*/
#define EC_ABS(X) ((X) >= 0 ? (X) : -(X))
/*****************************************************************************/
extern char *ec_master_version_str;
/*****************************************************************************/