532 || slave->requested_state == EC_SLAVE_STATE_UNKNOWN |
532 || slave->requested_state == EC_SLAVE_STATE_UNKNOWN |
533 || (slave->current_state == slave->requested_state |
533 || (slave->current_state == slave->requested_state |
534 && (slave->configured |
534 && (slave->configured |
535 || slave->current_state == EC_SLAVE_STATE_INIT))) continue; |
535 || slave->current_state == EC_SLAVE_STATE_INIT))) continue; |
536 |
536 |
|
537 ec_state_string(slave->current_state, old_state); |
|
538 ec_state_string(slave->requested_state, new_state); |
|
539 |
537 if (!slave->configured |
540 if (!slave->configured |
538 && slave->current_state != EC_SLAVE_STATE_INIT) { |
541 && slave->current_state != EC_SLAVE_STATE_INIT) { |
539 ec_state_string(slave->current_state, old_state); |
542 EC_INFO("Reconfiguring slave %i (%s -> %s).\n", |
540 EC_INFO("Reconfiguring slave %i (%s).\n", |
543 slave->ring_position, old_state, new_state); |
541 slave->ring_position, old_state); |
544 } |
542 } |
545 else if (slave->current_state != slave->requested_state) { |
543 |
546 EC_INFO("Changing state of slave %i (%s -> %s).\n", |
544 if (slave->current_state != slave->requested_state) { |
|
545 ec_state_string(slave->current_state, old_state); |
|
546 ec_state_string(slave->requested_state, new_state); |
|
547 EC_INFO("Changing state of slave %i from %s to %s.\n", |
|
548 slave->ring_position, old_state, new_state); |
547 slave->ring_position, old_state, new_state); |
549 } |
548 } |
550 |
549 |
551 fsm->slave = slave; |
550 fsm->slave = slave; |
552 fsm->slave_state = ec_fsm_slaveconf_init; |
551 fsm->slave_state = ec_fsm_slaveconf_init; |