# HG changeset patch
# User Martin Troxler <ch1010277@ch10pc446>
# Date 1292499098 -3600
# Node ID 393e7aef6706214cdd3453fe7afd731f8557096c
# Parent  ee30e7f90c2e78c83118b421f2c664ef38b827e1
renamed ext_injection_timeout -> fsm_injection_timeout

diff -r ee30e7f90c2e -r 393e7aef6706 master/globals.h
--- a/master/globals.h	Thu Dec 16 11:29:23 2010 +0100
+++ b/master/globals.h	Thu Dec 16 12:31:38 2010 +0100
@@ -46,8 +46,8 @@
 /** Datagram timeout in microseconds. */
 #define EC_IO_TIMEOUT 500
 
-/** SDO injection timeout in microseconds. */
-#define EC_SDO_INJECTION_TIMEOUT 10000
+/** FSM injection timeout in microseconds. */
+#define EC_FSM_INJECTION_TIMEOUT 10000
 
 /** Time to send a byte in nanoseconds.
  *
diff -r ee30e7f90c2e -r 393e7aef6706 master/master.c
--- a/master/master.c	Thu Dec 16 11:29:23 2010 +0100
+++ b/master/master.c	Thu Dec 16 12:31:38 2010 +0100
@@ -66,9 +66,9 @@
  */
 static cycles_t timeout_cycles;
 
-/** Timeout for external datagram injection [cycles].
- */
-static cycles_t ext_injection_timeout_cycles;
+/** Timeout for fsm datagram injection [cycles].
+ */
+static cycles_t fsm_injection_timeout_cycles;
 
 #else
 
@@ -76,9 +76,9 @@
  */
 static unsigned long timeout_jiffies;
 
-/** Timeout for external datagram injection [jiffies].
- */
-static unsigned long ext_injection_timeout_jiffies;
+/** Timeout for fsm datagram injection [jiffies].
+ */
+static unsigned long fsm_injection_timeout_jiffies;
 
 #endif
 
@@ -101,11 +101,11 @@
 {
 #ifdef EC_HAVE_CYCLES
     timeout_cycles = (cycles_t) EC_IO_TIMEOUT /* us */ * (cpu_khz / 1000);
-    ext_injection_timeout_cycles = (cycles_t) EC_SDO_INJECTION_TIMEOUT /* us */ * (cpu_khz / 1000);
+    fsm_injection_timeout_cycles = (cycles_t) EC_FSM_INJECTION_TIMEOUT /* us */ * (cpu_khz / 1000);
 #else
     // one jiffy may always elapse between time measurement
     timeout_jiffies = max(EC_IO_TIMEOUT * HZ / 1000000, 1);
-    ext_injection_timeout_jiffies = max(EC_SDO_INJECTION_TIMEOUT * HZ / 1000000, 1);
+    fsm_injection_timeout_jiffies = max(EC_FSM_INJECTION_TIMEOUT * HZ / 1000000, 1);
 #endif
 }
 
@@ -726,10 +726,10 @@
                 cycles_t cycles_now = get_cycles();
 
                 if (cycles_now - datagram->cycles_sent
-                        > ext_injection_timeout_cycles)
+                        > fsm_injection_timeout_cycles)
 #else
                 if (jiffies - datagram->jiffies_sent
-                        > ext_injection_timeout_jiffies)
+                        > fsm_injection_timeout_jiffies)
 #endif
                 {
                     unsigned int time_us;