From 1252a2861194227416af8e885d40371c86a61d0b Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Tue, 21 Mar 2006 14:23:23 +0000
Subject: [PATCH] =?UTF-8?q?Verschiedene=20Timeouts=20verl=C3=A4ngert.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
master/master.c | 4 ++--
master/slave.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/master/master.c b/master/master.c
index 1dbfb2be..fbd5cea9 100644
--- a/master/master.c
+++ b/master/master.c
@@ -888,7 +888,7 @@ void ecrt_master_sync_io(ec_master_t *master)
ec_master_send_commands(master);
t_start = get_cycles(); // Sendezeit nehmen
- t_timeout = master->timeout * cpu_khz / 1000;
+ t_timeout = (cycles_t) master->timeout * cpu_khz / 1000;
while (1)
{
@@ -1013,7 +1013,7 @@ void ecrt_master_prepare_async_io(ec_master_t *master)
ecrt_master_async_send(master);
t_start = get_cycles(); // Sendezeit nehmen
- t_timeout = master->timeout * cpu_khz / 1000;
+ t_timeout = (cycles_t) master->timeout * cpu_khz / 1000;
// Aktiv warten!
while (1) {
diff --git a/master/slave.c b/master/slave.c
index c4e24489..73427920 100644
--- a/master/slave.c
+++ b/master/slave.c
@@ -179,7 +179,7 @@ int ec_slave_sii_read(ec_slave_t *slave,
// den Status auslesen, bis das Bit weg ist.
start = get_cycles();
- timeout = cpu_khz; // 1ms
+ timeout = (cycles_t) 100 * cpu_khz; // 100ms
while (1)
{
@@ -248,7 +248,7 @@ int ec_slave_sii_write(ec_slave_t *slave,
// den Status auslesen, bis das Bit weg ist.
start = get_cycles();
- timeout = cpu_khz; // 1ms
+ timeout = (cycles_t) 100 * cpu_khz; // 100ms
while (1)
{
@@ -504,7 +504,7 @@ void ec_slave_state_ack(ec_slave_t *slave,
}
start = get_cycles();
- timeout = cpu_khz; // 1ms
+ timeout = (cycles_t) 10 * cpu_khz; // 10ms
while (1)
{
@@ -568,7 +568,7 @@ int ec_slave_state_change(ec_slave_t *slave,
}
start = get_cycles();
- timeout = cpu_khz; // 1ms
+ timeout = (cycles_t) 10 * cpu_khz; // 10ms
while (1)
{
--
GitLab