From 2e4bcb9728e2e9214bc7a9833ffd05b9341fa126 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Wed, 19 Jul 2006 13:08:21 +0000
Subject: [PATCH] Renamed IDLE mode to ORPHANED mode.
---
master/master.c | 8 ++++----
master/master.h | 2 +-
master/module.c | 2 --
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/master/master.c b/master/master.c
index 47ddbb61..83ef7b70 100644
--- a/master/master.c
+++ b/master/master.c
@@ -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:
diff --git a/master/master.h b/master/master.h
index 1be89918..571544ca 100644
--- a/master/master.h
+++ b/master/master.h
@@ -57,7 +57,7 @@
typedef enum
{
- EC_MASTER_MODE_IDLE,
+ EC_MASTER_MODE_ORPHANED,
EC_MASTER_MODE_FREERUN,
EC_MASTER_MODE_RUNNING
}
diff --git a/master/module.c b/master/module.c
index eeca62ea..4f84f9f3 100644
--- a/master/module.c
+++ b/master/module.c
@@ -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);
--
GitLab