From 4ad89af4d4b670b1a666e3777508aead2d24f635 Mon Sep 17 00:00:00 2001 From: Florian Date: Thu, 25 Apr 2024 11:01:55 +0200 Subject: [PATCH] Revert "Completely disable SII reading during scan to estimate benefit of SII caching." This reverts commit 4417467a8344bd38cf79d7938248aca8d77b137f. --- master/fsm_slave_scan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/master/fsm_slave_scan.c b/master/fsm_slave_scan.c index 6f271b1c..5f56d60d 100644 --- a/master/fsm_slave_scan.c +++ b/master/fsm_slave_scan.c @@ -529,11 +529,7 @@ void ec_fsm_slave_scan_state_datalink( #ifdef EC_SII_ASSIGN ec_fsm_slave_scan_enter_assign_sii(fsm); #else -#ifdef EC_REGALIAS - ec_fsm_slave_scan_enter_regalias(fsm); -#else - fsm->state = ec_fsm_slave_scan_state_end; -#endif + ec_fsm_slave_scan_enter_sii_size(fsm); #endif } @@ -929,7 +925,11 @@ void ec_fsm_slave_scan_state_regalias( slave->effective_alias); } - fsm->state = ec_fsm_slave_scan_state_end; + if (slave->sii.mailbox_protocols & EC_MBOX_COE) { + ec_fsm_slave_scan_enter_preop(fsm); + } else { + fsm->state = ec_fsm_slave_scan_state_end; + } } #endif // defined EC_REGALIAS