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

EL31XX-Typ korrigiert.

This commit is contained in:
Florian Pose 2006-02-23 14:51:45 +00:00
parent 48dad7c5c5
commit d02fbc8701
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
master/domain.c
View File

@ -205,7 +205,7 @@ ec_slave_t *EtherCAT_rt_register_slave_field(
ec_master_t *master;
const ec_sync_t *sync;
const ec_field_t *field;
unsigned int field_idx, found, i, j;
unsigned int field_idx, i, j;
uint32_t field_offset;
if (!field_count) {
@ -234,8 +234,7 @@ ec_slave_t *EtherCAT_rt_register_slave_field(
}
field_idx = 0;
found = 0;
for (i = 0; type->sync_managers[i] && !found; i++) {
for (i = 0; type->sync_managers[i]; i++) {
sync = type->sync_managers[i];
field_offset = 0;
for (j = 0; sync->fields[j]; j++) {
@ -252,9 +251,10 @@ ec_slave_t *EtherCAT_rt_register_slave_field(
}
}
printk(KERN_ERR "EtherCAT: Slave %i (\"%s %s\") has less than %i fields of"
" type %i, starting at %i!\n", slave->ring_position,
vendor_name, product_name, field_count, field_type, field_index);
printk(KERN_ERR "EtherCAT: Slave %i (\"%s %s\") has less than %i field(s)"
" of type %i, starting at %i (only %i)!\n", slave->ring_position,
vendor_name, product_name, field_count, field_type, field_index,
field_idx);
return NULL;
}

4
master/types.c
View File

@ -88,12 +88,12 @@ const ec_sync_t el31X2_sm3 = {
const ec_slave_type_t Beckhoff_EL3102 = {
"Beckhoff", "EL3102", "2x Analog Input diff.",
{&mailbox_sm0, &mailbox_sm1, &el31X2_sm2, &el31X2_sm2, NULL}
{&mailbox_sm0, &mailbox_sm1, &el31X2_sm2, &el31X2_sm3, NULL}
};
const ec_slave_type_t Beckhoff_EL3162 = {
"Beckhoff", "EL3102", "2x Analog Input",
{&mailbox_sm0, &mailbox_sm1, &el31X2_sm2, &el31X2_sm2, NULL}
{&mailbox_sm0, &mailbox_sm1, &el31X2_sm2, &el31X2_sm3, NULL}
};
/*****************************************************************************/