From 5ab7c52239580432f015908a64d55ab34108e812 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Fri, 25 Apr 2008 12:13:26 +0000
Subject: [PATCH] Moved setting of the allow flags.
---
master/master.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/master/master.c b/master/master.c
index e0904601..b825f77b 100644
--- a/master/master.c
+++ b/master/master.c
@@ -1315,9 +1315,6 @@ int ecrt_master_activate(ec_master_t *master)
domain_offset += domain->data_size;
}
- master->allow_config = 1; // request the current configuration
- master->allow_scan = 1; // allow re-scanning on topology change
-
// restart EoE process and master thread with new locking
#ifdef EC_EOE
ec_master_eoe_stop(master);
@@ -1337,10 +1334,12 @@ int ecrt_master_activate(ec_master_t *master)
EC_ERR("Failed to start master thread!\n");
return -1;
}
-
#ifdef EC_EOE
ec_master_eoe_start(master);
#endif
+
+ master->allow_config = 1; // request the current configuration
+ master->allow_scan = 1; // allow re-scanning on topology change
return 0;
}
--
GitLab