Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-02-05 19:39:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added configure switch --disable-rt-syslog.

Browse Source
This commit is contained in:
Florian Pose
2013-10-21 19:27:50 +02:00
parent 8f30b86a84
commit e385a9bb62
3 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
master/domain.c
View File

@@ -466,7 +466,10 @@ void ecrt_domain_process(ec_domain_t *domain)
ec_fmmu_config_t, list);
unsigned int redundancy;
#endif
unsigned int dev_idx, wc_change;
unsigned int dev_idx;
#ifdef EC_RT_SYSLOG
unsigned int wc_change;
#endif
#if DEBUG_REDUNDANCY
EC_MASTER_DBG(domain->master, 1, "domain %u process\n", domain->index);
@@ -569,6 +572,7 @@ void ecrt_domain_process(ec_domain_t *domain)
redundancy = redundant_wc > 0;
if (redundancy != domain->redundancy_active) {
#ifdef EC_RT_SYSLOG
if (redundancy) {
EC_MASTER_WARN(domain->master,
"Domain %u: Redundant link in use!\n",
@@ -578,23 +582,29 @@ void ecrt_domain_process(ec_domain_t *domain)
"Domain %u: Redundant link unused again.\n",
domain->index);
}
#endif
domain->redundancy_active = redundancy;
}
#else
domain->redundancy_active = 0;
#endif
#ifdef EC_RT_SYSLOG
wc_change = 0;
#endif
wc_total = 0;
for (dev_idx = EC_DEVICE_MAIN;
dev_idx < ec_master_num_devices(domain->master); dev_idx++) {
if (wc_sum[dev_idx] != domain->working_counter[dev_idx]) {
#ifdef EC_RT_SYSLOG
wc_change = 1;
#endif
domain->working_counter[dev_idx] = wc_sum[dev_idx];
}
wc_total += wc_sum[dev_idx];
}
#ifdef EC_RT_SYSLOG
if (wc_change) {
domain->working_counter_changes++;
}
@@ -630,6 +640,7 @@ void ecrt_domain_process(ec_domain_t *domain)
domain->working_counter_changes = 0;
}
#endif
}
/*****************************************************************************/