diff -r 90bcaf9ce3d5 -r a486591ba86b master/fsm_coe.c --- a/master/fsm_coe.c Tue Jun 10 09:54:30 2008 +0000 +++ b/master/fsm_coe.c Tue Jun 10 11:54:39 2008 +0000 @@ -304,7 +304,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE dictionary request datagram for" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -341,7 +341,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE mailbox check datagram for slave %u" - " (datagram state %i).\n", + " (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -397,7 +397,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE dictionary response datagram for" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -536,7 +536,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE Sdo description request datagram for" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -573,7 +573,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE mailbox check datagram from slave %u" - " (datagram state %i).\n", + " (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -628,7 +628,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE Sdo description response datagram from" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -750,7 +750,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE Sdo entry request datagram for" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -788,7 +788,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE mailbox check datagram from slave %u" - " (datagram state %i).\n", + " (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -844,7 +844,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE Sdo description response datagram from" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1056,7 +1056,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE download request datagram for" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1093,7 +1093,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE mailbox check datagram for slave %u" - " (datagram state %i).\n", + " (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1147,7 +1147,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE download response datagram from" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1285,7 +1285,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE upload request for slave %u" - " (datagram state %i).\n", + " (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1322,7 +1322,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE mailbox check datagram from slave %u" - " (datagram state %i).\n", + " (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1379,7 +1379,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE upload response datagram for" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1525,7 +1525,7 @@ fsm->toggle = 0; if (data_size < complete_size) { - EC_WARN("Sdo data incomplete (%i / %i).\n", + EC_WARN("Sdo data incomplete (%u / %u).\n", data_size, complete_size); if (!(data = ec_slave_mbox_prepare_send(slave, datagram, @@ -1575,7 +1575,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE upload segment request datagram for" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1612,7 +1612,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE mailbox check datagram for slave %u" - " (datagram state %i).\n", + " (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1670,7 +1670,7 @@ if (datagram->state != EC_DATAGRAM_RECEIVED) { fsm->state = ec_fsm_coe_error; EC_ERR("Failed to receive CoE upload segment response datagram for" - " slave %u (datagram state %i).\n", + " slave %u (datagram state %u).\n", slave->ring_position, datagram->state); return; } @@ -1739,7 +1739,7 @@ data_size = rec_size - 10; if (data_size != seg_size) { - EC_WARN("Sdo segment data invalid (%i / %i)" + EC_WARN("Sdo segment data invalid (%u / %u)" " - Fragmenting not implemented.\n", data_size, seg_size); }