# HG changeset patch # User Martin Troxler # Date 1290766999 -3600 # Node ID a7ff6c28a43250e8e5badd5479365f0b42421252 # Parent 26b4ba6edccbbd1c018a00066d7985d49f4be343 Re-enabled waiting for clock synchronity before setting dc offsets. (changeset b0dcdfbd4238) diff -r 26b4ba6edccb -r a7ff6c28a432 master/fsm_slave_config.c --- a/master/fsm_slave_config.c Fri Nov 26 10:33:55 2010 +0100 +++ b/master/fsm_slave_config.c Fri Nov 26 11:23:19 2010 +0100 @@ -1248,7 +1248,7 @@ abs_sync_diff = EC_READ_U32(datagram->data) & 0x7fffffff; diff_ms = (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; - if (0 && abs_sync_diff > EC_DC_MAX_SYNC_DIFF_NS) { + if (abs_sync_diff > EC_DC_MAX_SYNC_DIFF_NS) { if (diff_ms >= EC_DC_SYNC_WAIT_MS) { EC_SLAVE_WARN(slave, "Slave did not sync after %lu ms.\n",