Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-27 20:44:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug that caused the configuration not to be cleared when reserved but

Browse Source 
not activated and then releasing.
This commit is contained in:
Florian Pose
2010-06-02 22:54:08 +02:00
parent c442beaa02
commit 8b6d5f8af3
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
master/master.c
+21 -9
View File
@@ -439,6 +439,20 @@ void ec_master_clear_domains(ec_master_t *master)
/*****************************************************************************/
/** Clear the configuration applied by the application.
*/
void ec_master_clear_config(
ec_master_t *master /**< EtherCAT master. */
)
{
down(&master->master_sem);
ec_master_clear_domains(master);
ec_master_clear_slave_configs(master);
up(&master->master_sem);
}
/*****************************************************************************/
/** Internal sending callback.
*/
void ec_master_internal_send_cb(
@@ -653,15 +667,17 @@ void ec_master_leave_operation_phase(
ec_master_t *master /**< EtherCAT master */
)
{
if (master->active)
ecrt_master_deactivate(master);
if (master->active) {
ecrt_master_deactivate(master); // also clears config
} else {
ec_master_clear_config(master);
}
EC_MASTER_DBG(master, 1, "OPERATION -> IDLE.\n");
master->phase = EC_IDLE;
}
/*****************************************************************************/
/** Injects external datagrams that fit into the datagram queue.
@@ -1989,8 +2005,7 @@ void ecrt_master_deactivate(ec_master_t *master)
int eoe_was_running;
#endif
EC_MASTER_DBG(master, 1, "ecrt_master_deactivate(master = 0x%p)\n",
master);
EC_MASTER_DBG(master, 1, "%s(master = 0x%p)\n", __func__, master);
if (!master->active) {
EC_MASTER_WARN(master, "%s: Master not active.\n", __func__);
@@ -2007,10 +2022,7 @@ void ecrt_master_deactivate(ec_master_t *master)
master->receive_cb = ec_master_internal_receive_cb;
master->cb_data = master;
down(&master->master_sem);
ec_master_clear_domains(master);
ec_master_clear_slave_configs(master);
up(&master->master_sem);
ec_master_clear_config(master);
for (slave = master->slaves;
slave < master->slaves + master->slave_count;