bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed IDLE mode to ORPHANED mode.

This commit is contained in:
Florian Pose 2006-07-19 13:08:21 +00:00
parent c0a73f9615
commit 14fe2a8557
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
master/master.c
View File

@ -245,7 +245,7 @@ void ec_master_reset(ec_master_t *master /**< EtherCAT master */)
master->stats.unmatched = 0;
master->stats.t_last = 0;
master->mode = EC_MASTER_MODE_IDLE;
master->mode = EC_MASTER_MODE_ORPHANED;
master->request_cb = NULL;
master->release_cb = NULL;
@ -707,7 +707,7 @@ void ec_master_freerun_stop(ec_master_t *master /**< EtherCAT master */)
ec_master_eoe_stop(master);
EC_INFO("Stopping Free-Run mode.\n");
master->mode = EC_MASTER_MODE_IDLE;
master->mode = EC_MASTER_MODE_ORPHANED;
if (!cancel_delayed_work(&master->freerun_work)) {
flush_workqueue(master->workqueue);
@ -843,8 +843,8 @@ ssize_t ec_show_master_attribute(struct kobject *kobj, /**< kobject */
}
else if (attr == &attr_mode) {
switch (master->mode) {
case EC_MASTER_MODE_IDLE:
return sprintf(buffer, "IDLE\n");
case EC_MASTER_MODE_ORPHANED:
return sprintf(buffer, "ORPHANED\n");
case EC_MASTER_MODE_FREERUN:
return sprintf(buffer, "FREERUN\n");
case EC_MASTER_MODE_RUNNING:

2
master/master.h
View File

@ -57,7 +57,7 @@
typedef enum
{
EC_MASTER_MODE_IDLE,
EC_MASTER_MODE_ORPHANED,
EC_MASTER_MODE_FREERUN,
EC_MASTER_MODE_RUNNING
}

2
master/module.c
View File

@ -466,8 +466,6 @@ void ecrt_release_master(ec_master_t *master /**< EtherCAT master */)
}
ec_master_reset(master);
master->mode = EC_MASTER_MODE_IDLE;
ec_master_freerun_start(master);
module_put(master->device->module);