Skip to content
Snippets Groups Projects
Commit 16f7e0d6 authored by Florian Pose's avatar Florian Pose
Browse files

Renamed sdo_injecton_timeout to ext_injection_timeout.

parent 8397f485
No related branches found
No related tags found
No related merge requests found
...@@ -65,13 +65,20 @@ ...@@ -65,13 +65,20 @@
/** Frame timeout in cycles. /** Frame timeout in cycles.
*/ */
static cycles_t timeout_cycles; static cycles_t timeout_cycles;
static cycles_t sdo_injection_timeout_cycles;
/** Timeout for external datagram injection [cycles].
*/
static cycles_t ext_injection_timeout_cycles;
#else #else
/** Frame timeout in jiffies. /** Frame timeout in jiffies.
*/ */
static unsigned long timeout_jiffies; static unsigned long timeout_jiffies;
static unsigned long sdo_injection_timeout_jiffies;
/** Timeout for external datagram injection [jiffies].
*/
static unsigned long ext_injection_timeout_jiffies;
#endif #endif
...@@ -94,11 +101,11 @@ void ec_master_init_static(void) ...@@ -94,11 +101,11 @@ void ec_master_init_static(void)
{ {
#ifdef EC_HAVE_CYCLES #ifdef EC_HAVE_CYCLES
timeout_cycles = (cycles_t) EC_IO_TIMEOUT /* us */ * (cpu_khz / 1000); timeout_cycles = (cycles_t) EC_IO_TIMEOUT /* us */ * (cpu_khz / 1000);
sdo_injection_timeout_cycles = (cycles_t) EC_SDO_INJECTION_TIMEOUT /* us */ * (cpu_khz / 1000); ext_injection_timeout_cycles = (cycles_t) EC_SDO_INJECTION_TIMEOUT /* us */ * (cpu_khz / 1000);
#else #else
// one jiffy may always elapse between time measurement // one jiffy may always elapse between time measurement
timeout_jiffies = max(EC_IO_TIMEOUT * HZ / 1000000, 1); timeout_jiffies = max(EC_IO_TIMEOUT * HZ / 1000000, 1);
sdo_injection_timeout_jiffies = max(EC_SDO_INJECTION_TIMEOUT * HZ / 1000000, 1); ext_injection_timeout_jiffies = max(EC_SDO_INJECTION_TIMEOUT * HZ / 1000000, 1);
#endif #endif
} }
...@@ -753,10 +760,10 @@ void ec_master_inject_external_datagrams( ...@@ -753,10 +760,10 @@ void ec_master_inject_external_datagrams(
cycles_t cycles_now = get_cycles(); cycles_t cycles_now = get_cycles();
if (cycles_now - datagram->cycles_sent if (cycles_now - datagram->cycles_sent
> sdo_injection_timeout_cycles) > ext_injection_timeout_cycles)
#else #else
if (jiffies - datagram->jiffies_sent if (jiffies - datagram->jiffies_sent
> sdo_injection_timeout_jiffies) > ext_injection_timeout_jiffies)
#endif #endif
{ {
unsigned int time_us; unsigned int time_us;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment