equal
deleted
inserted
replaced
625 if (!ec_slave_mbox_check(datagram)) { |
625 if (!ec_slave_mbox_check(datagram)) { |
626 unsigned long diff_ms = |
626 unsigned long diff_ms = |
627 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
627 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
628 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
628 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
629 fsm->state = ec_fsm_coe_error; |
629 fsm->state = ec_fsm_coe_error; |
630 EC_ERR("Timeout while waiting for SDO object description " |
630 EC_ERR("Timeout while waiting for SDO 0x%04x object description " |
631 "response on slave %u.\n", slave->ring_position); |
631 "response on slave %u.\n", fsm->sdo->index, |
|
632 slave->ring_position); |
632 return; |
633 return; |
633 } |
634 } |
634 |
635 |
635 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
636 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
636 fsm->retries = EC_FSM_RETRIES; |
637 fsm->retries = EC_FSM_RETRIES; |
861 if (!ec_slave_mbox_check(datagram)) { |
862 if (!ec_slave_mbox_check(datagram)) { |
862 unsigned long diff_ms = |
863 unsigned long diff_ms = |
863 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
864 (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ; |
864 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
865 if (diff_ms >= EC_FSM_COE_DICT_TIMEOUT) { |
865 fsm->state = ec_fsm_coe_error; |
866 fsm->state = ec_fsm_coe_error; |
866 EC_ERR("Timeout while waiting for SDO entry description response " |
867 EC_ERR("Timeout while waiting for SDO entry 0x%04x:%x" |
867 "on slave %u.\n", slave->ring_position); |
868 " description response on slave %u.\n", |
|
869 fsm->sdo->index, fsm->subindex, slave->ring_position); |
868 return; |
870 return; |
869 } |
871 } |
870 |
872 |
871 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
873 ec_slave_mbox_prepare_check(slave, datagram); // can not fail. |
872 fsm->retries = EC_FSM_RETRIES; |
874 fsm->retries = EC_FSM_RETRIES; |