--- a/master/master.c	Tue Mar 21 13:57:15 2006 +0000
+++ b/master/master.c	Tue Mar 21 14:23:23 2006 +0000
@@ -888,7 +888,7 @@
     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 @@
     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) {

--- a/master/slave.c	Tue Mar 21 13:57:15 2006 +0000
+++ b/master/slave.c	Tue Mar 21 14:23:23 2006 +0000
@@ -179,7 +179,7 @@
     // 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 @@
     // 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 @@
     }
 
     start = get_cycles();
-    timeout = cpu_khz; // 1ms
+    timeout = (cycles_t) 10 * cpu_khz; // 10ms
 
     while (1)
     {
@@ -568,7 +568,7 @@
     }
 
     start = get_cycles();
-    timeout = cpu_khz; // 1ms
+    timeout = (cycles_t) 10 * cpu_khz; // 10ms
 
     while (1)
     {