master/fsm_foe.c
branchstable-1.5
changeset 2528 8bb574da5da2
parent 2527 f51f3ef3260d
equal deleted inserted replaced
2527:f51f3ef3260d 2528:8bb574da5da2
   368         return;
   368         return;
   369     }
   369     }
   370 
   370 
   371     if (!ec_slave_mbox_check(fsm->datagram)) {
   371     if (!ec_slave_mbox_check(fsm->datagram)) {
   372         // slave did not put anything in the mailbox yet
   372         // slave did not put anything in the mailbox yet
   373         unsigned long diff_ms =
   373         unsigned long diff_ms = (fsm->datagram->jiffies_received -
   374             (datagram->jiffies_received - fsm->jiffies_start) * 1000 / HZ;
   374                 fsm->jiffies_start) * 1000 / HZ;
   375         if (diff_ms >= EC_FSM_FOE_TIMEOUT) {
   375         if (diff_ms >= EC_FSM_FOE_TIMEOUT) {
   376             ec_foe_set_tx_error(fsm, FOE_TIMEOUT_ERROR);
   376             ec_foe_set_tx_error(fsm, FOE_TIMEOUT_ERROR);
   377             EC_SLAVE_ERR(slave, "Timeout while waiting for ack response.\n");
   377             EC_SLAVE_ERR(slave, "Timeout while waiting for ack response.\n");
   378             return;
   378             return;
   379         }
   379         }
   707         ec_datagram_print_wc_error(fsm->datagram);
   707         ec_datagram_print_wc_error(fsm->datagram);
   708         return;
   708         return;
   709     }
   709     }
   710 
   710 
   711     if (!ec_slave_mbox_check(fsm->datagram)) {
   711     if (!ec_slave_mbox_check(fsm->datagram)) {
   712         unsigned long diff_ms =
   712         unsigned long diff_ms = (fsm->datagram->jiffies_received -
   713             (fsm->datagram->jiffies_received - fsm->jiffies_start) *
   713                 fsm->jiffies_start) * 1000 / HZ;
   714             1000 / HZ;
       
   715         if (diff_ms >= EC_FSM_FOE_TIMEOUT) {
   714         if (diff_ms >= EC_FSM_FOE_TIMEOUT) {
   716             ec_foe_set_tx_error(fsm, FOE_TIMEOUT_ERROR);
   715             ec_foe_set_tx_error(fsm, FOE_TIMEOUT_ERROR);
   717             EC_SLAVE_ERR(slave, "Timeout while waiting for ack response.\n");
   716             EC_SLAVE_ERR(slave, "Timeout while waiting for ack response.\n");
   718             return;
   717             return;
   719         }
   718         }