equal
deleted
inserted
replaced
367 if (!ec_slave_mbox_check(datagram)) { |
367 if (!ec_slave_mbox_check(datagram)) { |
368 unsigned long diff_ms = |
368 unsigned long diff_ms = |
369 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
369 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
370 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
370 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
371 fsm->state = ec_fsm_coe_error; |
371 fsm->state = ec_fsm_coe_error; |
372 EC_ERR("Timeout while checking Sdo dictionary on slave %u.\n", |
372 EC_ERR("Timeout while waiting for Sdo dictionary list response " |
373 slave->ring_position); |
373 "on slave %u.\n", slave->ring_position); |
374 return; |
374 return; |
375 } |
375 } |
376 |
376 |
377 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
377 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
378 fsm->retries = EC_FSM_RETRIES; |
378 fsm->retries = EC_FSM_RETRIES; |
611 if (!ec_slave_mbox_check(datagram)) { |
611 if (!ec_slave_mbox_check(datagram)) { |
612 unsigned long diff_ms = |
612 unsigned long diff_ms = |
613 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
613 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
614 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
614 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
615 fsm->state = ec_fsm_coe_error; |
615 fsm->state = ec_fsm_coe_error; |
616 EC_ERR("Timeout while checking Sdo description on slave %u.\n", |
616 EC_ERR("Timeout while waiting for Sdo object description " |
617 slave->ring_position); |
617 "response on slave %u.\n", slave->ring_position); |
618 return; |
618 return; |
619 } |
619 } |
620 |
620 |
621 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
621 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
622 fsm->retries = EC_FSM_RETRIES; |
622 fsm->retries = EC_FSM_RETRIES; |
846 if (!ec_slave_mbox_check(datagram)) { |
846 if (!ec_slave_mbox_check(datagram)) { |
847 unsigned long diff_ms = |
847 unsigned long diff_ms = |
848 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
848 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
849 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
849 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
850 fsm->state = ec_fsm_coe_error; |
850 fsm->state = ec_fsm_coe_error; |
851 EC_ERR("Timeout while checking Sdo entry on slave %u.\n", |
851 EC_ERR("Timeout while waiting for Sdo entry description response " |
852 slave->ring_position); |
852 "on slave %u.\n", slave->ring_position); |
853 return; |
853 return; |
854 } |
854 } |
855 |
855 |
856 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
856 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
857 fsm->retries = EC_FSM_RETRIES; |
857 fsm->retries = EC_FSM_RETRIES; |
1428 if (!ec_slave_mbox_check(datagram)) { |
1428 if (!ec_slave_mbox_check(datagram)) { |
1429 unsigned long diff_ms = |
1429 unsigned long diff_ms = |
1430 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
1430 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
1431 if (diff_ms >= fsm->request->response_timeout) { |
1431 if (diff_ms >= fsm->request->response_timeout) { |
1432 fsm->state = ec_fsm_coe_error; |
1432 fsm->state = ec_fsm_coe_error; |
1433 EC_ERR("Timeout while checking Sdo upload on slave %u.\n", |
1433 EC_ERR("Timeout while waiting for Sdo upload response on " |
1434 slave->ring_position); |
1434 "slave %u.\n", slave->ring_position); |
1435 return; |
1435 return; |
1436 } |
1436 } |
1437 |
1437 |
1438 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
1438 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
1439 fsm->retries = EC_FSM_RETRIES; |
1439 fsm->retries = EC_FSM_RETRIES; |