equal
deleted
inserted
replaced
228 { |
228 { |
229 #ifdef EC_EOE |
229 #ifdef EC_EOE |
230 ec_master_clear_eoe_handlers(master); |
230 ec_master_clear_eoe_handlers(master); |
231 #endif |
231 #endif |
232 ec_master_destroy_slave_configs(master); |
232 ec_master_destroy_slave_configs(master); |
233 ec_master_destroy_slaves(master); |
233 ec_master_clear_slaves(master); |
234 ec_master_destroy_domains(master); |
234 ec_master_destroy_domains(master); |
235 ec_fsm_master_clear(&master->fsm); |
235 ec_fsm_master_clear(&master->fsm); |
236 ec_datagram_clear(&master->fsm_datagram); |
236 ec_datagram_clear(&master->fsm_datagram); |
237 ec_device_clear(&master->backup_device); |
237 ec_device_clear(&master->backup_device); |
238 ec_device_clear(&master->main_device); |
238 ec_device_clear(&master->main_device); |
278 |
278 |
279 /*****************************************************************************/ |
279 /*****************************************************************************/ |
280 |
280 |
281 /** Destroy all slaves. |
281 /** Destroy all slaves. |
282 */ |
282 */ |
283 void ec_master_destroy_slaves(ec_master_t *master) |
283 void ec_master_clear_slaves(ec_master_t *master) |
284 { |
284 { |
285 ec_slave_t *slave, *next; |
285 ec_slave_t *slave, *next; |
286 |
286 |
287 list_for_each_entry_safe(slave, next, &master->slaves, list) { |
287 list_for_each_entry_safe(slave, next, &master->slaves, list) { |
288 list_del(&slave->list); |
288 list_del(&slave->list); |
289 ec_slave_destroy(slave); |
289 ec_slave_clear(slave); |
|
290 kfree(slave); |
290 } |
291 } |
291 |
292 |
292 master->slave_count = 0; |
293 master->slave_count = 0; |
293 } |
294 } |
294 |
295 |
410 |
411 |
411 #ifdef EC_EOE |
412 #ifdef EC_EOE |
412 ec_master_eoe_stop(master); |
413 ec_master_eoe_stop(master); |
413 #endif |
414 #endif |
414 ec_master_thread_stop(master); |
415 ec_master_thread_stop(master); |
415 ec_master_destroy_slaves(master); |
416 ec_master_clear_slaves(master); |
416 } |
417 } |
417 |
418 |
418 /*****************************************************************************/ |
419 /*****************************************************************************/ |
419 |
420 |
420 /** |
421 /** |