bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge.

This commit is contained in:
Florian Pose 2010-09-22 15:41:43 +02:00
parent d3a9a36d63 65cffd14d9
commit 19a1a019ea
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
master/fsm_sii.c
View File

@ -184,7 +184,8 @@ void ec_fsm_sii_state_start_reading(
EC_WRITE_U16(datagram->data + 2, fsm->word_offset);
#ifdef SII_DEBUG
EC_SLAVE_DBG(slave, 0, "reading SII data:\n");
EC_SLAVE_DBG(fsm->slave, 0, "reading SII data, word %u:\n",
fsm->word_offset);
ec_print_data(datagram->data, 4);
#endif

6
master/fsm_slave_scan.c
View File

@ -505,8 +505,10 @@ void ec_fsm_slave_scan_state_sii_size(ec_fsm_slave_scan_t *fsm /**< slave state
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);