renamed dc_cycles_app_time -> dc_cycles_app_start_time & dc_jiffies_app_time -> dc_jiffies_app_start_time
--- a/master/fsm_master.c Mon Nov 22 09:09:23 2010 +0100
+++ b/master/fsm_master.c Mon Nov 22 09:53:43 2010 +0100
@@ -1001,7 +1001,7 @@
and the app_time set time */
#ifdef EC_HAVE_CYCLES
correction =
- (datagram->cycles_sent - slave->master->dc_cycles_app_time)
+ (datagram->cycles_sent - slave->master->dc_cycles_app_start_time)
* 1000000LL;
do_div(correction,cpu_khz);
#else
--- a/master/master.c Mon Nov 22 09:09:23 2010 +0100
+++ b/master/master.c Mon Nov 22 09:53:43 2010 +0100
@@ -150,9 +150,9 @@
master->app_time = 0ULL;
#ifdef EC_HAVE_CYCLES
- master->dc_cycles_app_time = 0;
-#endif
- master->dc_jiffies_app_time = 0;
+ master->dc_cycles_app_start_time = 0;
+#endif
+ master->dc_jiffies_app_start_time = 0;
master->app_start_time = 0ULL;
master->has_app_time = 0;
@@ -2381,9 +2381,9 @@
EC_MASTER_DBG(master, 1, "set application start time = %llu\n",app_time);
master->app_start_time = app_time;
#ifdef EC_HAVE_CYCLES
- master->dc_cycles_app_time = get_cycles();
-#endif
- master->dc_jiffies_app_time = jiffies;
+ master->dc_cycles_app_start_time = get_cycles();
+#endif
+ master->dc_jiffies_app_start_time = jiffies;
master->has_app_time = 1;
}
}
--- a/master/master.h Mon Nov 22 09:09:23 2010 +0100
+++ b/master/master.h Mon Nov 22 09:53:43 2010 +0100
@@ -188,9 +188,9 @@
monitoring. */
ec_slave_t *dc_ref_clock; /**< DC reference clock slave. */
#ifdef EC_HAVE_CYCLES
- cycles_t dc_cycles_app_time; /** cycles at last ecrt_master_sync() call.*/
-#endif
- unsigned long dc_jiffies_app_time;/** jiffies at last
+ cycles_t dc_cycles_app_start_time; /** cycles at last ecrt_master_sync() call.*/
+#endif
+ unsigned long dc_jiffies_app_start_time;/** jiffies at last
ecrt_master_sync() call.*/
unsigned int scan_busy; /**< Current scan state. */
unsigned int allow_scan; /**< \a True, if slave scanning is allowed. */