author | Florian Pose <fp@igh-essen.com> |
Wed, 04 Jan 2012 13:57:48 +0100 | |
branch | redundancy |
changeset 2329 | d91edc7b3f93 |
parent 2269 | 1d0711235a61 |
child 2365 | 782f8b63c92c |
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 |
|
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
46 |
/*****************************************************************************/ |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
47 |
|
809 | 48 |
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
|
49 |
|
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
166
diff
changeset
|
50 |
/*****************************************************************************/ |
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
166
diff
changeset
|
51 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
52 |
/** Domain constructor. |
993
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
53 |
*/ |
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
54 |
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
|
55 |
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
|
56 |
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
|
57 |
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
|
58 |
) |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
59 |
{ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
60 |
domain->master = master; |
178
b84f69db8566
MERGE branches/sysfs -> trunk (whole SysFS implementation)
Florian Pose <fp@igh-essen.com>
parents:
166
diff
changeset
|
61 |
domain->index = index; |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
62 |
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
|
63 |
domain->data_size = 0; |
809 | 64 |
domain->data = NULL; |
65 |
domain->data_origin = EC_ORIG_INTERNAL; |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
66 |
domain->logical_base_address = 0x00000000; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
67 |
INIT_LIST_HEAD(&domain->datagram_pairs); |
1032 | 68 |
domain->working_counter = 0x0000; |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
69 |
domain->expected_working_counter = 0x0000; |
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
70 |
domain->working_counter_changes = 0; |
344
5d8281f1aa2a
Replaced longer cycle timestamps with jiffies.
Florian Pose <fp@igh-essen.com>
parents:
343
diff
changeset
|
71 |
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
|
72 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
73 |
|
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
74 |
/*****************************************************************************/ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
75 |
|
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
76 |
/** Domain destructor. |
993
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
77 |
*/ |
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
78 |
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
|
79 |
{ |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
80 |
ec_datagram_pair_t *datagram_pair, *next_pair; |
993
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
81 |
|
8c32564252fd
Removed kobject from domain.
Florian Pose <fp@igh-essen.com>
parents:
985
diff
changeset
|
82 |
// dequeue and free datagrams |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
83 |
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
|
84 |
&domain->datagram_pairs, list) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
85 |
ec_datagram_pair_clear(datagram_pair); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
86 |
kfree(datagram_pair); |
144
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
87 |
} |
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
97
diff
changeset
|
88 |
|
809 | 89 |
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
|
90 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
91 |
|
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
92 |
/*****************************************************************************/ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
93 |
|
809 | 94 |
/** Frees internally allocated memory. |
95 |
*/ |
|
96 |
void ec_domain_clear_data( |
|
97 |
ec_domain_t *domain /**< EtherCAT domain. */ |
|
98 |
) |
|
99 |
{ |
|
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
100 |
if (domain->data_origin == EC_ORIG_INTERNAL && domain->data) { |
809 | 101 |
kfree(domain->data); |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
102 |
} |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
103 |
|
809 | 104 |
domain->data = NULL; |
105 |
domain->data_origin = EC_ORIG_INTERNAL; |
|
106 |
} |
|
107 |
||
108 |
/*****************************************************************************/ |
|
109 |
||
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
110 |
/** Adds an FMMU configuration to the domain. |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
111 |
*/ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
112 |
void ec_domain_add_fmmu_config( |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
113 |
ec_domain_t *domain, /**< EtherCAT domain. */ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
114 |
ec_fmmu_config_t *fmmu /**< FMMU configuration. */ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
115 |
) |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
116 |
{ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
117 |
fmmu->domain = domain; |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
118 |
|
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
119 |
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
|
120 |
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
|
121 |
|
1921 | 122 |
EC_MASTER_DBG(domain->master, 1, "Domain %u:" |
123 |
" Added %u bytes, total %zu.\n", |
|
124 |
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
|
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 |
/*****************************************************************************/ |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
128 |
|
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
129 |
/** 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
|
130 |
* |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
131 |
* 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
|
132 |
* 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
|
133 |
* |
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
134 |
* \retval 0 Success. |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
135 |
* \retval <0 Error code. |
635
d304ef4af542
Implemented alternative PDO mapping configuration interface.
Florian Pose <fp@igh-essen.com>
parents:
628
diff
changeset
|
136 |
*/ |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
137 |
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
|
138 |
ec_domain_t *domain, /**< EtherCAT domain. */ |
809 | 139 |
uint32_t logical_offset, /**< Logical offset. */ |
140 |
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
|
141 |
uint8_t *data, /**< Process data. */ |
118dea2fa505
Support for slaves that don't support the LRW datagram type.
Florian Pose <fp@igh-essen.com>
parents:
809
diff
changeset
|
142 |
const unsigned int used[] /**< Used by inputs/outputs. */ |
635
d304ef4af542
Implemented alternative PDO mapping configuration interface.
Florian Pose <fp@igh-essen.com>
parents:
628
diff
changeset
|
143 |
) |
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
144 |
{ |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
145 |
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
|
146 |
int ret; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
147 |
unsigned int i; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
148 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
149 |
if (!(datagram_pair = kmalloc(sizeof(ec_datagram_pair_t), GFP_KERNEL))) { |
1921 | 150 |
EC_MASTER_ERR(domain->master, |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
151 |
"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
|
152 |
return -ENOMEM; |
144
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
153 |
} |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
154 |
|
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
155 |
ec_datagram_pair_init(datagram_pair); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
156 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
157 |
/* backup datagram has its own memory */ |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
158 |
ret = ec_datagram_prealloc(&datagram_pair->datagrams[EC_DEVICE_BACKUP], |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
159 |
data_size); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
160 |
if (ret) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
161 |
ec_datagram_pair_clear(datagram_pair); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
162 |
kfree(datagram_pair); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
163 |
return ret; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
164 |
} |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
165 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
166 |
/* The ec_datagram_lxx() calls below can not fail, because either the |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
167 |
* datagram has external memory or it is preallocated. */ |
809 | 168 |
|
817
118dea2fa505
Support for slaves that don't support the LRW datagram type.
Florian Pose <fp@igh-essen.com>
parents:
809
diff
changeset
|
169 |
if (used[EC_DIR_OUTPUT] && used[EC_DIR_INPUT]) { // inputs and outputs |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
170 |
ec_datagram_lrw_ext(&datagram_pair->datagrams[EC_DEVICE_MAIN], |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
171 |
logical_offset, data_size, data); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
172 |
ec_datagram_lrw(&datagram_pair->datagrams[EC_DEVICE_BACKUP], |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
173 |
logical_offset, data_size); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
174 |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
175 |
// If LRW is used, output FMMUs increment the working counter by 2, |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
176 |
// while input FMMUs increment it by 1. |
1304
853c83c72f44
merge -c1554 branches/stable-1.4: Fixed WC calculation for multiple datagrams.
Florian Pose <fp@igh-essen.com>
parents:
1257
diff
changeset
|
177 |
domain->expected_working_counter += |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
178 |
used[EC_DIR_OUTPUT] * 2 + used[EC_DIR_INPUT]; |
817
118dea2fa505
Support for slaves that don't support the LRW datagram type.
Florian Pose <fp@igh-essen.com>
parents:
809
diff
changeset
|
179 |
} else if (used[EC_DIR_OUTPUT]) { // outputs only |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
180 |
ec_datagram_lwr_ext(&datagram_pair->datagrams[EC_DEVICE_MAIN], |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
181 |
logical_offset, data_size, data); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
182 |
ec_datagram_lwr(&datagram_pair->datagrams[EC_DEVICE_BACKUP], |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
183 |
logical_offset, data_size); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
184 |
|
1304
853c83c72f44
merge -c1554 branches/stable-1.4: Fixed WC calculation for multiple datagrams.
Florian Pose <fp@igh-essen.com>
parents:
1257
diff
changeset
|
185 |
domain->expected_working_counter += used[EC_DIR_OUTPUT]; |
817
118dea2fa505
Support for slaves that don't support the LRW datagram type.
Florian Pose <fp@igh-essen.com>
parents:
809
diff
changeset
|
186 |
} else { // inputs only (or nothing) |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
187 |
ec_datagram_lrd_ext(&datagram_pair->datagrams[EC_DEVICE_MAIN], |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
188 |
logical_offset, data_size, data); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
189 |
ec_datagram_lrd(&datagram_pair->datagrams[EC_DEVICE_BACKUP], |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
190 |
logical_offset, data_size); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
191 |
|
1304
853c83c72f44
merge -c1554 branches/stable-1.4: Fixed WC calculation for multiple datagrams.
Florian Pose <fp@igh-essen.com>
parents:
1257
diff
changeset
|
192 |
domain->expected_working_counter += used[EC_DIR_INPUT]; |
144
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
193 |
} |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
194 |
|
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
195 |
for (i = 0; i < EC_NUM_DEVICES; i++) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
196 |
snprintf(datagram_pair->datagrams[i].name, EC_DATAGRAM_NAME_SIZE, |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
197 |
"domain%u-%u-%s", domain->index, logical_offset, |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
198 |
i ? "backup" : "main"); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
199 |
ec_datagram_zero(&datagram_pair->datagrams[i]); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
200 |
} |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
201 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
202 |
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
|
203 |
return 0; |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
204 |
} |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
205 |
|
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
206 |
/*****************************************************************************/ |
fdc24bf62f80
Dynamischer Kommandospeicher, Domain-Kommandos als Liste.
Florian Pose <fp@igh-essen.com>
parents:
138
diff
changeset
|
207 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
208 |
/** Finishes a domain. |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
209 |
* |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
210 |
* 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
|
211 |
* 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
|
212 |
* |
809 | 213 |
* \todo Check for FMMUs that do not fit into any datagram. |
214 |
* |
|
1313
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
215 |
* \retval 0 Success |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
216 |
* \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
|
217 |
*/ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
218 |
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
|
219 |
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
|
220 |
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
|
221 |
) |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
222 |
{ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
223 |
uint32_t datagram_offset; |
809 | 224 |
size_t datagram_size; |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
225 |
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
|
226 |
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
|
227 |
ec_fmmu_config_t *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
|
228 |
ec_fmmu_config_t *fmmu_temp; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
229 |
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
|
230 |
int ret; |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
231 |
|
809 | 232 |
domain->logical_base_address = base_address; |
233 |
||
234 |
if (domain->data_size && domain->data_origin == EC_ORIG_INTERNAL) { |
|
235 |
if (!(domain->data = |
|
236 |
(uint8_t *) kmalloc(domain->data_size, GFP_KERNEL))) { |
|
1921 | 237 |
EC_MASTER_ERR(domain->master, "Failed to allocate %zu bytes" |
238 |
" internal memory for domain %u!\n", |
|
239 |
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
|
240 |
return -ENOMEM; |
809 | 241 |
} |
242 |
} |
|
243 |
||
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
244 |
// Cycle through all domain FMMUS and |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
245 |
// - correct the logical base addresses |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
246 |
// - set up the datagrams to carry the process data |
809 | 247 |
datagram_offset = 0; |
248 |
datagram_size = 0; |
|
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
249 |
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
|
250 |
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
|
251 |
datagram_used[EC_DIR_INPUT] = 0; |
1907
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
252 |
|
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
|
253 |
list_for_each_entry(fmmu_temp, &domain->fmmu_configs, list) { |
1907
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
254 |
// we have to remove the constness, sorry FIXME |
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
255 |
ec_slave_config_t *sc = (ec_slave_config_t *) fmmu_temp->sc; |
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
256 |
sc->used_for_fmmu_datagram[fmmu_temp->dir] = 0; |
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
257 |
} |
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
258 |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
259 |
list_for_each_entry(fmmu, &domain->fmmu_configs, list) { |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
260 |
// Correct logical FMMU address |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
261 |
fmmu->logical_start_address += base_address; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
262 |
|
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
263 |
// 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
|
264 |
// and calculate expected working counters |
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
|
265 |
if (fmmu->sc->used_for_fmmu_datagram[fmmu->dir] == 0) { |
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
|
266 |
ec_slave_config_t *sc = (ec_slave_config_t *)fmmu->sc; |
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
|
267 |
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
|
268 |
sc->used_for_fmmu_datagram[fmmu->dir] = 1; |
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
|
269 |
} |
1907
dd276ae226b4
Added missing code documentation.
Florian Pose <fp@igh-essen.com>
parents:
1798
diff
changeset
|
270 |
|
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
271 |
// 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
|
272 |
// allocate a new one. |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
273 |
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
|
274 |
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
|
275 |
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
|
276 |
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
|
277 |
datagram_used); |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
278 |
if (ret < 0) |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
279 |
return ret; |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
280 |
datagram_offset += datagram_size; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
281 |
datagram_size = 0; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
282 |
datagram_count++; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
283 |
datagram_used[EC_DIR_OUTPUT] = 0; |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
284 |
datagram_used[EC_DIR_INPUT] = 0; |
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
|
285 |
list_for_each_entry(fmmu_temp, &domain->fmmu_configs, list) { |
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
|
286 |
ec_slave_config_t *sc = (ec_slave_config_t *)fmmu_temp->sc; |
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
|
287 |
sc->used_for_fmmu_datagram[fmmu_temp->dir] = 0; |
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
|
288 |
} |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
289 |
} |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
290 |
|
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
291 |
datagram_size += fmmu->data_size; |
809 | 292 |
} |
293 |
||
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
294 |
/* 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
|
295 |
* the process data fit into a single datagram) */ |
809 | 296 |
if (datagram_size) { |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
297 |
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
|
298 |
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
|
299 |
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
|
300 |
datagram_used); |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
301 |
if (ret < 0) |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
302 |
return ret; |
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
303 |
datagram_count++; |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
304 |
} |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
305 |
|
1921 | 306 |
EC_MASTER_INFO(domain->master, "Domain%u: Logical address 0x%08x," |
307 |
" %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
|
308 |
domain->logical_base_address, domain->data_size, |
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
309 |
domain->expected_working_counter); |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
310 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
311 |
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
|
312 |
const ec_datagram_t *datagram = |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
313 |
&datagram_pair->datagrams[EC_DEVICE_MAIN]; |
1921 | 314 |
EC_MASTER_INFO(domain->master, " Datagram %s: Logical offset 0x%08x," |
315 |
" %zu byte, type %s.\n", datagram->name, |
|
316 |
EC_READ_U32(datagram->address), datagram->data_size, |
|
317 |
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
|
318 |
} |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
319 |
|
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
320 |
return 0; |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
321 |
} |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
322 |
|
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
323 |
/*****************************************************************************/ |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
315
diff
changeset
|
324 |
|
1092 | 325 |
/** Get the number of FMMU configurations of the domain. |
326 |
*/ |
|
950
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
327 |
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
|
328 |
{ |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
329 |
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
|
330 |
unsigned int num = 0; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
331 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
332 |
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
|
333 |
num++; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
334 |
} |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
335 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
336 |
return num; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
337 |
} |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
338 |
|
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 |
|
1092 | 341 |
/** Get a certain FMMU configuration via its position in the list. |
342 |
*/ |
|
950
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
343 |
const ec_fmmu_config_t *ec_domain_find_fmmu( |
1092 | 344 |
const ec_domain_t *domain, /**< EtherCAT domain. */ |
345 |
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
|
346 |
) |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
347 |
{ |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
348 |
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
|
349 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
350 |
list_for_each_entry(fmmu, &domain->fmmu_configs, list) { |
1092 | 351 |
if (pos--) |
950
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
352 |
continue; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
353 |
return fmmu; |
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 |
|
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
356 |
return NULL; |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
357 |
} |
8b00e63fff90
'ethercat domain' shows domain contents and process data.
Florian Pose <fp@igh-essen.com>
parents:
944
diff
changeset
|
358 |
|
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
359 |
/****************************************************************************** |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
360 |
* Application interface |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
361 |
*****************************************************************************/ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
362 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
363 |
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
|
364 |
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
|
365 |
{ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
366 |
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
|
367 |
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
|
368 |
int ret; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
369 |
|
1921 | 370 |
EC_MASTER_DBG(domain->master, 1, "ecrt_domain_reg_pdo_entry_list(" |
371 |
"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
|
372 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
373 |
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
|
374 |
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
|
375 |
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
|
376 |
if (IS_ERR(sc)) |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
377 |
return PTR_ERR(sc); |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
378 |
|
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
379 |
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
|
380 |
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
|
381 |
if (ret < 0) |
ed15eef57d5c
Improved error case return codes of many functions.
Florian Pose <fp@igh-essen.com>
parents:
1304
diff
changeset
|
382 |
return ret; |
916
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
383 |
|
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
384 |
*reg->offset = ret; |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
385 |
} |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
386 |
|
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
387 |
return 0; |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
388 |
} |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
389 |
|
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
390 |
/*****************************************************************************/ |
db73994fbdac
Added bitwise Pdo registration.
Florian Pose <fp@igh-essen.com>
parents:
912
diff
changeset
|
391 |
|
1257
9844ac126275
Made ecrt_domain_size() const.
Florian Pose <fp@igh-essen.com>
parents:
1225
diff
changeset
|
392 |
size_t ecrt_domain_size(const ec_domain_t *domain) |
809 | 393 |
{ |
394 |
return domain->data_size; |
|
395 |
} |
|
396 |
||
397 |
/*****************************************************************************/ |
|
398 |
||
399 |
void ecrt_domain_external_memory(ec_domain_t *domain, uint8_t *mem) |
|
400 |
{ |
|
1921 | 401 |
EC_MASTER_DBG(domain->master, 1, "ecrt_domain_external_memory(" |
402 |
"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
|
403 |
|
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
|
404 |
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
|
405 |
|
809 | 406 |
ec_domain_clear_data(domain); |
407 |
||
408 |
domain->data = mem; |
|
409 |
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
|
410 |
|
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
|
411 |
up(&domain->master->master_sem); |
809 | 412 |
} |
413 |
||
414 |
/*****************************************************************************/ |
|
415 |
||
416 |
uint8_t *ecrt_domain_data(ec_domain_t *domain) |
|
417 |
{ |
|
418 |
return domain->data; |
|
419 |
} |
|
420 |
||
421 |
/*****************************************************************************/ |
|
422 |
||
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
423 |
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
|
424 |
{ |
985
90bcaf9ce3d5
Fixed calculation of expected working counter.
Florian Pose <fp@igh-essen.com>
parents:
950
diff
changeset
|
425 |
uint16_t working_counter_sum; |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
426 |
ec_datagram_pair_t *datagram_pair; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
427 |
unsigned int i; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
428 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
429 |
working_counter_sum = 0; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
430 |
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
|
431 |
for (i = 0; i < EC_NUM_DEVICES; i++) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
432 |
ec_datagram_t *datagram = &datagram_pair->datagrams[i]; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
433 |
ec_datagram_output_stats(datagram); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
434 |
if (datagram->state == EC_DATAGRAM_RECEIVED) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
435 |
working_counter_sum += datagram->working_counter; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
436 |
} |
98
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
97
diff
changeset
|
437 |
} |
f564d0929292
MERGE branches/async 222:233 -> trunk (Kommando-Warteschlangen).
Florian Pose <fp@igh-essen.com>
parents:
97
diff
changeset
|
438 |
} |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
439 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
440 |
if (working_counter_sum != domain->working_counter) { |
332
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
441 |
domain->working_counter_changes++; |
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
442 |
domain->working_counter = working_counter_sum; |
332
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
443 |
} |
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
444 |
|
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
445 |
if (domain->working_counter_changes && |
344
5d8281f1aa2a
Replaced longer cycle timestamps with jiffies.
Florian Pose <fp@igh-essen.com>
parents:
343
diff
changeset
|
446 |
jiffies - domain->notify_jiffies > HZ) { |
5d8281f1aa2a
Replaced longer cycle timestamps with jiffies.
Florian Pose <fp@igh-essen.com>
parents:
343
diff
changeset
|
447 |
domain->notify_jiffies = jiffies; |
332
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
448 |
if (domain->working_counter_changes == 1) { |
1921 | 449 |
EC_MASTER_INFO(domain->master, "Domain %u: Working counter" |
450 |
" changed to %u/%u.\n", domain->index, |
|
451 |
domain->working_counter, domain->expected_working_counter); |
|
452 |
} else { |
|
453 |
EC_MASTER_INFO(domain->master, "Domain %u: %u working counter" |
|
454 |
" changes - now %u/%u.\n", domain->index, |
|
455 |
domain->working_counter_changes, domain->working_counter, |
|
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
|
456 |
domain->expected_working_counter); |
332
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
457 |
} |
e16093374dfd
New statistic outputs to avoid blasting the logs.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
458 |
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
|
459 |
} |
494
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
460 |
} |
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
461 |
|
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
462 |
/*****************************************************************************/ |
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
463 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
464 |
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
|
465 |
{ |
2269
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
466 |
ec_datagram_pair_t *datagram_pair; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
467 |
unsigned int i; |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
468 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
469 |
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
|
470 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
471 |
/* copy main data to backup datagram */ |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
472 |
memcpy(datagram_pair->datagrams[EC_DEVICE_BACKUP].data, |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
473 |
datagram_pair->datagrams[EC_DEVICE_MAIN].data, |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
474 |
datagram_pair->datagrams[EC_DEVICE_MAIN].data_size); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
475 |
|
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
476 |
for (i = 0; i < EC_NUM_DEVICES; i++) { |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
477 |
ec_master_queue_datagram(domain->master, |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
478 |
&datagram_pair->datagrams[i], i); |
1d0711235a61
Redundant outputs via datagram pairs.
Florian Pose <fp@igh-essen.com>
parents:
2268
diff
changeset
|
479 |
} |
494
178b1b43a88c
Version 1.2.0-rc1, re-introduced ecrt_domain_queue().
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
480 |
} |
73
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
481 |
} |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
482 |
|
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
483 |
/*****************************************************************************/ |
9f4ea66d89a3
Dynamische FMMU-Konfiguration, zwei Kopieroperationen eingespart, Einr?ckungen angepasst.
Florian Pose <fp@igh-essen.com>
parents:
58
diff
changeset
|
484 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
485 |
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
|
486 |
{ |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
487 |
state->working_counter = domain->working_counter; |
818
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
488 |
|
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
489 |
if (domain->working_counter) { |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
490 |
if (domain->working_counter == domain->expected_working_counter) { |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
491 |
state->wc_state = EC_WC_COMPLETE; |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
492 |
} else { |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
493 |
state->wc_state = EC_WC_INCOMPLETE; |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
494 |
} |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
495 |
} else { |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
496 |
state->wc_state = EC_WC_ZERO; |
b6c87ae254c9
Calculate expected working counter for domains.
Florian Pose <fp@igh-essen.com>
parents:
817
diff
changeset
|
497 |
} |
105
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
498 |
} |
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
499 |
|
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
500 |
/*****************************************************************************/ |
fad6709a526f
Dom?nen-Status (ecrt_domain_state) hinzugef?gt.
Florian Pose <fp@igh-essen.com>
parents:
104
diff
changeset
|
501 |
|
199
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
502 |
/** \cond */ |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
503 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
783
diff
changeset
|
504 |
EXPORT_SYMBOL(ecrt_domain_reg_pdo_entry_list); |
809 | 505 |
EXPORT_SYMBOL(ecrt_domain_size); |
506 |
EXPORT_SYMBOL(ecrt_domain_external_memory); |
|
507 |
EXPORT_SYMBOL(ecrt_domain_data); |
|
104
052bc82d5442
MERGE branches/async -> trunk (alle Unterschiede ?bernommen)
Florian Pose <fp@igh-essen.com>
parents:
101
diff
changeset
|
508 |
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
|
509 |
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
|
510 |
EXPORT_SYMBOL(ecrt_domain_state); |
42
a22a202d0f42
Domains, Warten beim Senden, 10kHz.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
511 |
|
199
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
512 |
/** \endcond */ |
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
513 |
|
04ecf40fc2e9
Doxygen added interface modules and file documentation.
Florian Pose <fp@igh-essen.com>
parents:
197
diff
changeset
|
514 |
/*****************************************************************************/ |