author | Edouard Tisserant <edouard.tisserant@gmail.com> |
Mon, 10 Sep 2018 22:40:27 +0200 | |
branch | stable-1.5 |
changeset 2705 | c6e3c6d66af0 |
parent 2532 | bdadf6da4914 |
permissions | -rw-r--r-- |
42
a22a202d0f42
Domains, Warten beim Senden, 10kHz.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1 |
/****************************************************************************** |
a22a202d0f42
Domains, Warten beim Senden, 10kHz.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2 |
* |
a22a202d0f42
Domains, Warten beim Senden, 10kHz.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3 |
* $Id$ |
a22a202d0f42
Domains, Warten beim Senden, 10kHz.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4 |
* |
1326
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
5 |
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH |
197
b9a6e2c22745
GPLv2 License and enhanced Doxygen output.
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
6 |
* |
b9a6e2c22745
GPLv2 License and enhanced Doxygen output.
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
7 |
* This file is part of the IgH EtherCAT Master. |
b9a6e2c22745
GPLv2 License and enhanced Doxygen output.
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
8 |
* |
1326
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
9 |
* The IgH EtherCAT Master is free software; you can redistribute it and/or |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
10 |
* modify it under the terms of the GNU General Public License version 2, as |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
11 |
* published by the Free Software Foundation. |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
12 |
* |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
13 |
* The IgH EtherCAT Master is distributed in the hope that it will be useful, |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
14 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
15 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
16 |
* Public License for more details. |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
17 |
* |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
18 |
* You should have received a copy of the GNU General Public License along |
ef907b0b5125
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com>
parents:
1313
diff
changeset
|
19 |
* with the IgH EtherCAT Master; if not, write to the Free Software |
197
b9a6e2c22745
GPLv2 License and enhanced Doxygen output.
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
20 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
b9a6e2c22745
GPLv2 License and enhanced Doxygen output.
Florian Pose <fp@igh-essen.com>
parents:
195
diff
changeset
|
21 |
* |
1363
11c0b2caa253
Improved and added license headers.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
22 |
* --- |
11c0b2caa253
Improved and added license headers.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
23 |
* |
11c0b2caa253
Improved and added license headers.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
24 |
* The license mentioned above concerns the source code only. Using the |
11c0b2caa253
Improved and added license headers.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
25 |
* EtherCAT technology and brand is only permitted in compliance with the |
11c0b2caa253
Improved and added license headers.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
26 |
* industrial property and similar rights of Beckhoff Automation GmbH. |
246
0bf7c769de06
Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents:
199
diff
changeset
|
27 |
* |
42
a22a202d0f42
Domains, Warten beim Senden, 10kHz.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
28 |
*****************************************************************************/ |
a22a202d0f42
Domains, Warten beim Senden, 10kHz.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
29 |
|
199
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
30 |
/** |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
31 |
\file |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
32 |
EtherCAT domain methods. |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
33 |
*/ |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
34 |
|
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
35 |
/*****************************************************************************/ |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
36 |
|
294
feea8d850c65
Applied include patch by M. Schwerin.
Florian Pose <fp@igh-essen.com>
parents:
293
diff
changeset
|
37 |
#include <linux/module.h> |
feea8d850c65
Applied include patch by M. Schwerin.
Florian Pose <fp@igh-essen.com>
parents:
293
diff
changeset
|
38 |
|
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
39 |
#include "globals.h" |
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
40 |
#include "master.h" |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
41 |
#include "slave_config.h" |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
42 |
|
54
7506e67dd122
Vereinheitlichte Schnittstellen, Include-Verzeichnis und Module getrennt.
Florian Pose <fp@igh-essen.com>
parents:
52
diff
changeset
|
43 |
#include "domain.h" |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
44 |
#include "datagram_pair.h" |
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
45 |
|
2522
ec403cf308eb
Updated Doxygen documentation.
Florian Pose <fp@igh-essen.com>
parents:
2470
diff
changeset
|
46 |
/** Extra debug output for redundancy functions. |
ec403cf308eb
Updated Doxygen documentation.
Florian Pose <fp@igh-essen.com>
parents:
2470
diff
changeset
|
47 |
*/ |
2367
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
48 |
#define DEBUG_REDUNDANCY 0 |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
49 |
|
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
50 |
/*****************************************************************************/ |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
51 |
|
809 | 52 |
void ec_domain_clear_data(ec_domain_t *); |
199
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
53 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
166
diff
changeset
|
54 |
/*****************************************************************************/ |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
166
diff
changeset
|
55 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
56 |
/** Domain constructor. |
993
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
57 |
*/ |
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
58 |
void ec_domain_init( |
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
59 |
ec_domain_t *domain, /**< EtherCAT domain. */ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
60 |
ec_master_t *master, /**< Parent master. */ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
61 |
unsigned int index /**< Index. */ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
62 |
) |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
63 |
{ |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
64 |
unsigned int dev_idx; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
65 |
|
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
66 |
domain->master = master; |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
166
diff
changeset
|
67 |
domain->index = index; |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
68 |
INIT_LIST_HEAD(&domain->fmmu_configs); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
69 |
domain->data_size = 0; |
809 | 70 |
domain->data = NULL; |
71 |
domain->data_origin = EC_ORIG_INTERNAL; |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
72 |
domain->logical_base_address = 0x00000000; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
73 |
INIT_LIST_HEAD(&domain->datagram_pairs); |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
74 |
for (dev_idx = EC_DEVICE_MAIN; dev_idx < ec_master_num_devices(master); |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
75 |
dev_idx++) { |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
76 |
domain->working_counter[dev_idx] = 0x0000; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
77 |
} |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
78 |
domain->expected_working_counter = 0x0000; |
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
79 |
domain->working_counter_changes = 0; |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
80 |
domain->redundancy_active = 0; |
344
5d8281f1aa2a
Replaced longer cycle timestamps with jiffies.
Florian Pose <fp@igh-essen.com>
parents:
343
diff
changeset
|
81 |
domain->notify_jiffies = 0; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
82 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
83 |
|
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
84 |
/*****************************************************************************/ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
85 |
|
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
86 |
/** Domain destructor. |
993
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
87 |
*/ |
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
88 |
void ec_domain_clear(ec_domain_t *domain /**< EtherCAT domain */) |
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
89 |
{ |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
90 |
ec_datagram_pair_t *datagram_pair, *next_pair; |
993
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
91 |
|
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
92 |
// dequeue and free datagrams |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
93 |
list_for_each_entry_safe(datagram_pair, next_pair, |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
94 |
&domain->datagram_pairs, list) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
95 |
ec_datagram_pair_clear(datagram_pair); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
96 |
kfree(datagram_pair); |
144
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
97 |
} |
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
97
diff
changeset
|
98 |
|
809 | 99 |
ec_domain_clear_data(domain); |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
100 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
101 |
|
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
102 |
/*****************************************************************************/ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
103 |
|
809 | 104 |
/** Frees internally allocated memory. |
105 |
*/ |
|
106 |
void ec_domain_clear_data( |
|
107 |
ec_domain_t *domain /**< EtherCAT domain. */ |
|
108 |
) |
|
109 |
{ |
|
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
110 |
if (domain->data_origin == EC_ORIG_INTERNAL && domain->data) { |
809 | 111 |
kfree(domain->data); |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
112 |
} |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
113 |
|
809 | 114 |
domain->data = NULL; |
115 |
domain->data_origin = EC_ORIG_INTERNAL; |
|
116 |
} |
|
117 |
||
118 |
/*****************************************************************************/ |
|
119 |
||
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
120 |
/** Adds an FMMU configuration to the domain. |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
121 |
*/ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
122 |
void ec_domain_add_fmmu_config( |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
123 |
ec_domain_t *domain, /**< EtherCAT domain. */ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
124 |
ec_fmmu_config_t *fmmu /**< FMMU configuration. */ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
125 |
) |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
126 |
{ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
127 |
fmmu->domain = domain; |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
128 |
|
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
129 |
domain->data_size += fmmu->data_size; |
950
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
130 |
list_add_tail(&fmmu->list, &domain->fmmu_configs); |
912
6630f4dbcfd2
Improved working counter output; fixed problem with slaves that have a single sync manager used for outputs.
Florian Pose <fp@igh-essen.com>
parents:
885
diff
changeset
|
131 |
|
1921 | 132 |
EC_MASTER_DBG(domain->master, 1, "Domain %u:" |
133 |
" Added %u bytes, total %zu.\n", |
|
134 |
domain->index, fmmu->data_size, domain->data_size); |
|
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
135 |
} |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
136 |
|
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
137 |
/*****************************************************************************/ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
138 |
|
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
139 |
/** Allocates a domain datagram pair and appends it to the list. |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
140 |
* |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
141 |
* The datagrams' types and expected working counters are determined by the |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
142 |
* number of input and output fmmus that share the datagrams. |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
143 |
* |
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
144 |
* \retval 0 Success. |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
145 |
* \retval <0 Error code. |
635
d304ef4af542
Implemented alternative PDO mapping configuration interface.
Florian Pose <fp@igh-essen.com>
parents:
628
diff
changeset
|
146 |
*/ |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
147 |
int ec_domain_add_datagram_pair( |
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
148 |
ec_domain_t *domain, /**< EtherCAT domain. */ |
809 | 149 |
uint32_t logical_offset, /**< Logical offset. */ |
150 |
size_t data_size, /**< Size of the data. */ |
|
817
118dea2fa505
Support for slaves that don't support the LRW datagram type.
Florian Pose <fp@igh-essen.com>
parents:
809
diff
changeset
|
151 |
uint8_t *data, /**< Process data. */ |
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
152 |
const unsigned int used[] /**< Slave config counter for in/out. */ |
635
d304ef4af542
Implemented alternative PDO mapping configuration interface.
Florian Pose <fp@igh-essen.com>
parents:
628
diff
changeset
|
153 |
) |
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
154 |
{ |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
155 |
ec_datagram_pair_t *datagram_pair; |
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
156 |
int ret; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
157 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
158 |
if (!(datagram_pair = kmalloc(sizeof(ec_datagram_pair_t), GFP_KERNEL))) { |
1921 | 159 |
EC_MASTER_ERR(domain->master, |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
160 |
"Failed to allocate domain datagram pair!\n"); |
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
161 |
return -ENOMEM; |
144
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
162 |
} |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
163 |
|
2367
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
164 |
ret = ec_datagram_pair_init(datagram_pair, domain, logical_offset, data, |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
165 |
data_size, used); |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
166 |
if (ret) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
167 |
kfree(datagram_pair); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
168 |
return ret; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
169 |
} |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
170 |
|
2367
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
171 |
domain->expected_working_counter += |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
172 |
datagram_pair->expected_working_counter; |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
173 |
|
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
174 |
EC_MASTER_DBG(domain->master, 1, |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
175 |
"Adding datagram pair with expected WC %u.\n", |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
176 |
datagram_pair->expected_working_counter); |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
177 |
|
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
178 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
179 |
list_add_tail(&datagram_pair->list, &domain->datagram_pairs); |
144
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
180 |
return 0; |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
181 |
} |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
182 |
|
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
183 |
/*****************************************************************************/ |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
184 |
|
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
185 |
/** Domain finish helper function. |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
186 |
* |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
187 |
* Detects, if a slave configuration has already been taken into account for |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
188 |
* a datagram's expected working counter calculation. |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
189 |
* |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
190 |
* Walks through the list of all FMMU configurations for the current datagram |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
191 |
* and ends before the current datagram. |
2522
ec403cf308eb
Updated Doxygen documentation.
Florian Pose <fp@igh-essen.com>
parents:
2470
diff
changeset
|
192 |
* |
ec403cf308eb
Updated Doxygen documentation.
Florian Pose <fp@igh-essen.com>
parents:
2470
diff
changeset
|
193 |
* \return Non-zero if slave connfig was already counted. |
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
194 |
*/ |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
195 |
int shall_count( |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
196 |
const ec_fmmu_config_t *cur_fmmu, /**< Current FMMU with direction to |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
197 |
search for. */ |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
198 |
const ec_fmmu_config_t *first_fmmu /**< Datagram's first FMMU. */ |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
199 |
) |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
200 |
{ |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
201 |
for (; first_fmmu != cur_fmmu; |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
202 |
first_fmmu = list_entry(first_fmmu->list.next, |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
203 |
ec_fmmu_config_t, list)) { |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
204 |
|
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
205 |
if (first_fmmu->sc == cur_fmmu->sc |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
206 |
&& first_fmmu->dir == cur_fmmu->dir) { |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
207 |
return 0; // was already counted |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
208 |
} |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
209 |
} |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
210 |
|
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
211 |
return 1; |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
212 |
} |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
213 |
|
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
214 |
/*****************************************************************************/ |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
215 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
216 |
/** Finishes a domain. |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
217 |
* |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
218 |
* This allocates the necessary datagrams and writes the correct logical |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
219 |
* addresses to every configured FMMU. |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
220 |
* |
809 | 221 |
* \todo Check for FMMUs that do not fit into any datagram. |
222 |
* |
|
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
223 |
* \retval 0 Success |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
224 |
* \retval <0 Error code. |
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
225 |
*/ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
226 |
int ec_domain_finish( |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
227 |
ec_domain_t *domain, /**< EtherCAT domain. */ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
228 |
uint32_t base_address /**< Logical base address. */ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
229 |
) |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
230 |
{ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
231 |
uint32_t datagram_offset; |
809 | 232 |
size_t datagram_size; |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
233 |
unsigned int datagram_count; |
1055
2be8918682fa
Store sync manager configurations in ec_slave_config_t instead of Pdo
Florian Pose <fp@igh-essen.com>
parents:
1032
diff
changeset
|
234 |
unsigned int datagram_used[EC_DIR_COUNT]; |
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
235 |
ec_fmmu_config_t *fmmu; |
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
236 |
const ec_fmmu_config_t *datagram_first_fmmu = NULL; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
237 |
const ec_datagram_pair_t *datagram_pair; |
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
238 |
int ret; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
239 |
|
809 | 240 |
domain->logical_base_address = base_address; |
241 |
||
242 |
if (domain->data_size && domain->data_origin == EC_ORIG_INTERNAL) { |
|
243 |
if (!(domain->data = |
|
244 |
(uint8_t *) kmalloc(domain->data_size, GFP_KERNEL))) { |
|
1921 | 245 |
EC_MASTER_ERR(domain->master, "Failed to allocate %zu bytes" |
246 |
" internal memory for domain %u!\n", |
|
247 |
domain->data_size, domain->index); |
|
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
248 |
return -ENOMEM; |
809 | 249 |
} |
250 |
} |
|
251 |
||
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
252 |
// Cycle through all domain FMMUs and |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
253 |
// - correct the logical base addresses |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
254 |
// - set up the datagrams to carry the process data |
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
255 |
// - calculate the datagrams' expected working counters |
809 | 256 |
datagram_offset = 0; |
257 |
datagram_size = 0; |
|
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
258 |
datagram_count = 0; |
817
118dea2fa505
Support for slaves that don't support the LRW datagram type.
Florian Pose <fp@igh-essen.com>
parents:
809
diff
changeset
|
259 |
datagram_used[EC_DIR_OUTPUT] = 0; |
118dea2fa505
Support for slaves that don't support the LRW datagram type.
Florian Pose <fp@igh-essen.com>
parents:
809
diff
changeset
|
260 |
datagram_used[EC_DIR_INPUT] = 0; |
1907
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
261 |
|
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
262 |
if (!list_empty(&domain->fmmu_configs)) { |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
263 |
datagram_first_fmmu = |
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
264 |
list_entry(domain->fmmu_configs.next, ec_fmmu_config_t, list); |
1907
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
265 |
} |
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
266 |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
267 |
list_for_each_entry(fmmu, &domain->fmmu_configs, list) { |
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
268 |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
269 |
// Correct logical FMMU address |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
270 |
fmmu->logical_start_address += base_address; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
271 |
|
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
272 |
// Increment Input/Output counter to determine datagram types |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
273 |
// and calculate expected working counters |
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
274 |
if (shall_count(fmmu, datagram_first_fmmu)) { |
1798
e7733f825982
Domain datagram working counter calculation bugfix: increment expected wc for a given slave & direction just once for each datagram
Dominik Staubli <ch1010252@ch10pc423>
parents:
1553
diff
changeset
|
275 |
datagram_used[fmmu->dir]++; |
e7733f825982
Domain datagram working counter calculation bugfix: increment expected wc for a given slave & direction just once for each datagram
Dominik Staubli <ch1010252@ch10pc423>
parents:
1553
diff
changeset
|
276 |
} |
1907
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
277 |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
278 |
// If the current FMMU's data do not fit in the current datagram, |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
279 |
// allocate a new one. |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
280 |
if (datagram_size + fmmu->data_size > EC_MAX_DATA_SIZE) { |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
281 |
ret = ec_domain_add_datagram_pair(domain, |
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
282 |
domain->logical_base_address + datagram_offset, |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
283 |
datagram_size, domain->data + datagram_offset, |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
284 |
datagram_used); |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
285 |
if (ret < 0) |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
286 |
return ret; |
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
287 |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
288 |
datagram_offset += datagram_size; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
289 |
datagram_size = 0; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
290 |
datagram_count++; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
291 |
datagram_used[EC_DIR_OUTPUT] = 0; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
292 |
datagram_used[EC_DIR_INPUT] = 0; |
2366
5682b63f826a
Avoided casting-away constness in expected working counter calculation.
Florian Pose <fp@igh-essen.com>
parents:
2365
diff
changeset
|
293 |
datagram_first_fmmu = fmmu; |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
294 |
} |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
295 |
|
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
296 |
datagram_size += fmmu->data_size; |
809 | 297 |
} |
298 |
||
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
299 |
/* Allocate last datagram pair, if data are left (this is also the case if |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
300 |
* the process data fit into a single datagram) */ |
809 | 301 |
if (datagram_size) { |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
302 |
ret = ec_domain_add_datagram_pair(domain, |
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
303 |
domain->logical_base_address + datagram_offset, |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
304 |
datagram_size, domain->data + datagram_offset, |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
305 |
datagram_used); |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
306 |
if (ret < 0) |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
307 |
return ret; |
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
308 |
datagram_count++; |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
309 |
} |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
310 |
|
1921 | 311 |
EC_MASTER_INFO(domain->master, "Domain%u: Logical address 0x%08x," |
312 |
" %zu byte, expected working counter %u.\n", domain->index, |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
313 |
domain->logical_base_address, domain->data_size, |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
314 |
domain->expected_working_counter); |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
315 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
316 |
list_for_each_entry(datagram_pair, &domain->datagram_pairs, list) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
317 |
const ec_datagram_t *datagram = |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
318 |
&datagram_pair->datagrams[EC_DEVICE_MAIN]; |
1921 | 319 |
EC_MASTER_INFO(domain->master, " Datagram %s: Logical offset 0x%08x," |
320 |
" %zu byte, type %s.\n", datagram->name, |
|
321 |
EC_READ_U32(datagram->address), datagram->data_size, |
|
322 |
ec_datagram_type_string(datagram)); |
|
817
118dea2fa505
Support for slaves that don't support the LRW datagram type.
Florian Pose <fp@igh-essen.com>
parents:
809
diff
changeset
|
323 |
} |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
324 |
|
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
325 |
return 0; |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
326 |
} |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
327 |
|
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
328 |
/*****************************************************************************/ |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
329 |
|
1092 | 330 |
/** Get the number of FMMU configurations of the domain. |
331 |
*/ |
|
950
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
332 |
unsigned int ec_domain_fmmu_count(const ec_domain_t *domain) |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
333 |
{ |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
334 |
const ec_fmmu_config_t *fmmu; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
335 |
unsigned int num = 0; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
336 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
337 |
list_for_each_entry(fmmu, &domain->fmmu_configs, list) { |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
338 |
num++; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
339 |
} |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
340 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
341 |
return num; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
342 |
} |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
343 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
344 |
/*****************************************************************************/ |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
345 |
|
1092 | 346 |
/** Get a certain FMMU configuration via its position in the list. |
2522
ec403cf308eb
Updated Doxygen documentation.
Florian Pose <fp@igh-essen.com>
parents:
2470
diff
changeset
|
347 |
* |
ec403cf308eb
Updated Doxygen documentation.
Florian Pose <fp@igh-essen.com>
parents:
2470
diff
changeset
|
348 |
* \return FMMU at position \a pos, or NULL. |
1092 | 349 |
*/ |
950
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
350 |
const ec_fmmu_config_t *ec_domain_find_fmmu( |
1092 | 351 |
const ec_domain_t *domain, /**< EtherCAT domain. */ |
352 |
unsigned int pos /**< List position. */ |
|
950
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
353 |
) |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
354 |
{ |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
355 |
const ec_fmmu_config_t *fmmu; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
356 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
357 |
list_for_each_entry(fmmu, &domain->fmmu_configs, list) { |
1092 | 358 |
if (pos--) |
950
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
359 |
continue; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
360 |
return fmmu; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
361 |
} |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
362 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
363 |
return NULL; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
364 |
} |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
365 |
|
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
366 |
/*****************************************************************************/ |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
367 |
|
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
368 |
#if EC_MAX_NUM_DEVICES > 1 |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
369 |
|
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
370 |
/** Process received data. |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
371 |
*/ |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
372 |
int data_changed( |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
373 |
uint8_t *send_buffer, |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
374 |
const ec_datagram_t *datagram, |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
375 |
size_t offset, |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
376 |
size_t size |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
377 |
) |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
378 |
{ |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
379 |
uint8_t *sent = send_buffer + offset; |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
380 |
uint8_t *recv = datagram->data + offset; |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
381 |
size_t i; |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
382 |
|
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
383 |
for (i = 0; i < size; i++) { |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
384 |
if (recv[i] != sent[i]) { |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
385 |
return 1; |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
386 |
} |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
387 |
} |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
388 |
|
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
389 |
return 0; |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
390 |
} |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
391 |
|
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
392 |
#endif |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
393 |
|
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
394 |
/****************************************************************************** |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
395 |
* Application interface |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
396 |
*****************************************************************************/ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
397 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
398 |
int ecrt_domain_reg_pdo_entry_list(ec_domain_t *domain, |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
399 |
const ec_pdo_entry_reg_t *regs) |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
400 |
{ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
401 |
const ec_pdo_entry_reg_t *reg; |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
402 |
ec_slave_config_t *sc; |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
403 |
int ret; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
404 |
|
1921 | 405 |
EC_MASTER_DBG(domain->master, 1, "ecrt_domain_reg_pdo_entry_list(" |
406 |
"domain = 0x%p, regs = 0x%p)\n", domain, regs); |
|
1181
9e5954a2a46e
Added debugging for configuration function of the application interface.
Florian Pose <fp@igh-essen.com>
parents:
1116
diff
changeset
|
407 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
408 |
for (reg = regs; reg->index; reg++) { |
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
409 |
sc = ecrt_master_slave_config_err(domain->master, reg->alias, |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
410 |
reg->position, reg->vendor_id, reg->product_code); |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
411 |
if (IS_ERR(sc)) |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
412 |
return PTR_ERR(sc); |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
413 |
|
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
414 |
ret = ecrt_slave_config_reg_pdo_entry(sc, reg->index, |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
415 |
reg->subindex, domain, reg->bit_position); |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
416 |
if (ret < 0) |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
417 |
return ret; |
916
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
418 |
|
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
419 |
*reg->offset = ret; |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
420 |
} |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
421 |
|
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
422 |
return 0; |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
423 |
} |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
424 |
|
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
425 |
/*****************************************************************************/ |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
426 |
|
1257
9844ac126275
Made ecrt_domain_size() const.
Florian Pose <fp@igh-essen.com>
parents:
1225
diff
changeset
|
427 |
size_t ecrt_domain_size(const ec_domain_t *domain) |
809 | 428 |
{ |
429 |
return domain->data_size; |
|
430 |
} |
|
431 |
||
432 |
/*****************************************************************************/ |
|
433 |
||
434 |
void ecrt_domain_external_memory(ec_domain_t *domain, uint8_t *mem) |
|
435 |
{ |
|
1921 | 436 |
EC_MASTER_DBG(domain->master, 1, "ecrt_domain_external_memory(" |
437 |
"domain = 0x%p, mem = 0x%p)\n", domain, mem); |
|
1181
9e5954a2a46e
Added debugging for configuration function of the application interface.
Florian Pose <fp@igh-essen.com>
parents:
1116
diff
changeset
|
438 |
|
1075
94c6e36e0f8d
Implemented master semaphore to secure concurrent access from ioctls, state machine and realtime interface.
Florian Pose <fp@igh-essen.com>
parents:
1055
diff
changeset
|
439 |
down(&domain->master->master_sem); |
94c6e36e0f8d
Implemented master semaphore to secure concurrent access from ioctls, state machine and realtime interface.
Florian Pose <fp@igh-essen.com>
parents:
1055
diff
changeset
|
440 |
|
809 | 441 |
ec_domain_clear_data(domain); |
442 |
||
443 |
domain->data = mem; |
|
444 |
domain->data_origin = EC_ORIG_EXTERNAL; |
|
1075
94c6e36e0f8d
Implemented master semaphore to secure concurrent access from ioctls, state machine and realtime interface.
Florian Pose <fp@igh-essen.com>
parents:
1055
diff
changeset
|
445 |
|
94c6e36e0f8d
Implemented master semaphore to secure concurrent access from ioctls, state machine and realtime interface.
Florian Pose <fp@igh-essen.com>
parents:
1055
diff
changeset
|
446 |
up(&domain->master->master_sem); |
809 | 447 |
} |
448 |
||
449 |
/*****************************************************************************/ |
|
450 |
||
451 |
uint8_t *ecrt_domain_data(ec_domain_t *domain) |
|
452 |
{ |
|
453 |
return domain->data; |
|
454 |
} |
|
455 |
||
456 |
/*****************************************************************************/ |
|
457 |
||
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
458 |
void ecrt_domain_process(ec_domain_t *domain) |
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
97
diff
changeset
|
459 |
{ |
2470
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
460 |
uint16_t wc_sum[EC_MAX_NUM_DEVICES] = {}, wc_total; |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
461 |
ec_datagram_pair_t *pair; |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
462 |
#if EC_MAX_NUM_DEVICES > 1 |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
463 |
uint16_t datagram_pair_wc, redundant_wc; |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
464 |
unsigned int datagram_offset; |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
465 |
ec_fmmu_config_t *fmmu = list_first_entry(&domain->fmmu_configs, |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
466 |
ec_fmmu_config_t, list); |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
467 |
unsigned int redundancy; |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
468 |
#endif |
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
469 |
unsigned int dev_idx; |
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
470 |
#ifdef EC_RT_SYSLOG |
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
471 |
unsigned int wc_change; |
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
472 |
#endif |
2367
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
473 |
|
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
474 |
#if DEBUG_REDUNDANCY |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
475 |
EC_MASTER_DBG(domain->master, 1, "domain %u process\n", domain->index); |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
476 |
#endif |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
477 |
|
2470
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
478 |
list_for_each_entry(pair, &domain->datagram_pairs, list) { |
2463
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
479 |
#if EC_MAX_NUM_DEVICES > 1 |
2470
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
480 |
datagram_pair_wc = ec_datagram_pair_process(pair, wc_sum); |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
481 |
#else |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
482 |
ec_datagram_pair_process(pair, wc_sum); |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
483 |
#endif |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
484 |
|
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
485 |
#if EC_MAX_NUM_DEVICES > 1 |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
486 |
if (ec_master_num_devices(domain->master) > 1) { |
2463
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
487 |
ec_datagram_t *main_datagram = &pair->datagrams[EC_DEVICE_MAIN]; |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
488 |
uint32_t logical_datagram_address = |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
489 |
EC_READ_U32(main_datagram->address); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
490 |
size_t datagram_size = main_datagram->data_size; |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
491 |
|
2367
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
492 |
#if DEBUG_REDUNDANCY |
2463
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
493 |
EC_MASTER_DBG(domain->master, 1, "dgram %s log=%u\n", |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
494 |
main_datagram->name, logical_datagram_address); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
495 |
#endif |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
496 |
|
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
497 |
/* Redundancy: Go through FMMU configs to detect data changes. */ |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
498 |
list_for_each_entry_from(fmmu, &domain->fmmu_configs, list) { |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
499 |
ec_datagram_t *backup_datagram = |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
500 |
&pair->datagrams[EC_DEVICE_BACKUP]; |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
501 |
|
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
502 |
if (fmmu->dir != EC_DIR_INPUT) { |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
503 |
continue; |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
504 |
} |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
505 |
|
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
506 |
if (fmmu->logical_start_address >= |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
507 |
logical_datagram_address + datagram_size) { |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
508 |
// fmmu data contained in next datagram pair |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
509 |
break; |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
510 |
} |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
511 |
|
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
512 |
datagram_offset = |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
513 |
fmmu->logical_start_address - logical_datagram_address; |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
514 |
|
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
515 |
#if DEBUG_REDUNDANCY |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
516 |
EC_MASTER_DBG(domain->master, 1, |
2463
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
517 |
"input fmmu log=%u size=%u offset=%u\n", |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
518 |
fmmu->logical_start_address, fmmu->data_size, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
519 |
datagram_offset); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
520 |
if (domain->master->debug_level > 0) { |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
521 |
ec_print_data(pair->send_buffer + datagram_offset, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
522 |
fmmu->data_size); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
523 |
ec_print_data(main_datagram->data + datagram_offset, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
524 |
fmmu->data_size); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
525 |
ec_print_data(backup_datagram->data + datagram_offset, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
526 |
fmmu->data_size); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
527 |
} |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
528 |
#endif |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
529 |
|
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
530 |
if (data_changed(pair->send_buffer, main_datagram, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
531 |
datagram_offset, fmmu->data_size)) { |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
532 |
/* data changed on main link: no copying necessary. */ |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
533 |
#if DEBUG_REDUNDANCY |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
534 |
EC_MASTER_DBG(domain->master, 1, "main changed\n"); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
535 |
#endif |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
536 |
} else if (data_changed(pair->send_buffer, backup_datagram, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
537 |
datagram_offset, fmmu->data_size)) { |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
538 |
/* data changed on backup link: copy to main memory. */ |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
539 |
#if DEBUG_REDUNDANCY |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
540 |
EC_MASTER_DBG(domain->master, 1, "backup changed\n"); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
541 |
#endif |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
542 |
memcpy(main_datagram->data + datagram_offset, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
543 |
backup_datagram->data + datagram_offset, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
544 |
fmmu->data_size); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
545 |
} else if (datagram_pair_wc == |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
546 |
pair->expected_working_counter) { |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
547 |
/* no change, but WC complete: use main data. */ |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
548 |
#if DEBUG_REDUNDANCY |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
549 |
EC_MASTER_DBG(domain->master, 1, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
550 |
"no change but complete\n"); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
551 |
#endif |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
552 |
} else { |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
553 |
/* no change and WC incomplete: mark WC as zero to avoid |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
554 |
* data.dependent WC flickering. */ |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
555 |
datagram_pair_wc = 0; |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
556 |
#if DEBUG_REDUNDANCY |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
557 |
EC_MASTER_DBG(domain->master, 1, |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
558 |
"no change and incomplete\n"); |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
559 |
#endif |
71d38ff288b3
Improved preprocessor macro usage reg. redundancy.
Florian Pose <fp@igh-essen.com>
parents:
2453
diff
changeset
|
560 |
} |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
561 |
} |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
562 |
} |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
563 |
#endif // EC_MAX_NUM_DEVICES > 1 |
2470
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
564 |
} |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
565 |
|
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
566 |
#if EC_MAX_NUM_DEVICES > 1 |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
567 |
redundant_wc = 0; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
568 |
for (dev_idx = EC_DEVICE_BACKUP; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
569 |
dev_idx < ec_master_num_devices(domain->master); dev_idx++) { |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
570 |
redundant_wc += wc_sum[dev_idx]; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
571 |
} |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
572 |
|
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
573 |
redundancy = redundant_wc > 0; |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
574 |
if (redundancy != domain->redundancy_active) { |
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
575 |
#ifdef EC_RT_SYSLOG |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
576 |
if (redundancy) { |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
577 |
EC_MASTER_WARN(domain->master, |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
578 |
"Domain %u: Redundant link in use!\n", |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
579 |
domain->index); |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
580 |
} else { |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
581 |
EC_MASTER_INFO(domain->master, |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
582 |
"Domain %u: Redundant link unused again.\n", |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
583 |
domain->index); |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
584 |
} |
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
585 |
#endif |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
586 |
domain->redundancy_active = redundancy; |
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
587 |
} |
2470
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
588 |
#else |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
589 |
domain->redundancy_active = 0; |
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
590 |
#endif |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
591 |
|
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
592 |
#ifdef EC_RT_SYSLOG |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
593 |
wc_change = 0; |
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
594 |
#endif |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
595 |
wc_total = 0; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
596 |
for (dev_idx = EC_DEVICE_MAIN; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
597 |
dev_idx < ec_master_num_devices(domain->master); dev_idx++) { |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
598 |
if (wc_sum[dev_idx] != domain->working_counter[dev_idx]) { |
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
599 |
#ifdef EC_RT_SYSLOG |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
600 |
wc_change = 1; |
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
601 |
#endif |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
602 |
domain->working_counter[dev_idx] = wc_sum[dev_idx]; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
603 |
} |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
604 |
wc_total += wc_sum[dev_idx]; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
605 |
} |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
606 |
|
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
607 |
#ifdef EC_RT_SYSLOG |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
608 |
if (wc_change) { |
332
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
609 |
domain->working_counter_changes++; |
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
610 |
} |
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
611 |
|
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
612 |
if (domain->working_counter_changes && |
344
5d8281f1aa2a
Replaced longer cycle timestamps with jiffies.
Florian Pose <fp@igh-essen.com>
parents:
343
diff
changeset
|
613 |
jiffies - domain->notify_jiffies > HZ) { |
5d8281f1aa2a
Replaced longer cycle timestamps with jiffies.
Florian Pose <fp@igh-essen.com>
parents:
343
diff
changeset
|
614 |
domain->notify_jiffies = jiffies; |
332
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
615 |
if (domain->working_counter_changes == 1) { |
1921 | 616 |
EC_MASTER_INFO(domain->master, "Domain %u: Working counter" |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
617 |
" changed to %u/%u", domain->index, |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
618 |
wc_total, domain->expected_working_counter); |
1921 | 619 |
} else { |
620 |
EC_MASTER_INFO(domain->master, "Domain %u: %u working counter" |
|
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
621 |
" changes - now %u/%u", domain->index, |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
622 |
domain->working_counter_changes, |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
623 |
wc_total, domain->expected_working_counter); |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
624 |
} |
2470
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
625 |
#if EC_MAX_NUM_DEVICES > 1 |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
626 |
if (ec_master_num_devices(domain->master) > 1) { |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
627 |
printk(" ("); |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
628 |
for (dev_idx = EC_DEVICE_MAIN; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
629 |
dev_idx < ec_master_num_devices(domain->master); |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
630 |
dev_idx++) { |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
631 |
printk("%u", domain->working_counter[dev_idx]); |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
632 |
if (dev_idx + 1 < ec_master_num_devices(domain->master)) { |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
633 |
printk("+"); |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
634 |
} |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
635 |
} |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
636 |
printk(")"); |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
637 |
} |
2470
4f97d61a8671
Fixed ecrt_domain_process() broken in 71d38ff288b3.
Florian Pose <fp@igh-essen.com>
parents:
2468
diff
changeset
|
638 |
#endif |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
639 |
printk(".\n"); |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
640 |
|
332
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
641 |
domain->working_counter_changes = 0; |
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
642 |
} |
2532
bdadf6da4914
Added configure switch --disable-rt-syslog.
Florian Pose <fp@igh-essen.com>
parents:
2522
diff
changeset
|
643 |
#endif |
494
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
644 |
} |
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
645 |
|
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
646 |
/*****************************************************************************/ |
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
647 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
648 |
void ecrt_domain_queue(ec_domain_t *domain) |
494
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
649 |
{ |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
650 |
ec_datagram_pair_t *datagram_pair; |
2374
e898451c054a
Slave scanning and configuration on all links.
Florian Pose <fp@igh-essen.com>
parents:
2368
diff
changeset
|
651 |
ec_device_index_t dev_idx; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
652 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
653 |
list_for_each_entry(datagram_pair, &domain->datagram_pairs, list) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
654 |
|
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
655 |
#if EC_MAX_NUM_DEVICES > 1 |
2367
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
656 |
/* copy main data to send buffer */ |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
657 |
memcpy(datagram_pair->send_buffer, |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
658 |
datagram_pair->datagrams[EC_DEVICE_MAIN].data, |
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
659 |
datagram_pair->datagrams[EC_DEVICE_MAIN].data_size); |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
660 |
#endif |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
661 |
ec_master_queue_datagram(domain->master, |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
662 |
&datagram_pair->datagrams[EC_DEVICE_MAIN]); |
2367
8527429b6137
Compare with send buffer; copy changed data.
Florian Pose <fp@igh-essen.com>
parents:
2366
diff
changeset
|
663 |
|
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
664 |
/* copy main data to backup datagram */ |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
665 |
for (dev_idx = EC_DEVICE_BACKUP; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
666 |
dev_idx < ec_master_num_devices(domain->master); dev_idx++) { |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
667 |
memcpy(datagram_pair->datagrams[dev_idx].data, |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
668 |
datagram_pair->datagrams[EC_DEVICE_MAIN].data, |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
669 |
datagram_pair->datagrams[EC_DEVICE_MAIN].data_size); |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
670 |
ec_master_queue_datagram(domain->master, |
2374
e898451c054a
Slave scanning and configuration on all links.
Florian Pose <fp@igh-essen.com>
parents:
2368
diff
changeset
|
671 |
&datagram_pair->datagrams[dev_idx]); |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
672 |
} |
494
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
673 |
} |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
674 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
675 |
|
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
676 |
/*****************************************************************************/ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
677 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
678 |
void ecrt_domain_state(const ec_domain_t *domain, ec_domain_state_t *state) |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
679 |
{ |
2453
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
680 |
unsigned int dev_idx; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
681 |
uint16_t wc = 0; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
682 |
|
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
683 |
for (dev_idx = EC_DEVICE_MAIN; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
684 |
dev_idx < ec_master_num_devices(domain->master); dev_idx++) { |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
685 |
wc += domain->working_counter[dev_idx]; |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
686 |
} |
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
687 |
|
d461b1f07296
Added configure option for redundancy (--with-devices).
Florian Pose <fp@igh-essen.com>
parents:
2374
diff
changeset
|
688 |
state->working_counter = wc; |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
689 |
|
2468 | 690 |
if (wc) { |
691 |
if (wc == domain->expected_working_counter) { |
|
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
692 |
state->wc_state = EC_WC_COMPLETE; |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
693 |
} else { |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
694 |
state->wc_state = EC_WC_INCOMPLETE; |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
695 |
} |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
696 |
} else { |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
697 |
state->wc_state = EC_WC_ZERO; |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
698 |
} |
2368
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
699 |
|
dd84ef164869
Loop through datagrams, then FMMUs; redundancy flag in domain state.
Florian Pose <fp@igh-essen.com>
parents:
2367
diff
changeset
|
700 |
state->redundancy_active = domain->redundancy_active; |
105
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
701 |
} |
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
702 |
|
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
703 |
/*****************************************************************************/ |
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
704 |
|
199
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
705 |
/** \cond */ |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
706 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
707 |
EXPORT_SYMBOL(ecrt_domain_reg_pdo_entry_list); |
809 | 708 |
EXPORT_SYMBOL(ecrt_domain_size); |
709 |
EXPORT_SYMBOL(ecrt_domain_external_memory); |
|
710 |
EXPORT_SYMBOL(ecrt_domain_data); |
|
104
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
711 |
EXPORT_SYMBOL(ecrt_domain_process); |
494
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
712 |
EXPORT_SYMBOL(ecrt_domain_queue); |
105
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
713 |
EXPORT_SYMBOL(ecrt_domain_state); |
42
a22a202d0f42
Domains, Warten beim Senden, 10kHz.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
714 |
|
199
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
715 |
/** \endcond */ |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
716 |
|
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
717 |
/*****************************************************************************/ |