From 2570ab334564a53bc71e5a7279d29995e0e1db44 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 24 Jan 2020 14:36:43 +0100 Subject: [PATCH] Fixed infinite waiting for SoE write response. --- master/fsm_soe.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/master/fsm_soe.c b/master/fsm_soe.c index 87e97a59..00d39faf 100644 --- a/master/fsm_soe.c +++ b/master/fsm_soe.c @@ -1,8 +1,6 @@ /****************************************************************************** * - * $Id$ - * - * Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH + * Copyright (C) 2006-2020 Florian Pose, Ingenieurgemeinschaft IgH * * This file is part of the IgH EtherCAT Master. * @@ -563,7 +561,6 @@ void ec_fsm_soe_write_next_fragment( ec_print_data(data, EC_SOE_SIZE + fsm->fragment_size); } - req->jiffies_sent = jiffies; fsm->state = ec_fsm_soe_write_request; } @@ -600,6 +597,7 @@ void ec_fsm_soe_write_start( fsm->offset = 0; fsm->retries = EC_FSM_RETRIES; ec_fsm_soe_write_next_fragment(fsm, datagram); + req->jiffies_sent = jiffies; } /*****************************************************************************/ @@ -652,6 +650,7 @@ void ec_fsm_soe_write_request( // next fragment fsm->retries = EC_FSM_RETRIES; ec_fsm_soe_write_next_fragment(fsm, datagram); + fsm->request->jiffies_sent = jiffies; } else { // all fragments sent; query response fsm->jiffies_start = fsm->datagram->jiffies_sent;