# HG changeset patch # User Florian Pose # Date 1462281282 -7200 # Node ID b7ac213beac5e3bd6e491b2ebcd7ad69b02676e0 # Parent 0c3987a1b3eef991c2c7de2b4a87145f373df51a Do not touch AL state of EoE slaves. diff -r 0c3987a1b3ee -r b7ac213beac5 master/ethernet.c --- a/master/ethernet.c Tue May 03 14:18:29 2016 +0200 +++ b/master/ethernet.c Tue May 03 15:14:42 2016 +0200 @@ -863,7 +863,6 @@ #if EOE_DEBUG_LEVEL >= 2 EC_SLAVE_DBG(eoe->slave, 0, "%s opened.\n", dev->name); #endif - ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_OP); return 0; } @@ -885,7 +884,6 @@ #if EOE_DEBUG_LEVEL >= 2 EC_SLAVE_DBG(eoe->slave, 0, "%s stopped.\n", dev->name); #endif - ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_PREOP); return 0; } diff -r 0c3987a1b3ee -r b7ac213beac5 master/master.c --- a/master/master.c Tue May 03 14:18:29 2016 +0200 +++ b/master/master.c Tue May 03 15:14:42 2016 +0200 @@ -685,9 +685,6 @@ { int ret = 0; ec_slave_t *slave; -#ifdef EC_EOE - ec_eoe_t *eoe; -#endif EC_MASTER_DBG(master, 1, "IDLE -> OPERATION.\n"); @@ -737,14 +734,6 @@ ec_slave_request_state(slave, EC_SLAVE_STATE_PREOP); } -#ifdef EC_EOE - // ... but set EoE slaves to OP - list_for_each_entry(eoe, &master->eoe_handlers, list) { - if (ec_eoe_is_open(eoe)) - ec_slave_request_state(eoe->slave, EC_SLAVE_STATE_OP); - } -#endif - master->phase = EC_OPERATION; master->app_send_cb = NULL; master->app_receive_cb = NULL;