Read at least 64 words, when SII size determination failed.
authorFlorian Pose <fp@igh-essen.com>
Wed, 22 Sep 2010 12:28:36 +0200
changeset 1958 7dceb43bd855
parent 1957 b481ccf21272
child 1965 c6e6ec6ba5d8
Read at least 64 words, when SII size determination failed.
master/fsm_slave_scan.c
--- a/master/fsm_slave_scan.c	Wed Sep 22 12:26:32 2010 +0200
+++ b/master/fsm_slave_scan.c	Wed Sep 22 12:28:36 2010 +0200
@@ -505,8 +505,10 @@
         fsm->slave->error_flag = 1;
         fsm->state = ec_fsm_slave_scan_state_error;
         EC_SLAVE_ERR(slave, "Failed to determine SII content size:"
-                " Reading word offset 0x%04x failed.\n", fsm->sii_offset);
-        return;
+                " Reading word offset 0x%04x failed. Assuming %u words.\n",
+                fsm->sii_offset, EC_FIRST_SII_CATEGORY_OFFSET);
+        slave->sii_nwords = EC_FIRST_SII_CATEGORY_OFFSET;
+        goto alloc_sii;
     }
 
     cat_type = EC_READ_U16(fsm->fsm_sii.value);