diff -r 7bc131b92039 -r 07fd94c5119d master/fsm_coe.c
--- a/master/fsm_coe.c	Fri Aug 10 15:27:08 2007 +0000
+++ b/master/fsm_coe.c	Thu Sep 13 11:08:46 2007 +0000
@@ -289,8 +289,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE dictionary request failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE dictionary request failed on slave %i: ",
+                slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -325,9 +326,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE mailbox check datagram failed - slave %i did"
-               " not respond.\n",
+        EC_ERR("Reception of CoE mailbox check datagram failed on slave %i: ",
                slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -381,8 +382,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE dictionary response failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE dictionary response failed on slave %i: ",
+                slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -506,8 +508,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE SDO description request failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE SDO description"
+                " request failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -542,8 +545,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE mailbox check datagram failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE mailbox check"
+                " datagram failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -596,8 +600,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE SDO description response failed - slave %i"
-               " did not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE SDO description"
+                " response failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -709,8 +714,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE SDO entry request failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE SDO entry request failed on slave %i: ",
+                slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -746,8 +752,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE mailbox check datagram failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE mailbox check"
+                " datagram failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -801,8 +808,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE SDO description response failed - slave %i"
-               " did not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE SDO description"
+                " response failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -991,8 +999,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE download request failed - slave %i did not"
-               " respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE download request failed on slave %i: ",
+                slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -1027,8 +1036,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE mailbox check datagram failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE mailbox check"
+                " datagram failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -1080,8 +1090,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE download response failed - slave %i did not"
-               " respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE download response failed on slave %i: ",
+                slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -1200,8 +1211,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE upload request failed - slave %i did not"
-               " respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE upload request failed on slave %i: ",
+                slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -1236,8 +1248,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE mailbox check datagram failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE mailbox check"
+                " datagram failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -1294,8 +1307,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE upload response failed - slave %i did not"
-               " respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE upload response failed on slave %i: ",
+                slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -1439,8 +1453,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE upload segment request failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE upload segment"
+                " request failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -1475,8 +1490,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE mailbox check datagram failed - slave %i did"
-               " not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE mailbox check"
+                " datagram failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }
 
@@ -1533,8 +1549,9 @@
 
     if (datagram->working_counter != 1) {
         fsm->state = ec_fsm_coe_error;
-        EC_ERR("Reception of CoE upload segment response failed - slave %i"
-               " did not respond.\n", slave->ring_position);
+        EC_ERR("Reception of CoE upload segment"
+                " response failed on slave %i: ", slave->ring_position);
+        ec_datagram_print_wc_error(datagram);
         return;
     }