equal
deleted
inserted
replaced
1524 #define EC_FIND_SLAVE \ |
1524 #define EC_FIND_SLAVE \ |
1525 do { \ |
1525 do { \ |
1526 if (alias) { \ |
1526 if (alias) { \ |
1527 for (; slave < master->slaves + master->slave_count; \ |
1527 for (; slave < master->slaves + master->slave_count; \ |
1528 slave++) { \ |
1528 slave++) { \ |
1529 if (slave->sii.alias == alias) \ |
1529 if (slave->effective_alias == alias) \ |
1530 break; \ |
1530 break; \ |
1531 } \ |
1531 } \ |
1532 if (slave == master->slaves + master->slave_count) \ |
1532 if (slave == master->slaves + master->slave_count) \ |
1533 return NULL; \ |
1533 return NULL; \ |
1534 } \ |
1534 } \ |
2260 slave_info->position = slave->ring_position; |
2260 slave_info->position = slave->ring_position; |
2261 slave_info->vendor_id = slave->sii.vendor_id; |
2261 slave_info->vendor_id = slave->sii.vendor_id; |
2262 slave_info->product_code = slave->sii.product_code; |
2262 slave_info->product_code = slave->sii.product_code; |
2263 slave_info->revision_number = slave->sii.revision_number; |
2263 slave_info->revision_number = slave->sii.revision_number; |
2264 slave_info->serial_number = slave->sii.serial_number; |
2264 slave_info->serial_number = slave->sii.serial_number; |
2265 slave_info->alias = slave->sii.alias; |
2265 slave_info->alias = slave->effective_alias; |
2266 slave_info->current_on_ebus = slave->sii.current_on_ebus; |
2266 slave_info->current_on_ebus = slave->sii.current_on_ebus; |
2267 slave_info->al_state = slave->current_state; |
2267 slave_info->al_state = slave->current_state; |
2268 slave_info->error_flag = slave->error_flag; |
2268 slave_info->error_flag = slave->error_flag; |
2269 slave_info->sync_count = slave->sii.sync_count; |
2269 slave_info->sync_count = slave->sii.sync_count; |
2270 slave_info->sdo_count = ec_slave_sdo_count(slave); |
2270 slave_info->sdo_count = ec_slave_sdo_count(slave); |