author | Florian Pose <fp@igh-essen.com> |
Tue, 10 Jan 2012 10:11:20 +0100 | |
changeset 2249 | 6dbd7594dd1d |
parent 2166 | 1d5a5303f15c |
child 2414 | f35c7c8e6591 |
permissions | -rw-r--r-- |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1 |
/****************************************************************************** |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2 |
* |
2145 | 3 |
* $Id: fsm_master.c,v afb40fd6018e 2011/09/16 12:10:23 fp $ |
238
b4960499098f
Added finite state machine (FSM) processing.
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:
1277
diff
changeset
|
5 |
* Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
6 |
* |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
7 |
* This file is part of the IgH EtherCAT Master. |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
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:
1277
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:
1277
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:
1277
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:
1277
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:
1277
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:
1277
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:
1277
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:
1277
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:
1277
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:
1277
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:
1277
diff
changeset
|
19 |
* with the IgH EtherCAT Master; if not, write to the Free Software |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
20 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
21 |
* |
1363
11c0b2caa253
Improved and added license headers.
Florian Pose <fp@igh-essen.com>
parents:
1349
diff
changeset
|
22 |
* --- |
11c0b2caa253
Improved and added license headers.
Florian Pose <fp@igh-essen.com>
parents:
1349
diff
changeset
|
23 |
* |
11c0b2caa253
Improved and added license headers.
Florian Pose <fp@igh-essen.com>
parents:
1349
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:
1349
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:
1349
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:
238
diff
changeset
|
27 |
* |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
28 |
*****************************************************************************/ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
29 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
30 |
/** \file |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
31 |
* EtherCAT master state machine. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
32 |
*/ |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
33 |
|
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
34 |
/*****************************************************************************/ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
35 |
|
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
36 |
#include "globals.h" |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
37 |
#include "master.h" |
329
d004349777fc
SDO configuration interface, SDO download state machine.
Florian Pose <fp@igh-essen.com>
parents:
325
diff
changeset
|
38 |
#include "mailbox.h" |
858
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
39 |
#include "slave_config.h" |
715
f12ff7c08623
Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents:
713
diff
changeset
|
40 |
#ifdef EC_EOE |
661
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
41 |
#include "ethernet.h" |
715
f12ff7c08623
Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents:
713
diff
changeset
|
42 |
#endif |
849
4b712ec8929d
Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents:
834
diff
changeset
|
43 |
|
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
44 |
#include "fsm_master.h" |
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
45 |
#include "fsm_foe.h" |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
46 |
|
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
47 |
/*****************************************************************************/ |
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
48 |
|
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
49 |
/** Time difference [ns] to tolerate without setting a new system time offset. |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
50 |
*/ |
1998
0330fdcbdd1f
Use ESC port order (0-3-1-2) for bus topology and DC delay calculation
Martin Troxler <ch1010277@ch10pc446>
parents:
1995
diff
changeset
|
51 |
#ifdef EC_HAVE_CYCLES |
0330fdcbdd1f
Use ESC port order (0-3-1-2) for bus topology and DC delay calculation
Martin Troxler <ch1010277@ch10pc446>
parents:
1995
diff
changeset
|
52 |
#define EC_SYSTEM_TIME_TOLERANCE_NS 10000 |
0330fdcbdd1f
Use ESC port order (0-3-1-2) for bus topology and DC delay calculation
Martin Troxler <ch1010277@ch10pc446>
parents:
1995
diff
changeset
|
53 |
#else |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
54 |
#define EC_SYSTEM_TIME_TOLERANCE_NS 100000000 |
1998
0330fdcbdd1f
Use ESC port order (0-3-1-2) for bus topology and DC delay calculation
Martin Troxler <ch1010277@ch10pc446>
parents:
1995
diff
changeset
|
55 |
#endif |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
56 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
57 |
/*****************************************************************************/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
58 |
|
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
59 |
void ec_fsm_master_state_start(ec_fsm_master_t *); |
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
60 |
void ec_fsm_master_state_broadcast(ec_fsm_master_t *); |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
61 |
void ec_fsm_master_state_read_state(ec_fsm_master_t *); |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
62 |
void ec_fsm_master_state_acknowledge(ec_fsm_master_t *); |
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
63 |
void ec_fsm_master_state_configure_slave(ec_fsm_master_t *); |
717
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
64 |
void ec_fsm_master_state_clear_addresses(ec_fsm_master_t *); |
1420
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
65 |
void ec_fsm_master_state_dc_measure_delays(ec_fsm_master_t *); |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
66 |
void ec_fsm_master_state_scan_slave(ec_fsm_master_t *); |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
67 |
void ec_fsm_master_state_dc_read_offset(ec_fsm_master_t *); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
68 |
void ec_fsm_master_state_dc_write_offset(ec_fsm_master_t *); |
872 | 69 |
void ec_fsm_master_state_write_sii(ec_fsm_master_t *); |
905
6d74ebc603ee
Renamed state sdodict to sdo_dictionary.
Florian Pose <fp@igh-essen.com>
parents:
904
diff
changeset
|
70 |
void ec_fsm_master_state_sdo_dictionary(ec_fsm_master_t *); |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
71 |
void ec_fsm_master_state_sdo_request(ec_fsm_master_t *); |
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
72 |
void ec_fsm_master_state_reg_request(ec_fsm_master_t *); |
251
c1d0b63a9302
EoE in Free-Run mode; Finished slave configuration state machine.
Florian Pose <fp@igh-essen.com>
parents:
246
diff
changeset
|
73 |
|
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
74 |
void ec_fsm_master_enter_write_system_times(ec_fsm_master_t *); |
1583
017fa8fd9ac1
Each slave got its own SDO state machine (faster handling of external SDO requests)
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1579
diff
changeset
|
75 |
|
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
76 |
/*****************************************************************************/ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
77 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
78 |
/** Constructor. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
79 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
80 |
void ec_fsm_master_init( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
81 |
ec_fsm_master_t *fsm, /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
82 |
ec_master_t *master, /**< EtherCAT master. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
83 |
ec_datagram_t *datagram /**< Datagram object to use. */ |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
84 |
) |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
85 |
{ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
86 |
fsm->master = master; |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
87 |
fsm->datagram = datagram; |
2045
ff2a13a4603c
Reduced frame size when sending to mailbox, uses 2 datagrams. Enabled with configure option --enable-mboxframesize
Martin Troxler <ch1010277@ch10pc446>
parents:
2044
diff
changeset
|
88 |
fsm->mbox = &master->fsm_mbox; |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
89 |
fsm->state = ec_fsm_master_state_start; |
650
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
90 |
fsm->idle = 0; |
1400
3c4923051e43
Clear slave list on link down.
Florian Pose <fp@igh-essen.com>
parents:
1388
diff
changeset
|
91 |
fsm->link_state = 0; |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
92 |
fsm->slaves_responding = 0; |
1961 | 93 |
fsm->rescan_required = 0; |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
94 |
fsm->slave_states = EC_SLAVE_STATE_UNKNOWN; |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
95 |
|
436
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
96 |
// init sub-state-machines |
2045
ff2a13a4603c
Reduced frame size when sending to mailbox, uses 2 datagrams. Enabled with configure option --enable-mboxframesize
Martin Troxler <ch1010277@ch10pc446>
parents:
2044
diff
changeset
|
97 |
ec_fsm_coe_init(&fsm->fsm_coe, fsm->mbox); |
1174
235f34ca50e2
Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents:
1079
diff
changeset
|
98 |
ec_fsm_pdo_init(&fsm->fsm_pdo, &fsm->fsm_coe); |
235f34ca50e2
Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents:
1079
diff
changeset
|
99 |
ec_fsm_change_init(&fsm->fsm_change, fsm->datagram); |
235f34ca50e2
Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents:
1079
diff
changeset
|
100 |
ec_fsm_slave_config_init(&fsm->fsm_slave_config, fsm->datagram, |
235f34ca50e2
Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents:
1079
diff
changeset
|
101 |
&fsm->fsm_change, &fsm->fsm_coe, &fsm->fsm_pdo); |
831
ded9519c8d6e
Reading of Pdo mapping via CoE during scan.
Florian Pose <fp@igh-essen.com>
parents:
830
diff
changeset
|
102 |
ec_fsm_slave_scan_init(&fsm->fsm_slave_scan, fsm->datagram, |
1174
235f34ca50e2
Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents:
1079
diff
changeset
|
103 |
&fsm->fsm_slave_config, &fsm->fsm_pdo); |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
104 |
ec_fsm_sii_init(&fsm->fsm_sii, fsm->datagram); |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
105 |
} |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
106 |
|
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
107 |
/*****************************************************************************/ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
108 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
109 |
/** Destructor. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
110 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
111 |
void ec_fsm_master_clear( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
112 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
113 |
) |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
114 |
{ |
436
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
115 |
// clear sub-state machines |
1174
235f34ca50e2
Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents:
1079
diff
changeset
|
116 |
ec_fsm_coe_clear(&fsm->fsm_coe); |
235f34ca50e2
Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents:
1079
diff
changeset
|
117 |
ec_fsm_pdo_clear(&fsm->fsm_pdo); |
235f34ca50e2
Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents:
1079
diff
changeset
|
118 |
ec_fsm_change_clear(&fsm->fsm_change); |
830
d83d92e1a919
Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents:
815
diff
changeset
|
119 |
ec_fsm_slave_config_clear(&fsm->fsm_slave_config); |
d83d92e1a919
Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents:
815
diff
changeset
|
120 |
ec_fsm_slave_scan_clear(&fsm->fsm_slave_scan); |
433
100f51f28cf2
Layed out SII state machine.
Florian Pose <fp@igh-essen.com>
parents:
430
diff
changeset
|
121 |
ec_fsm_sii_clear(&fsm->fsm_sii); |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
122 |
} |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
123 |
|
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
124 |
/*****************************************************************************/ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
125 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
126 |
/** Executes the current state of the state machine. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
127 |
* |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
128 |
* If the state machine's datagram is not sent or received yet, the execution |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
129 |
* of the state machine is delayed to the next cycle. |
1583
017fa8fd9ac1
Each slave got its own SDO state machine (faster handling of external SDO requests)
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1579
diff
changeset
|
130 |
* |
017fa8fd9ac1
Each slave got its own SDO state machine (faster handling of external SDO requests)
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1579
diff
changeset
|
131 |
* \return true, if the state machine was executed |
017fa8fd9ac1
Each slave got its own SDO state machine (faster handling of external SDO requests)
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1579
diff
changeset
|
132 |
*/ |
017fa8fd9ac1
Each slave got its own SDO state machine (faster handling of external SDO requests)
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1579
diff
changeset
|
133 |
int ec_fsm_master_exec( |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
134 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
135 |
) |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
136 |
{ |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
137 |
if (ec_mbox_is_datagram_state(fsm->mbox, EC_DATAGRAM_QUEUED) |
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
138 |
|| ec_mbox_is_datagram_state(fsm->mbox, EC_DATAGRAM_SENT)) { |
505
bc443ca0077f
State machines re-send datagrams on timeout.
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
139 |
// datagram was not sent or received yet. |
1583
017fa8fd9ac1
Each slave got its own SDO state machine (faster handling of external SDO requests)
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1579
diff
changeset
|
140 |
return 0; |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
141 |
} |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
142 |
|
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
143 |
fsm->state(fsm); |
1583
017fa8fd9ac1
Each slave got its own SDO state machine (faster handling of external SDO requests)
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1579
diff
changeset
|
144 |
return 1; |
446 | 145 |
} |
146 |
||
650
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
147 |
/*****************************************************************************/ |
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
148 |
|
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
149 |
/** |
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
150 |
* \return true, if the state machine is in an idle phase |
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
151 |
*/ |
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
152 |
int ec_fsm_master_idle( |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
153 |
const ec_fsm_master_t *fsm /**< Master state machine. */ |
650
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
154 |
) |
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
155 |
{ |
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
156 |
return fsm->idle; |
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
157 |
} |
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
158 |
|
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
159 |
/*****************************************************************************/ |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
160 |
|
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
161 |
/** Restarts the master state machine. |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
162 |
*/ |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
163 |
void ec_fsm_master_restart( |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
164 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
165 |
) |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
166 |
{ |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
167 |
fsm->state = ec_fsm_master_state_start; |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
168 |
fsm->state(fsm); // execute immediately |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
169 |
} |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
170 |
|
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
171 |
/****************************************************************************** |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
172 |
* Master state machine |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
173 |
*****************************************************************************/ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
174 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
175 |
/** Master state: START. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
176 |
* |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
177 |
* Starts with getting slave count and slave states. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
178 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
179 |
void ec_fsm_master_state_start( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
180 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
181 |
) |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
182 |
{ |
650
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
183 |
fsm->idle = 1; |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
184 |
ec_datagram_brd(fsm->datagram, 0x0130, 2); |
1225
4d5b739edcb5
Introduced ec_datagram_zero().
Florian Pose <fp@igh-essen.com>
parents:
1219
diff
changeset
|
185 |
ec_datagram_zero(fsm->datagram); |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
186 |
fsm->state = ec_fsm_master_state_broadcast; |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
187 |
} |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
188 |
|
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
189 |
/*****************************************************************************/ |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
190 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
191 |
/** Master state: BROADCAST. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
192 |
* |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
193 |
* Processes the broadcast read slave count and slaves states. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
194 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
195 |
void ec_fsm_master_state_broadcast( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
196 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
197 |
) |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
198 |
{ |
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
199 |
ec_datagram_t *datagram = fsm->datagram; |
1005 | 200 |
unsigned int i, size; |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
201 |
ec_slave_t *slave; |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
202 |
ec_master_t *master = fsm->master; |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
203 |
|
637
d5d04c868e0e
Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents:
612
diff
changeset
|
204 |
if (datagram->state == EC_DATAGRAM_TIMED_OUT) |
d5d04c868e0e
Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents:
612
diff
changeset
|
205 |
return; // always retry |
505
bc443ca0077f
State machines re-send datagrams on timeout.
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
206 |
|
553
a4e0267825e3
Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents:
538
diff
changeset
|
207 |
// bus topology change? |
a4e0267825e3
Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents:
538
diff
changeset
|
208 |
if (datagram->working_counter != fsm->slaves_responding) { |
1961 | 209 |
fsm->rescan_required = 1; |
553
a4e0267825e3
Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents:
538
diff
changeset
|
210 |
fsm->slaves_responding = datagram->working_counter; |
1921 | 211 |
EC_MASTER_INFO(master, "%u slave(s) responding.\n", |
212 |
fsm->slaves_responding); |
|
906 | 213 |
} |
214 |
||
2146
05c6ddef33ab
Fixed missing return causing slaves not going to OP.
Florian Pose <fp@igh-essen.com>
parents:
2145
diff
changeset
|
215 |
if (fsm->link_state && !master->main_device.link_state) { |
05c6ddef33ab
Fixed missing return causing slaves not going to OP.
Florian Pose <fp@igh-essen.com>
parents:
2145
diff
changeset
|
216 |
// link went down |
1921 | 217 |
EC_MASTER_DBG(master, 1, "Master state machine detected " |
218 |
"link down. Clearing slave list.\n"); |
|
1402
4c1203ec569d
Tested clearing slave list after link down; minor changes.
Florian Pose <fp@igh-essen.com>
parents:
1400
diff
changeset
|
219 |
|
1400
3c4923051e43
Clear slave list on link down.
Florian Pose <fp@igh-essen.com>
parents:
1388
diff
changeset
|
220 |
ec_master_clear_slaves(master); |
1830
ef09f0ea0c4c
Reset AL states on link down.
Florian Pose <fp@igh-essen.com>
parents:
1822
diff
changeset
|
221 |
fsm->slave_states = 0x00; |
2166
1d5a5303f15c
Improved resetting number of responding slaves.
Florian Pose <fp@igh-essen.com>
parents:
2146
diff
changeset
|
222 |
fsm->slaves_responding = 0; /* reset to trigger rescan on next link |
1d5a5303f15c
Improved resetting number of responding slaves.
Florian Pose <fp@igh-essen.com>
parents:
2146
diff
changeset
|
223 |
up. */ |
1400
3c4923051e43
Clear slave list on link down.
Florian Pose <fp@igh-essen.com>
parents:
1388
diff
changeset
|
224 |
} |
3c4923051e43
Clear slave list on link down.
Florian Pose <fp@igh-essen.com>
parents:
1388
diff
changeset
|
225 |
fsm->link_state = master->main_device.link_state; |
3c4923051e43
Clear slave list on link down.
Florian Pose <fp@igh-essen.com>
parents:
1388
diff
changeset
|
226 |
|
1402
4c1203ec569d
Tested clearing slave list after link down; minor changes.
Florian Pose <fp@igh-essen.com>
parents:
1400
diff
changeset
|
227 |
if (datagram->state != EC_DATAGRAM_RECEIVED) { |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
228 |
ec_fsm_master_restart(fsm); |
906 | 229 |
return; |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
230 |
} |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
231 |
|
1021
fa5cf205f4f0
Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents:
1005
diff
changeset
|
232 |
if (fsm->slaves_responding) { |
fa5cf205f4f0
Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents:
1005
diff
changeset
|
233 |
uint8_t states = EC_READ_U8(datagram->data); |
fa5cf205f4f0
Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents:
1005
diff
changeset
|
234 |
if (states != fsm->slave_states) { // slave states changed? |
fa5cf205f4f0
Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents:
1005
diff
changeset
|
235 |
char state_str[EC_STATE_STRING_SIZE]; |
fa5cf205f4f0
Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents:
1005
diff
changeset
|
236 |
fsm->slave_states = states; |
1337
0253c74d0940
merge -c1619 branches/1.4-foe: Implemented going to bootstrap state BOOT.
Florian Pose <fp@igh-essen.com>
parents:
1336
diff
changeset
|
237 |
ec_state_string(fsm->slave_states, state_str, 1); |
1921 | 238 |
EC_MASTER_INFO(master, "Slave states: %s.\n", state_str); |
1021
fa5cf205f4f0
Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents:
1005
diff
changeset
|
239 |
} |
fa5cf205f4f0
Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents:
1005
diff
changeset
|
240 |
} else { |
fa5cf205f4f0
Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents:
1005
diff
changeset
|
241 |
fsm->slave_states = 0x00; |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
242 |
} |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
243 |
|
1961 | 244 |
if (fsm->rescan_required) { |
2028
55854f070c4a
use rt_mutex instead of semaphore for mutual exclusion (use --enable-mutex)
Martin Troxler <ch1010277@ch10pc446>
parents:
2027
diff
changeset
|
245 |
ec_mutex_lock(&master->scan_mutex); |
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
246 |
if (!master->allow_scan) { |
2028
55854f070c4a
use rt_mutex instead of semaphore for mutual exclusion (use --enable-mutex)
Martin Troxler <ch1010277@ch10pc446>
parents:
2027
diff
changeset
|
247 |
ec_mutex_unlock(&master->scan_mutex); |
900
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
248 |
} else { |
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
249 |
master->scan_busy = 1; |
2028
55854f070c4a
use rt_mutex instead of semaphore for mutual exclusion (use --enable-mutex)
Martin Troxler <ch1010277@ch10pc446>
parents:
2027
diff
changeset
|
250 |
ec_mutex_unlock(&master->scan_mutex); |
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
251 |
|
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
252 |
// clear all slaves and scan the bus |
1961 | 253 |
fsm->rescan_required = 0; |
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
254 |
fsm->idle = 0; |
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
255 |
fsm->scan_jiffies = jiffies; |
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
256 |
|
715
f12ff7c08623
Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents:
713
diff
changeset
|
257 |
#ifdef EC_EOE |
661
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
258 |
ec_master_clear_eoe_handlers(master); |
715
f12ff7c08623
Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents:
713
diff
changeset
|
259 |
#endif |
992
50a44cbd30af
Removed kobjects from sdo and slave.
Florian Pose <fp@igh-essen.com>
parents:
987
diff
changeset
|
260 |
ec_master_clear_slaves(master); |
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
261 |
|
1003 | 262 |
master->slave_count = fsm->slaves_responding; |
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
263 |
|
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
264 |
if (!master->slave_count) { |
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
265 |
// no slaves present -> finish state machine. |
900
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
266 |
master->scan_busy = 0; |
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
267 |
wake_up_interruptible(&master->scan_queue); |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
268 |
ec_fsm_master_restart(fsm); |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
269 |
return; |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
270 |
} |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
271 |
|
1005 | 272 |
size = sizeof(ec_slave_t) * master->slave_count; |
2146
05c6ddef33ab
Fixed missing return causing slaves not going to OP.
Florian Pose <fp@igh-essen.com>
parents:
2145
diff
changeset
|
273 |
if (!(master->slaves = |
05c6ddef33ab
Fixed missing return causing slaves not going to OP.
Florian Pose <fp@igh-essen.com>
parents:
2145
diff
changeset
|
274 |
(ec_slave_t *) kmalloc(size, GFP_KERNEL))) { |
1921 | 275 |
EC_MASTER_ERR(master, "Failed to allocate %u bytes" |
276 |
" of slave memory!\n", size); |
|
1064
5f27403587a8
Avoid duplicate reconfiguration.
Florian Pose <fp@igh-essen.com>
parents:
1031
diff
changeset
|
277 |
master->slave_count = 0; // TODO avoid retrying scan! |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
278 |
master->scan_busy = 0; |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
279 |
wake_up_interruptible(&master->scan_queue); |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
280 |
ec_fsm_master_restart(fsm); |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
281 |
return; |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
282 |
} |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
283 |
|
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
284 |
// init slaves |
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
285 |
for (i = 0; i < master->slave_count; i++) { |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
286 |
slave = master->slaves + i; |
992
50a44cbd30af
Removed kobjects from sdo and slave.
Florian Pose <fp@igh-essen.com>
parents:
987
diff
changeset
|
287 |
ec_slave_init(slave, master, i, i + 1); |
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
288 |
|
1029
61ffe5f22306
Renamed master 'mode' to 'phase'.
Florian Pose <fp@igh-essen.com>
parents:
1028
diff
changeset
|
289 |
// do not force reconfiguration in operation phase to avoid |
908
386b908033be
Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents:
907
diff
changeset
|
290 |
// unnecesssary process data interruptions |
1029
61ffe5f22306
Renamed master 'mode' to 'phase'.
Florian Pose <fp@igh-essen.com>
parents:
1028
diff
changeset
|
291 |
if (master->phase != EC_OPERATION) |
908
386b908033be
Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents:
907
diff
changeset
|
292 |
slave->force_config = 1; |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
293 |
} |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
294 |
|
904 | 295 |
// broadcast clear all station addresses |
717
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
296 |
ec_datagram_bwr(datagram, 0x0010, 2); |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
297 |
EC_WRITE_U16(datagram->data, 0x0000); |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
298 |
fsm->retries = EC_FSM_RETRIES; |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
299 |
fsm->state = ec_fsm_master_state_clear_addresses; |
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
300 |
return; |
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
301 |
} |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
302 |
} |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
303 |
|
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
304 |
if (master->slave_count) { |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
305 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
306 |
// application applied configurations |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
307 |
if (master->config_changed) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
308 |
master->config_changed = 0; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
309 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
310 |
EC_MASTER_DBG(master, 1, "Configuration changed.\n"); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
311 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
312 |
fsm->slave = master->slaves; // begin with first slave |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
313 |
ec_fsm_master_enter_write_system_times(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
314 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
315 |
} else { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
316 |
// fetch state from first slave |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
317 |
fsm->slave = master->slaves; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
318 |
ec_datagram_fprd(fsm->datagram, fsm->slave->station_address, |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
319 |
0x0130, 2); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
320 |
ec_datagram_zero(datagram); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
321 |
fsm->retries = EC_FSM_RETRIES; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
322 |
fsm->state = ec_fsm_master_state_read_state; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
323 |
} |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
324 |
} else { |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
325 |
ec_fsm_master_restart(fsm); |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
326 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
327 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
328 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
329 |
/*****************************************************************************/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
330 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
331 |
/** Check for pending SII write requests and process one. |
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
332 |
* |
872 | 333 |
* \return non-zero, if an SII write request is processed. |
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
334 |
*/ |
872 | 335 |
int ec_fsm_master_action_process_sii( |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
336 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
337 |
) |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
338 |
{ |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
339 |
ec_master_t *master = fsm->master; |
872 | 340 |
ec_sii_write_request_t *request; |
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
341 |
|
604
74ceacf42710
Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents:
603
diff
changeset
|
342 |
// search the first request to be processed |
74ceacf42710
Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents:
603
diff
changeset
|
343 |
while (1) { |
1079
ef1266652c4d
Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents:
1064
diff
changeset
|
344 |
if (list_empty(&master->sii_requests)) |
604
74ceacf42710
Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents:
603
diff
changeset
|
345 |
break; |
1079
ef1266652c4d
Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents:
1064
diff
changeset
|
346 |
|
604
74ceacf42710
Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents:
603
diff
changeset
|
347 |
// get first request |
872 | 348 |
request = list_entry(master->sii_requests.next, |
349 |
ec_sii_write_request_t, list); |
|
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
350 |
list_del_init(&request->list); // dequeue |
1209 | 351 |
request->state = EC_INT_REQUEST_BUSY; |
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
352 |
|
872 | 353 |
// found pending SII write operation. execute it! |
1921 | 354 |
EC_SLAVE_DBG(request->slave, 1, "Writing SII data...\n"); |
872 | 355 |
fsm->sii_request = request; |
356 |
fsm->sii_index = 0; |
|
979
405cc2d033e0
Renamed some fields in ec_sii_request_t to word addressing.
Florian Pose <fp@igh-essen.com>
parents:
969
diff
changeset
|
357 |
ec_fsm_sii_write(&fsm->fsm_sii, request->slave, request->offset, |
405cc2d033e0
Renamed some fields in ec_sii_request_t to word addressing.
Florian Pose <fp@igh-essen.com>
parents:
969
diff
changeset
|
358 |
request->words, EC_FSM_SII_USE_CONFIGURED_ADDRESS); |
872 | 359 |
fsm->state = ec_fsm_master_state_write_sii; |
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
360 |
fsm->state(fsm); // execute immediately |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
361 |
return 1; |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
362 |
} |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
363 |
|
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
364 |
return 0; |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
365 |
} |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
366 |
|
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
367 |
/*****************************************************************************/ |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
368 |
|
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
369 |
/** Check for pending register requests and process one. |
1579
326d47aa986c
applied komax patch to version r1822
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1507
diff
changeset
|
370 |
* |
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
371 |
* \return non-zero, if a register request is processed. |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
372 |
*/ |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
373 |
int ec_fsm_master_action_process_register( |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
374 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
375 |
) |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
376 |
{ |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
377 |
ec_master_t *master = fsm->master; |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
378 |
ec_reg_request_t *request; |
1200 | 379 |
|
380 |
// search the first request to be processed |
|
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
381 |
while (!list_empty(&master->reg_requests)) { |
1200 | 382 |
|
383 |
// get first request |
|
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
384 |
request = list_entry(master->reg_requests.next, |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
385 |
ec_reg_request_t, list); |
1200 | 386 |
list_del_init(&request->list); // dequeue |
1209 | 387 |
request->state = EC_INT_REQUEST_BUSY; |
1200 | 388 |
|
389 |
// found pending request; process it! |
|
1921 | 390 |
EC_SLAVE_DBG(request->slave, 1, "Processing register request, " |
391 |
"offset 0x%04x, length %zu...\n", |
|
392 |
request->offset, request->length); |
|
1386
95ec1e9bcb53
Check phy_request length for read operations, too!
Florian Pose <fp@igh-essen.com>
parents:
1385
diff
changeset
|
393 |
|
95ec1e9bcb53
Check phy_request length for read operations, too!
Florian Pose <fp@igh-essen.com>
parents:
1385
diff
changeset
|
394 |
if (request->length > fsm->datagram->mem_size) { |
1921 | 395 |
EC_MASTER_ERR(master, "Request length (%zu) exceeds maximum " |
1543
373cd456dc26
Avoid warnings on x86_64 platform. Thanks to Thomas Elste.
Florian Pose <fp@igh-essen.com>
parents:
1507
diff
changeset
|
396 |
"datagram size (%zu)!\n", request->length, |
1386
95ec1e9bcb53
Check phy_request length for read operations, too!
Florian Pose <fp@igh-essen.com>
parents:
1385
diff
changeset
|
397 |
fsm->datagram->mem_size); |
95ec1e9bcb53
Check phy_request length for read operations, too!
Florian Pose <fp@igh-essen.com>
parents:
1385
diff
changeset
|
398 |
request->state = EC_INT_REQUEST_FAILURE; |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
399 |
kref_put(&request->refcount, ec_master_reg_request_release); |
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
400 |
wake_up(&master->reg_queue); |
1386
95ec1e9bcb53
Check phy_request length for read operations, too!
Florian Pose <fp@igh-essen.com>
parents:
1385
diff
changeset
|
401 |
continue; |
95ec1e9bcb53
Check phy_request length for read operations, too!
Florian Pose <fp@igh-essen.com>
parents:
1385
diff
changeset
|
402 |
} |
95ec1e9bcb53
Check phy_request length for read operations, too!
Florian Pose <fp@igh-essen.com>
parents:
1385
diff
changeset
|
403 |
|
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
404 |
fsm->reg_request = request; |
1200 | 405 |
|
406 |
if (request->dir == EC_DIR_INPUT) { |
|
407 |
ec_datagram_fprd(fsm->datagram, request->slave->station_address, |
|
408 |
request->offset, request->length); |
|
1225
4d5b739edcb5
Introduced ec_datagram_zero().
Florian Pose <fp@igh-essen.com>
parents:
1219
diff
changeset
|
409 |
ec_datagram_zero(fsm->datagram); |
1200 | 410 |
} else { |
411 |
ec_datagram_fpwr(fsm->datagram, request->slave->station_address, |
|
412 |
request->offset, request->length); |
|
413 |
memcpy(fsm->datagram->data, request->data, request->length); |
|
414 |
} |
|
415 |
fsm->retries = EC_FSM_RETRIES; |
|
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
416 |
fsm->state = ec_fsm_master_state_reg_request; |
1200 | 417 |
return 1; |
418 |
} |
|
419 |
||
420 |
return 0; |
|
421 |
} |
|
422 |
||
423 |
/*****************************************************************************/ |
|
424 |
||
1327
4d179b06dd3c
merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
425 |
/** Check for pending SDO requests and process one. |
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
426 |
* |
1327
4d179b06dd3c
merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
427 |
* \return non-zero, if an SDO request is processed. |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
428 |
*/ |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
429 |
int ec_fsm_master_action_process_sdo( |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
430 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
431 |
) |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
432 |
{ |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
433 |
ec_master_t *master = fsm->master; |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
434 |
ec_slave_t *slave; |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
435 |
ec_sdo_request_t *req; |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
436 |
|
858
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
437 |
// search for internal requests to be processed |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
438 |
for (slave = master->slaves; |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
439 |
slave < master->slaves + master->slave_count; |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
440 |
slave++) { |
858
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
441 |
if (!slave->config) |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
442 |
continue; |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
443 |
list_for_each_entry(req, &slave->config->sdo_requests, list) { |
1209 | 444 |
if (req->state == EC_INT_REQUEST_QUEUED) { |
880 | 445 |
|
446 |
if (ec_sdo_request_timed_out(req)) { |
|
1209 | 447 |
req->state = EC_INT_REQUEST_FAILURE; |
1921 | 448 |
EC_SLAVE_DBG(slave, 1, "Internal SDO request" |
449 |
" timed out.\n"); |
|
880 | 450 |
continue; |
451 |
} |
|
858
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
452 |
|
987
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
453 |
if (slave->current_state == EC_SLAVE_STATE_INIT) { |
1209 | 454 |
req->state = EC_INT_REQUEST_FAILURE; |
858
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
455 |
continue; |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
456 |
} |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
457 |
|
1209 | 458 |
req->state = EC_INT_REQUEST_BUSY; |
1921 | 459 |
EC_SLAVE_DBG(slave, 1, "Processing internal" |
460 |
" SDO request...\n"); |
|
858
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
461 |
fsm->idle = 0; |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
462 |
fsm->sdo_request = req; |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
463 |
fsm->slave = slave; |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
464 |
fsm->state = ec_fsm_master_state_sdo_request; |
859
233e32f428e1
Replaced ec_fsm_coe_\(upload\|download\)() with ec_fsm_coe_transfer();
Florian Pose <fp@igh-essen.com>
parents:
858
diff
changeset
|
465 |
ec_fsm_coe_transfer(&fsm->fsm_coe, slave, req); |
858
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
466 |
ec_fsm_coe_exec(&fsm->fsm_coe); // execute immediately |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
467 |
return 1; |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
468 |
} |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
469 |
} |
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
470 |
} |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
471 |
return 0; |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
472 |
} |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
473 |
|
1597
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
474 |
|
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
475 |
/*****************************************************************************/ |
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
476 |
|
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
477 |
/** Master action: IDLE. |
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
478 |
* |
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
479 |
* Does secondary work. |
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
480 |
*/ |
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
481 |
void ec_fsm_master_action_idle( |
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
482 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
483 |
) |
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
484 |
{ |
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
485 |
ec_master_t *master = fsm->master; |
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
486 |
ec_slave_t *slave; |
1597
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
487 |
|
491dea6f4fd7
Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1596
diff
changeset
|
488 |
// Check for pending internal SDO requests |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
489 |
if (ec_fsm_master_action_process_sdo(fsm)) |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
490 |
return; |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
491 |
|
1831
1875b9fea0ba
Implemented reading Sercos-over-EtherCAT services. To be continued...
Florian Pose <fp@igh-essen.com>
parents:
1830
diff
changeset
|
492 |
// enable processing of requests |
1804 | 493 |
for (slave = master->slaves; |
494 |
slave < master->slaves + master->slave_count; |
|
495 |
slave++) { |
|
496 |
ec_fsm_slave_ready(&slave->fsm); |
|
497 |
} |
|
498 |
||
499 |
// check, if slaves have an SDO dictionary to read out. |
|
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
500 |
for (slave = master->slaves; |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
501 |
slave < master->slaves + master->slave_count; |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
502 |
slave++) { |
910
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
503 |
if (!(slave->sii.mailbox_protocols & EC_MBOX_COE) |
1219
aa030fb1e980
Only query Sdo information service, if slave supports it.
Florian Pose <fp@igh-essen.com>
parents:
1209
diff
changeset
|
504 |
|| (slave->sii.has_general |
aa030fb1e980
Only query Sdo information service, if slave supports it.
Florian Pose <fp@igh-essen.com>
parents:
1209
diff
changeset
|
505 |
&& !slave->sii.coe_details.enable_sdo_info) |
442
6607875255d9
SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents:
441
diff
changeset
|
506 |
|| slave->sdo_dictionary_fetched |
6607875255d9
SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents:
441
diff
changeset
|
507 |
|| slave->current_state == EC_SLAVE_STATE_INIT |
1219
aa030fb1e980
Only query Sdo information service, if slave supports it.
Florian Pose <fp@igh-essen.com>
parents:
1209
diff
changeset
|
508 |
|| slave->current_state == EC_SLAVE_STATE_UNKNOWN |
442
6607875255d9
SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents:
441
diff
changeset
|
509 |
|| jiffies - slave->jiffies_preop < EC_WAIT_SDO_DICT * HZ |
987
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
510 |
) continue; |
442
6607875255d9
SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents:
441
diff
changeset
|
511 |
|
1921 | 512 |
EC_SLAVE_DBG(slave, 1, "Fetching SDO dictionary.\n"); |
442
6607875255d9
SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents:
441
diff
changeset
|
513 |
|
910
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
514 |
slave->sdo_dictionary_fetched = 1; |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
515 |
|
1327
4d179b06dd3c
merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
516 |
// start fetching SDO dictionary |
910
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
517 |
fsm->idle = 0; |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
518 |
fsm->slave = slave; |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
519 |
fsm->state = ec_fsm_master_state_sdo_dictionary; |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
520 |
ec_fsm_coe_dictionary(&fsm->fsm_coe, slave); |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
521 |
ec_fsm_coe_exec(&fsm->fsm_coe); // execute immediately |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
522 |
return; |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
523 |
} |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
524 |
|
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
525 |
// check for pending SII write operations. |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
526 |
if (ec_fsm_master_action_process_sii(fsm)) |
9fd31755f576
Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents:
908
diff
changeset
|
527 |
return; // SII write request found |
304
558a6669da90
Better master state machines.
Florian Pose <fp@igh-essen.com>
parents:
301
diff
changeset
|
528 |
|
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
529 |
// check for pending register requests. |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
530 |
if (ec_fsm_master_action_process_register(fsm)) |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
531 |
return; // register request processing |
1200 | 532 |
|
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
533 |
ec_fsm_master_restart(fsm); |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
534 |
} |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
535 |
|
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
536 |
/*****************************************************************************/ |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
537 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
538 |
/** Master action: Get state of next slave. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
539 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
540 |
void ec_fsm_master_action_next_slave_state( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
541 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
542 |
) |
260
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
543 |
{ |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
544 |
ec_master_t *master = fsm->master; |
5fe7df7f2433
Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents:
259
diff
changeset
|
545 |
|
304
558a6669da90
Better master state machines.
Florian Pose <fp@igh-essen.com>
parents:
301
diff
changeset
|
546 |
// is there another slave to query? |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
547 |
fsm->slave++; |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
548 |
if (fsm->slave < master->slaves + master->slave_count) { |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
549 |
// fetch state from next slave |
650
c68995623e94
Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
649
diff
changeset
|
550 |
fsm->idle = 1; |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
551 |
ec_datagram_fprd(fsm->datagram, |
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
552 |
fsm->slave->station_address, 0x0130, 2); |
1225
4d5b739edcb5
Introduced ec_datagram_zero().
Florian Pose <fp@igh-essen.com>
parents:
1219
diff
changeset
|
553 |
ec_datagram_zero(fsm->datagram); |
505
bc443ca0077f
State machines re-send datagrams on timeout.
Florian Pose <fp@igh-essen.com>
parents:
484
diff
changeset
|
554 |
fsm->retries = EC_FSM_RETRIES; |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
555 |
fsm->state = ec_fsm_master_state_read_state; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
556 |
return; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
557 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
558 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
559 |
// all slaves processed |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
560 |
ec_fsm_master_action_idle(fsm); |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
561 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
562 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
563 |
/*****************************************************************************/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
564 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
565 |
/** Master action: Configure. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
566 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
567 |
void ec_fsm_master_action_configure( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
568 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
569 |
) |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
570 |
{ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
571 |
ec_master_t *master = fsm->master; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
572 |
ec_slave_t *slave = fsm->slave; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
573 |
|
2098
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
574 |
if (master->config_changed) { |
2112
70afe990c10e
Bugfix: Reset config_changed flag when aborting state check.
Florian Pose <fp@igh-essen.com>
parents:
2098
diff
changeset
|
575 |
master->config_changed = 0; |
70afe990c10e
Bugfix: Reset config_changed flag when aborting state check.
Florian Pose <fp@igh-essen.com>
parents:
2098
diff
changeset
|
576 |
|
2098
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
577 |
// abort iterating through slaves, |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
578 |
// first compensate DC system time offsets, |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
579 |
// then begin configuring at slave 0 |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
580 |
EC_MASTER_DBG(master, 1, "Configuration changed" |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
581 |
" (aborting state check).\n"); |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
582 |
|
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
583 |
fsm->slave = master->slaves; // begin with first slave |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
584 |
ec_fsm_master_enter_write_system_times(fsm); |
2146
05c6ddef33ab
Fixed missing return causing slaves not going to OP.
Florian Pose <fp@igh-essen.com>
parents:
2145
diff
changeset
|
585 |
return; |
2098
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
586 |
} |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
587 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
588 |
// Does the slave have to be configured? |
987
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
589 |
if ((slave->current_state != slave->requested_state |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
590 |
|| slave->force_config) && !slave->error_flag) { |
1177 | 591 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
592 |
// Start slave configuration, if it is allowed. |
2028
55854f070c4a
use rt_mutex instead of semaphore for mutual exclusion (use --enable-mutex)
Martin Troxler <ch1010277@ch10pc446>
parents:
2027
diff
changeset
|
593 |
ec_mutex_lock(&master->config_mutex); |
2117
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
594 |
master->config_busy = 1; |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
595 |
ec_mutex_unlock(&master->config_mutex); |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
596 |
|
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
597 |
if (master->debug_level) { |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
598 |
char old_state[EC_STATE_STRING_SIZE], |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
599 |
new_state[EC_STATE_STRING_SIZE]; |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
600 |
ec_state_string(slave->current_state, old_state, 0); |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
601 |
ec_state_string(slave->requested_state, new_state, 0); |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
602 |
EC_SLAVE_DBG(slave, 1, "Changing state from %s to %s%s.\n", |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
603 |
old_state, new_state, |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
604 |
slave->force_config ? " (forced)" : ""); |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
605 |
} |
2117
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
606 |
|
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
607 |
fsm->idle = 0; |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
608 |
fsm->state = ec_fsm_master_state_configure_slave; |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
609 |
ec_fsm_slave_config_start(&fsm->fsm_slave_config, slave); |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
610 |
fsm->state(fsm); // execute immediately |
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
611 |
return; |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
612 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
613 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
614 |
// slave has error flag set; process next one |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
615 |
ec_fsm_master_action_next_slave_state(fsm); |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
616 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
617 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
618 |
/*****************************************************************************/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
619 |
|
987
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
620 |
/** Master state: READ STATE. |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
621 |
* |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
622 |
* Fetches the AL state of a slave. |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
623 |
*/ |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
624 |
void ec_fsm_master_state_read_state( |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
625 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
626 |
) |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
627 |
{ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
628 |
ec_slave_t *slave = fsm->slave; |
987
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
629 |
ec_datagram_t *datagram = fsm->datagram; |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
630 |
|
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
631 |
if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--) |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
632 |
return; |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
633 |
|
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
634 |
if (datagram->state != EC_DATAGRAM_RECEIVED) { |
1921 | 635 |
EC_SLAVE_ERR(slave, "Failed to receive AL state datagram: "); |
1822
74e6ac2369f4
Introduced ec_datagram_print_state() method and used it at all places where
Florian Pose <fp@igh-essen.com>
parents:
1804
diff
changeset
|
636 |
ec_datagram_print_state(datagram); |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
637 |
ec_fsm_master_restart(fsm); |
987
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
638 |
return; |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
639 |
} |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
640 |
|
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
641 |
// did the slave not respond to its station address? |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
642 |
if (datagram->working_counter != 1) { |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
643 |
if (!slave->error_flag) { |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
644 |
slave->error_flag = 1; |
1921 | 645 |
EC_SLAVE_DBG(slave, 1, "Slave did not respond to state query.\n"); |
987
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
646 |
} |
1961 | 647 |
fsm->rescan_required = 1; |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
648 |
ec_fsm_master_restart(fsm); |
987
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
649 |
return; |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
650 |
} |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
651 |
|
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
652 |
// A single slave responded |
3c9090138140
Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents:
986
diff
changeset
|
653 |
ec_slave_set_state(slave, EC_READ_U8(datagram->data)); |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
654 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
655 |
if (!slave->error_flag) { |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
656 |
// Check, if new slave state has to be acknowledged |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
657 |
if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) { |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
658 |
fsm->idle = 0; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
659 |
fsm->state = ec_fsm_master_state_acknowledge; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
660 |
ec_fsm_change_ack(&fsm->fsm_change, slave); |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
661 |
fsm->state(fsm); // execute immediately |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
662 |
return; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
663 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
664 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
665 |
// No acknowlegde necessary; check for configuration |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
666 |
ec_fsm_master_action_configure(fsm); |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
667 |
return; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
668 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
669 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
670 |
// slave has error flag set; process next one |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
671 |
ec_fsm_master_action_next_slave_state(fsm); |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
672 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
673 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
674 |
/*****************************************************************************/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
675 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
676 |
/** Master state: ACKNOWLEDGE. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
677 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
678 |
void ec_fsm_master_state_acknowledge( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
679 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
680 |
) |
454
25cc4a3b9e0a
State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
448
diff
changeset
|
681 |
{ |
25cc4a3b9e0a
State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
448
diff
changeset
|
682 |
ec_slave_t *slave = fsm->slave; |
25cc4a3b9e0a
State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
448
diff
changeset
|
683 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
684 |
if (ec_fsm_change_exec(&fsm->fsm_change)) |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
685 |
return; |
454
25cc4a3b9e0a
State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
448
diff
changeset
|
686 |
|
25cc4a3b9e0a
State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
448
diff
changeset
|
687 |
if (!ec_fsm_change_success(&fsm->fsm_change)) { |
25cc4a3b9e0a
State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents:
448
diff
changeset
|
688 |
fsm->slave->error_flag = 1; |
1921 | 689 |
EC_SLAVE_ERR(slave, "Failed to acknowledge state change.\n"); |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
690 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
691 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
692 |
ec_fsm_master_action_configure(fsm); |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
693 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
694 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
695 |
/*****************************************************************************/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
696 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
697 |
/** Master state: CLEAR ADDRESSES. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
698 |
*/ |
717
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
699 |
void ec_fsm_master_state_clear_addresses( |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
700 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
717
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
701 |
) |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
702 |
{ |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
703 |
ec_master_t *master = fsm->master; |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
704 |
ec_datagram_t *datagram = fsm->datagram; |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
705 |
|
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
706 |
if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--) |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
707 |
return; |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
708 |
|
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
709 |
if (datagram->state != EC_DATAGRAM_RECEIVED) { |
1921 | 710 |
EC_MASTER_ERR(master, "Failed to receive address" |
711 |
" clearing datagram: "); |
|
712 |
ec_datagram_print_state(datagram); |
|
900
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
713 |
master->scan_busy = 0; |
794
684dea874956
Allow bus configuration when link is down.
Florian Pose <fp@igh-essen.com>
parents:
792
diff
changeset
|
714 |
wake_up_interruptible(&master->scan_queue); |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
715 |
ec_fsm_master_restart(fsm); |
717
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
716 |
return; |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
717 |
} |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
718 |
|
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
719 |
if (datagram->working_counter != master->slave_count) { |
1921 | 720 |
EC_MASTER_WARN(master, "Failed to clear all station addresses:" |
721 |
" Cleared %u of %u", |
|
717
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
722 |
datagram->working_counter, master->slave_count); |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
723 |
} |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
724 |
|
1921 | 725 |
EC_MASTER_DBG(master, 1, "Sending broadcast-write" |
726 |
" to measure transmission delays.\n"); |
|
1420
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
727 |
|
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
728 |
ec_datagram_bwr(datagram, 0x0900, 1); |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
729 |
ec_datagram_zero(datagram); |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
730 |
fsm->retries = EC_FSM_RETRIES; |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
731 |
fsm->state = ec_fsm_master_state_dc_measure_delays; |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
732 |
} |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
733 |
|
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
734 |
/*****************************************************************************/ |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
735 |
|
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
736 |
/** Master state: DC MEASURE DELAYS. |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
737 |
*/ |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
738 |
void ec_fsm_master_state_dc_measure_delays( |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
739 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
740 |
) |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
741 |
{ |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
742 |
ec_master_t *master = fsm->master; |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
743 |
ec_datagram_t *datagram = fsm->datagram; |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
744 |
|
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
745 |
if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--) |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
746 |
return; |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
747 |
|
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
748 |
if (datagram->state != EC_DATAGRAM_RECEIVED) { |
1921 | 749 |
EC_MASTER_ERR(master, "Failed to receive delay measuring datagram: "); |
750 |
ec_datagram_print_state(datagram); |
|
1420
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
751 |
master->scan_busy = 0; |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
752 |
wake_up_interruptible(&master->scan_queue); |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
753 |
ec_fsm_master_restart(fsm); |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
754 |
return; |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
755 |
} |
5eb814732c46
Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents:
1408
diff
changeset
|
756 |
|
1921 | 757 |
EC_MASTER_DBG(master, 1, "%u slaves responded to delay measuring.\n", |
758 |
datagram->working_counter); |
|
759 |
||
760 |
EC_MASTER_INFO(master, "Scanning bus.\n"); |
|
717
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
761 |
|
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
762 |
// begin scanning of slaves |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
763 |
fsm->slave = master->slaves; |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
764 |
fsm->state = ec_fsm_master_state_scan_slave; |
830
d83d92e1a919
Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents:
815
diff
changeset
|
765 |
ec_fsm_slave_scan_start(&fsm->fsm_slave_scan, fsm->slave); |
d83d92e1a919
Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents:
815
diff
changeset
|
766 |
ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan); // execute immediately |
717
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
767 |
} |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
768 |
|
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
769 |
/*****************************************************************************/ |
87abf1166e88
Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents:
716
diff
changeset
|
770 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
771 |
/** Master state: SCAN SLAVE. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
772 |
* |
652 | 773 |
* Executes the sub-statemachine for the scanning of a slave. |
774 |
*/ |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
775 |
void ec_fsm_master_state_scan_slave( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
776 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
652 | 777 |
) |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
778 |
{ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
779 |
ec_master_t *master = fsm->master; |
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
780 |
#ifdef EC_EOE |
637
d5d04c868e0e
Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents:
612
diff
changeset
|
781 |
ec_slave_t *slave = fsm->slave; |
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
782 |
#endif |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
783 |
if (ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan)) |
528
f789bdd78b54
Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents:
523
diff
changeset
|
784 |
return; |
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
312
diff
changeset
|
785 |
|
715
f12ff7c08623
Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents:
713
diff
changeset
|
786 |
#ifdef EC_EOE |
834
0791aac03180
Separated SII data from slave.
Florian Pose <fp@igh-essen.com>
parents:
831
diff
changeset
|
787 |
if (slave->sii.mailbox_protocols & EC_MBOX_EOE) { |
661
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
788 |
// create EoE handler for this slave |
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
789 |
ec_eoe_t *eoe; |
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
790 |
if (!(eoe = kmalloc(sizeof(ec_eoe_t), GFP_KERNEL))) { |
1921 | 791 |
EC_SLAVE_ERR(slave, "Failed to allocate EoE handler memory!\n"); |
900
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
792 |
} else if (ec_eoe_init(eoe, slave)) { |
1921 | 793 |
EC_SLAVE_ERR(slave, "Failed to init EoE handler!\n"); |
661
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
794 |
kfree(eoe); |
900
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
795 |
} else { |
661
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
796 |
list_add_tail(&eoe->list, &master->eoe_handlers); |
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
797 |
} |
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
798 |
} |
715
f12ff7c08623
Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents:
713
diff
changeset
|
799 |
#endif |
661
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
800 |
|
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
312
diff
changeset
|
801 |
// another slave to fetch? |
1000
5746fdd1ca2e
Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents:
998
diff
changeset
|
802 |
fsm->slave++; |
1002
0e1aaeb3540d
Fixed bug in slave scanning, causing a segmentation fault.
Florian Pose <fp@igh-essen.com>
parents:
1000
diff
changeset
|
803 |
if (fsm->slave < master->slaves + master->slave_count) { |
830
d83d92e1a919
Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents:
815
diff
changeset
|
804 |
ec_fsm_slave_scan_start(&fsm->fsm_slave_scan, fsm->slave); |
d83d92e1a919
Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents:
815
diff
changeset
|
805 |
ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan); // execute immediately |
325
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
312
diff
changeset
|
806 |
return; |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
312
diff
changeset
|
807 |
} |
7833cf70c4f2
VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents:
312
diff
changeset
|
808 |
|
1931 | 809 |
EC_MASTER_INFO(master, "Bus scanning completed in %lu ms.\n", |
810 |
(jiffies - fsm->scan_jiffies) * 1000 / HZ); |
|
661
bc1de1362efb
Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents:
656
diff
changeset
|
811 |
|
900
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
812 |
master->scan_busy = 0; |
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
813 |
wake_up_interruptible(&master->scan_queue); |
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
814 |
|
1425
c1322a8793c0
Transition delay calculation. TBC...
Florian Pose <fp@igh-essen.com>
parents:
1421
diff
changeset
|
815 |
ec_master_calc_dc(master); |
1507
68e89abadd19
Removed unwanted tabulators.
Florian Pose <fp@igh-essen.com>
parents:
1444
diff
changeset
|
816 |
|
792
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
758
diff
changeset
|
817 |
// Attach slave configurations |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
758
diff
changeset
|
818 |
ec_master_attach_slave_configs(master); |
3778920f61e4
Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents:
758
diff
changeset
|
819 |
|
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
820 |
if (master->slave_count) { |
2112
70afe990c10e
Bugfix: Reset config_changed flag when aborting state check.
Florian Pose <fp@igh-essen.com>
parents:
2098
diff
changeset
|
821 |
master->config_changed = 0; |
70afe990c10e
Bugfix: Reset config_changed flag when aborting state check.
Florian Pose <fp@igh-essen.com>
parents:
2098
diff
changeset
|
822 |
|
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
823 |
fsm->slave = master->slaves; // begin with first slave |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
824 |
ec_fsm_master_enter_write_system_times(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
825 |
} else { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
826 |
ec_fsm_master_restart(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
827 |
} |
238
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
828 |
} |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
829 |
|
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
830 |
/*****************************************************************************/ |
b4960499098f
Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
831 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
832 |
/** Master state: CONFIGURE SLAVE. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
833 |
* |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
834 |
* Starts configuring a slave. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
835 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
836 |
void ec_fsm_master_state_configure_slave( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
837 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
838 |
) |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
839 |
{ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
840 |
ec_master_t *master = fsm->master; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
841 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
842 |
if (ec_fsm_slave_config_exec(&fsm->fsm_slave_config)) |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
843 |
return; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
844 |
|
1277
1189e040fe12
merge -c1521 branches/stable-1.4: Fixed race concerning ec_slave_config_state->operational.
Florian Pose <fp@igh-essen.com>
parents:
1225
diff
changeset
|
845 |
fsm->slave->force_config = 0; |
1189e040fe12
merge -c1521 branches/stable-1.4: Fixed race concerning ec_slave_config_state->operational.
Florian Pose <fp@igh-essen.com>
parents:
1225
diff
changeset
|
846 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
847 |
// configuration finished |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
848 |
master->config_busy = 0; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
849 |
wake_up_interruptible(&master->config_queue); |
830
d83d92e1a919
Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents:
815
diff
changeset
|
850 |
|
900
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
851 |
if (!ec_fsm_slave_config_success(&fsm->fsm_slave_config)) { |
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
852 |
// TODO: mark slave_config as failed. |
f8b5c6d21705
Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents:
880
diff
changeset
|
853 |
} |
656
370aa8c2d1b1
Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents:
652
diff
changeset
|
854 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
855 |
fsm->idle = 1; |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
856 |
ec_fsm_master_action_next_slave_state(fsm); |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
857 |
} |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
858 |
|
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
859 |
/*****************************************************************************/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
860 |
|
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
861 |
/** Start writing DC system times. |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
862 |
*/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
863 |
void ec_fsm_master_enter_write_system_times( |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
864 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
865 |
) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
866 |
{ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
867 |
ec_master_t *master = fsm->master; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
868 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
869 |
EC_MASTER_DBG(master, 1, "Writing system time offsets...\n"); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
870 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
871 |
if (master->has_app_time) { |
2098
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
872 |
|
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
873 |
while (fsm->slave < master->slaves + master->slave_count) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
874 |
if (!fsm->slave->base_dc_supported |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
875 |
|| !fsm->slave->has_dc_system_time) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
876 |
fsm->slave++; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
877 |
continue; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
878 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
879 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
880 |
// read DC system time (0x0910, 64 bit) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
881 |
// gap (64 bit) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
882 |
// and time offset (0x0920, 64 bit) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
883 |
ec_datagram_fprd(fsm->datagram, fsm->slave->station_address, |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
884 |
0x0910, 24); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
885 |
fsm->retries = EC_FSM_RETRIES; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
886 |
fsm->state = ec_fsm_master_state_dc_read_offset; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
887 |
return; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
888 |
} |
2098
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
889 |
|
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
890 |
} else { |
2098
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
891 |
if (master->active) { |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
892 |
EC_MASTER_ERR(master, "No app_time received up to now," |
2145 | 893 |
" but master already active.\n"); |
2098
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
894 |
} else { |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
895 |
EC_MASTER_DBG(master, 1, "No app_time received up to now.\n"); |
0ce254664c81
Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents:
2094
diff
changeset
|
896 |
} |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
897 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
898 |
|
2117
afb40fd6018e
Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents:
2113
diff
changeset
|
899 |
// scanning and setting system times complete |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
900 |
ec_master_request_op(master); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
901 |
ec_fsm_master_restart(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
902 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
903 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
904 |
/*****************************************************************************/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
905 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
906 |
/** Configure 32 bit time offset. |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
907 |
*/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
908 |
u64 ec_fsm_master_dc_offset32( |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
909 |
ec_fsm_master_t *fsm, /**< Master state machine. */ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
910 |
u64 system_time, /**< System time register. */ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
911 |
u64 old_offset, /**< Time offset register. */ |
1989 | 912 |
u64 correction /**< Correction. */ |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
913 |
) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
914 |
{ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
915 |
ec_slave_t *slave = fsm->slave; |
1989 | 916 |
u32 correction32, system_time32, old_offset32, new_offset; |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
917 |
s32 time_diff; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
918 |
|
1989 | 919 |
system_time32 = (u32) system_time; |
920 |
// correct read system time by elapsed time between read operation |
|
921 |
// and app_time set time |
|
922 |
correction32 = (u32)correction; |
|
923 |
system_time32 -= correction32; |
|
924 |
old_offset32 = (u32) old_offset; |
|
925 |
||
1999
5f1269a71588
use app_start_time for initial DC offset calculation because app_time might be overwritten while calculating the offsets.
Martin Troxler <ch1010277@ch10pc446>
parents:
1998
diff
changeset
|
926 |
time_diff = (u32) slave->master->app_start_time - system_time32; |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
927 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
928 |
EC_SLAVE_DBG(slave, 1, "DC system time offset calculation:" |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
929 |
" system_time=%u (corrected with %u)," |
1999
5f1269a71588
use app_start_time for initial DC offset calculation because app_time might be overwritten while calculating the offsets.
Martin Troxler <ch1010277@ch10pc446>
parents:
1998
diff
changeset
|
930 |
" app_start_time=%llu, diff=%i\n", |
1989 | 931 |
system_time32, correction32, |
1999
5f1269a71588
use app_start_time for initial DC offset calculation because app_time might be overwritten while calculating the offsets.
Martin Troxler <ch1010277@ch10pc446>
parents:
1998
diff
changeset
|
932 |
slave->master->app_start_time, time_diff); |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
933 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
934 |
if (EC_ABS(time_diff) > EC_SYSTEM_TIME_TOLERANCE_NS) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
935 |
new_offset = time_diff + old_offset32; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
936 |
EC_SLAVE_DBG(slave, 1, "Setting time offset to %u (was %u)\n", |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
937 |
new_offset, old_offset32); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
938 |
return (u64) new_offset; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
939 |
} else { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
940 |
EC_SLAVE_DBG(slave, 1, "Not touching time offset.\n"); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
941 |
return old_offset; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
942 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
943 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
944 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
945 |
/*****************************************************************************/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
946 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
947 |
/** Configure 64 bit time offset. |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
948 |
*/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
949 |
u64 ec_fsm_master_dc_offset64( |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
950 |
ec_fsm_master_t *fsm, /**< Master state machine. */ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
951 |
u64 system_time, /**< System time register. */ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
952 |
u64 old_offset, /**< Time offset register. */ |
1989 | 953 |
u64 correction /**< Correction. */ |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
954 |
) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
955 |
{ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
956 |
ec_slave_t *slave = fsm->slave; |
1989 | 957 |
u64 new_offset; |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
958 |
s64 time_diff; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
959 |
|
1989 | 960 |
// correct read system time by elapsed time between read operation |
961 |
// and app_time set time |
|
962 |
system_time -= correction; |
|
1999
5f1269a71588
use app_start_time for initial DC offset calculation because app_time might be overwritten while calculating the offsets.
Martin Troxler <ch1010277@ch10pc446>
parents:
1998
diff
changeset
|
963 |
time_diff = fsm->slave->master->app_start_time - system_time; |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
964 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
965 |
EC_SLAVE_DBG(slave, 1, "DC system time offset calculation:" |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
966 |
" system_time=%llu (corrected with %llu)," |
1999
5f1269a71588
use app_start_time for initial DC offset calculation because app_time might be overwritten while calculating the offsets.
Martin Troxler <ch1010277@ch10pc446>
parents:
1998
diff
changeset
|
967 |
" app_start_time=%llu, diff=%lli\n", |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
968 |
system_time, correction, |
1999
5f1269a71588
use app_start_time for initial DC offset calculation because app_time might be overwritten while calculating the offsets.
Martin Troxler <ch1010277@ch10pc446>
parents:
1998
diff
changeset
|
969 |
slave->master->app_start_time, time_diff); |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
970 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
971 |
if (EC_ABS(time_diff) > EC_SYSTEM_TIME_TOLERANCE_NS) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
972 |
new_offset = time_diff + old_offset; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
973 |
EC_SLAVE_DBG(slave, 1, "Setting time offset to %llu (was %llu)\n", |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
974 |
new_offset, old_offset); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
975 |
} else { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
976 |
new_offset = old_offset; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
977 |
EC_SLAVE_DBG(slave, 1, "Not touching time offset.\n"); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
978 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
979 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
980 |
return new_offset; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
981 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
982 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
983 |
/*****************************************************************************/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
984 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
985 |
/** Master state: DC READ OFFSET. |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
986 |
*/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
987 |
void ec_fsm_master_state_dc_read_offset( |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
988 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
989 |
) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
990 |
{ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
991 |
ec_datagram_t *datagram = fsm->datagram; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
992 |
ec_slave_t *slave = fsm->slave; |
1989 | 993 |
u64 system_time, old_offset, new_offset, correction; |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
994 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
995 |
if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
996 |
return; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
997 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
998 |
if (datagram->state != EC_DATAGRAM_RECEIVED) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
999 |
EC_SLAVE_ERR(slave, "Failed to receive DC times datagram: "); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1000 |
ec_datagram_print_state(datagram); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1001 |
fsm->slave++; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1002 |
ec_fsm_master_enter_write_system_times(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1003 |
return; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1004 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1005 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1006 |
if (datagram->working_counter != 1) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1007 |
EC_SLAVE_WARN(slave, "Failed to get DC times: "); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1008 |
ec_datagram_print_wc_error(datagram); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1009 |
fsm->slave++; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1010 |
ec_fsm_master_enter_write_system_times(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1011 |
return; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1012 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1013 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1014 |
system_time = EC_READ_U64(datagram->data); // 0x0910 |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1015 |
old_offset = EC_READ_U64(datagram->data + 16); // 0x0920 |
1989 | 1016 |
/* correct read system time by elapsed time since read operation |
1017 |
and the app_time set time */ |
|
1018 |
#ifdef EC_HAVE_CYCLES |
|
1019 |
correction = |
|
2001
2e05246f3b00
renamed dc_cycles_app_time -> dc_cycles_app_start_time & dc_jiffies_app_time -> dc_jiffies_app_start_time
Martin Troxler <ch1010277@ch10pc446>
parents:
1999
diff
changeset
|
1020 |
(datagram->cycles_sent - slave->master->dc_cycles_app_start_time) |
1989 | 1021 |
* 1000000LL; |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1022 |
do_div(correction, cpu_khz); |
1989 | 1023 |
#else |
1024 |
correction = |
|
2007
5da31ecf3a87
fixed compiling without EC_HAVE_CYCLES (dc_jiffies_app_start_time)
Martin Troxler <ch1010277@ch10pc446>
parents:
2001
diff
changeset
|
1025 |
(u64) ((datagram->jiffies_sent-slave->master->dc_jiffies_app_start_time) * 1000 / HZ) |
1989 | 1026 |
* 1000000; |
1027 |
#endif |
|
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1028 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1029 |
if (slave->base_dc_range == EC_DC_32) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1030 |
new_offset = ec_fsm_master_dc_offset32(fsm, |
1989 | 1031 |
system_time, old_offset, correction); |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1032 |
} else { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1033 |
new_offset = ec_fsm_master_dc_offset64(fsm, |
1989 | 1034 |
system_time, old_offset, correction); |
1925
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1035 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1036 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1037 |
// set DC system time offset and transmission delay |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1038 |
ec_datagram_fpwr(datagram, slave->station_address, 0x0920, 12); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1039 |
EC_WRITE_U64(datagram->data, new_offset); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1040 |
EC_WRITE_U32(datagram->data + 8, slave->transmission_delay); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1041 |
fsm->retries = EC_FSM_RETRIES; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1042 |
fsm->state = ec_fsm_master_state_dc_write_offset; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1043 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1044 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1045 |
/*****************************************************************************/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1046 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1047 |
/** Master state: DC WRITE OFFSET. |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1048 |
*/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1049 |
void ec_fsm_master_state_dc_write_offset( |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1050 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1051 |
) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1052 |
{ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1053 |
ec_datagram_t *datagram = fsm->datagram; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1054 |
ec_slave_t *slave = fsm->slave; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1055 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1056 |
if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--) |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1057 |
return; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1058 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1059 |
if (datagram->state != EC_DATAGRAM_RECEIVED) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1060 |
EC_SLAVE_ERR(slave, |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1061 |
"Failed to receive DC system time offset datagram: "); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1062 |
ec_datagram_print_state(datagram); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1063 |
fsm->slave++; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1064 |
ec_fsm_master_enter_write_system_times(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1065 |
return; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1066 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1067 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1068 |
if (datagram->working_counter != 1) { |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1069 |
EC_SLAVE_ERR(slave, "Failed to set DC system time offset: "); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1070 |
ec_datagram_print_wc_error(datagram); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1071 |
fsm->slave++; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1072 |
ec_fsm_master_enter_write_system_times(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1073 |
return; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1074 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1075 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1076 |
fsm->slave++; |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1077 |
ec_fsm_master_enter_write_system_times(fsm); |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1078 |
} |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1079 |
|
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1080 |
/*****************************************************************************/ |
29161abef052
Write DC system time offsets right after slave scan / config change. Wait for DC clock discipline.
Florian Pose <fp@igh-essen.com>
parents:
1921
diff
changeset
|
1081 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1082 |
/** Master state: WRITE SII. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1083 |
*/ |
872 | 1084 |
void ec_fsm_master_state_write_sii( |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1085 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1086 |
) |
269 | 1087 |
{ |
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
1088 |
ec_master_t *master = fsm->master; |
872 | 1089 |
ec_sii_write_request_t *request = fsm->sii_request; |
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
1090 |
ec_slave_t *slave = request->slave; |
269 | 1091 |
|
435
779a18d12e6c
Removed state machine running() methods.
Florian Pose <fp@igh-essen.com>
parents:
434
diff
changeset
|
1092 |
if (ec_fsm_sii_exec(&fsm->fsm_sii)) return; |
433
100f51f28cf2
Layed out SII state machine.
Florian Pose <fp@igh-essen.com>
parents:
430
diff
changeset
|
1093 |
|
100f51f28cf2
Layed out SII state machine.
Florian Pose <fp@igh-essen.com>
parents:
430
diff
changeset
|
1094 |
if (!ec_fsm_sii_success(&fsm->fsm_sii)) { |
1921 | 1095 |
EC_SLAVE_ERR(slave, "Failed to write SII data.\n"); |
1209 | 1096 |
request->state = EC_INT_REQUEST_FAILURE; |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1097 |
kref_put(&request->refcount, ec_master_sii_write_request_release); |
872 | 1098 |
wake_up(&master->sii_queue); |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1099 |
ec_fsm_master_restart(fsm); |
872 | 1100 |
return; |
1101 |
} |
|
1102 |
||
1103 |
fsm->sii_index++; |
|
979
405cc2d033e0
Renamed some fields in ec_sii_request_t to word addressing.
Florian Pose <fp@igh-essen.com>
parents:
969
diff
changeset
|
1104 |
if (fsm->sii_index < request->nwords) { |
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
1105 |
ec_fsm_sii_write(&fsm->fsm_sii, slave, |
979
405cc2d033e0
Renamed some fields in ec_sii_request_t to word addressing.
Florian Pose <fp@igh-essen.com>
parents:
969
diff
changeset
|
1106 |
request->offset + fsm->sii_index, |
405cc2d033e0
Renamed some fields in ec_sii_request_t to word addressing.
Florian Pose <fp@igh-essen.com>
parents:
969
diff
changeset
|
1107 |
request->words + fsm->sii_index, |
815
002fe9ec778f
Implemented missing datagram types.
Florian Pose <fp@igh-essen.com>
parents:
814
diff
changeset
|
1108 |
EC_FSM_SII_USE_CONFIGURED_ADDRESS); |
433
100f51f28cf2
Layed out SII state machine.
Florian Pose <fp@igh-essen.com>
parents:
430
diff
changeset
|
1109 |
ec_fsm_sii_exec(&fsm->fsm_sii); // execute immediately |
269 | 1110 |
return; |
1111 |
} |
|
1112 |
||
872 | 1113 |
// finished writing SII |
1921 | 1114 |
EC_SLAVE_DBG(slave, 1, "Finished writing %zu words of SII data.\n", |
1115 |
request->nwords); |
|
1079
ef1266652c4d
Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents:
1064
diff
changeset
|
1116 |
|
ef1266652c4d
Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents:
1064
diff
changeset
|
1117 |
if (request->offset <= 4 && request->offset + request->nwords > 4) { |
ef1266652c4d
Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents:
1064
diff
changeset
|
1118 |
// alias was written |
ef1266652c4d
Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents:
1064
diff
changeset
|
1119 |
slave->sii.alias = EC_READ_U16(request->words + 4); |
1579
326d47aa986c
applied komax patch to version r1822
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1507
diff
changeset
|
1120 |
// TODO: read alias from register 0x0012 |
1909
ea3eb4c74c1b
Introduced effective_alias variable to separate reg12 alias from SII alias.
Florian Pose <fp@igh-essen.com>
parents:
1892
diff
changeset
|
1121 |
slave->effective_alias = slave->sii.alias; |
1079
ef1266652c4d
Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents:
1064
diff
changeset
|
1122 |
} |
ef1266652c4d
Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents:
1064
diff
changeset
|
1123 |
// TODO: Evaluate other SII contents! |
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
1124 |
|
1209 | 1125 |
request->state = EC_INT_REQUEST_SUCCESS; |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1126 |
kref_put(&request->refcount, ec_master_sii_write_request_release); |
872 | 1127 |
wake_up(&master->sii_queue); |
1128 |
||
1129 |
// check for another SII write request |
|
1130 |
if (ec_fsm_master_action_process_sii(fsm)) |
|
601
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
1131 |
return; // processing another request |
d6d951b766e3
Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents:
594
diff
changeset
|
1132 |
|
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1133 |
ec_fsm_master_restart(fsm); |
419
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1134 |
} |
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1135 |
|
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1136 |
/*****************************************************************************/ |
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1137 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1138 |
/** Master state: SDO DICTIONARY. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1139 |
*/ |
905
6d74ebc603ee
Renamed state sdodict to sdo_dictionary.
Florian Pose <fp@igh-essen.com>
parents:
904
diff
changeset
|
1140 |
void ec_fsm_master_state_sdo_dictionary( |
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1141 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
905
6d74ebc603ee
Renamed state sdodict to sdo_dictionary.
Florian Pose <fp@igh-essen.com>
parents:
904
diff
changeset
|
1142 |
) |
419
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1143 |
{ |
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1144 |
ec_slave_t *slave = fsm->slave; |
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1145 |
ec_master_t *master = fsm->master; |
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1146 |
|
436
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
1147 |
if (ec_fsm_coe_exec(&fsm->fsm_coe)) return; |
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
1148 |
|
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
1149 |
if (!ec_fsm_coe_success(&fsm->fsm_coe)) { |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1150 |
ec_fsm_master_restart(fsm); |
419
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1151 |
return; |
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1152 |
} |
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1153 |
|
1327
4d179b06dd3c
merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
1154 |
// SDO dictionary fetching finished |
419
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1155 |
|
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1156 |
if (master->debug_level) { |
423
862ff892cf18
Better debugging output for SDO dictionaries.
Florian Pose <fp@igh-essen.com>
parents:
422
diff
changeset
|
1157 |
unsigned int sdo_count, entry_count; |
862ff892cf18
Better debugging output for SDO dictionaries.
Florian Pose <fp@igh-essen.com>
parents:
422
diff
changeset
|
1158 |
ec_slave_sdo_dict_info(slave, &sdo_count, &entry_count); |
1921 | 1159 |
EC_SLAVE_DBG(slave, 1, "Fetched %u SDOs and %u entries.\n", |
1160 |
sdo_count, entry_count); |
|
419
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1161 |
} |
cf724fc82a00
Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents:
411
diff
changeset
|
1162 |
|
1186
ff481f097c97
Attach Pdo names from dictionary.
Florian Pose <fp@igh-essen.com>
parents:
1177
diff
changeset
|
1163 |
// attach pdo names from dictionary |
ff481f097c97
Attach Pdo names from dictionary.
Florian Pose <fp@igh-essen.com>
parents:
1177
diff
changeset
|
1164 |
ec_slave_attach_pdo_names(slave); |
ff481f097c97
Attach Pdo names from dictionary.
Florian Pose <fp@igh-essen.com>
parents:
1177
diff
changeset
|
1165 |
|
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1166 |
ec_fsm_master_restart(fsm); |
269 | 1167 |
} |
1168 |
||
430
74754f45d5fa
Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents:
429
diff
changeset
|
1169 |
/*****************************************************************************/ |
74754f45d5fa
Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents:
429
diff
changeset
|
1170 |
|
907
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1171 |
/** Master state: SDO REQUEST. |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1172 |
*/ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1173 |
void ec_fsm_master_state_sdo_request( |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1174 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
570ae1c64465
Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents:
906
diff
changeset
|
1175 |
) |
430
74754f45d5fa
Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents:
429
diff
changeset
|
1176 |
{ |
858
69122084d066
Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents:
853
diff
changeset
|
1177 |
ec_sdo_request_t *request = fsm->sdo_request; |
436
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
1178 |
|
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
1179 |
if (ec_fsm_coe_exec(&fsm->fsm_coe)) return; |
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
1180 |
|
63214beb641d
Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents:
435
diff
changeset
|
1181 |
if (!ec_fsm_coe_success(&fsm->fsm_coe)) { |
1921 | 1182 |
EC_SLAVE_DBG(fsm->slave, 1, |
1183 |
"Failed to process internal SDO request.\n"); |
|
1209 | 1184 |
request->state = EC_INT_REQUEST_FAILURE; |
1596
ea8d2b4ee742
Moved sdo request queue to slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1583
diff
changeset
|
1185 |
wake_up(&fsm->slave->sdo_queue); |
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1186 |
ec_fsm_master_restart(fsm); |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
1187 |
return; |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
1188 |
} |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
1189 |
|
1335
09c6fce1ae45
merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents:
1327
diff
changeset
|
1190 |
// SDO request finished |
1209 | 1191 |
request->state = EC_INT_REQUEST_SUCCESS; |
1596
ea8d2b4ee742
Moved sdo request queue to slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1583
diff
changeset
|
1192 |
wake_up(&fsm->slave->sdo_queue); |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
1193 |
|
1921 | 1194 |
EC_SLAVE_DBG(fsm->slave, 1, "Finished internal SDO request.\n"); |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
1195 |
|
1327
4d179b06dd3c
merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents:
1326
diff
changeset
|
1196 |
// check for another SDO request |
646
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
1197 |
if (ec_fsm_master_action_process_sdo(fsm)) |
fbbd4e54e031
Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents:
645
diff
changeset
|
1198 |
return; // processing another request |
430
74754f45d5fa
Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents:
429
diff
changeset
|
1199 |
|
1031
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1200 |
ec_fsm_master_restart(fsm); |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1201 |
} |
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1202 |
|
000593b576dd
Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents:
1029
diff
changeset
|
1203 |
/*****************************************************************************/ |
1200 | 1204 |
|
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1205 |
/** Master state: REG REQUEST. |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1206 |
*/ |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1207 |
void ec_fsm_master_state_reg_request( |
1200 | 1208 |
ec_fsm_master_t *fsm /**< Master state machine. */ |
1209 |
) |
|
1210 |
{ |
|
1211 |
ec_master_t *master = fsm->master; |
|
1212 |
ec_datagram_t *datagram = fsm->datagram; |
|
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1213 |
ec_reg_request_t *request = fsm->reg_request; |
1200 | 1214 |
|
1215 |
if (datagram->state != EC_DATAGRAM_RECEIVED) { |
|
1921 | 1216 |
EC_MASTER_ERR(master, "Failed to receive register" |
1217 |
" request datagram: "); |
|
1218 |
ec_datagram_print_state(datagram); |
|
1209 | 1219 |
request->state = EC_INT_REQUEST_FAILURE; |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1220 |
kref_put(&request->refcount, ec_master_reg_request_release); |
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1221 |
wake_up(&master->reg_queue); |
1200 | 1222 |
ec_fsm_master_restart(fsm); |
1223 |
return; |
|
1224 |
} |
|
1579
326d47aa986c
applied komax patch to version r1822
Martin Troxler <martin.troxler@komaxgroup.com>
parents:
1507
diff
changeset
|
1225 |
|
1385
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1226 |
if (datagram->working_counter == 1) { |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1227 |
if (request->dir == EC_DIR_INPUT) { // read request |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1228 |
if (request->data) |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1229 |
kfree(request->data); |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1230 |
request->data = kmalloc(request->length, GFP_KERNEL); |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1231 |
if (!request->data) { |
1921 | 1232 |
EC_MASTER_ERR(master, "Failed to allocate %zu bytes" |
1233 |
" of memory for register data.\n", request->length); |
|
1385
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1234 |
request->state = EC_INT_REQUEST_FAILURE; |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1235 |
kref_put(&request->refcount, ec_master_reg_request_release); |
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1236 |
wake_up(&master->reg_queue); |
1385
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1237 |
ec_fsm_master_restart(fsm); |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1238 |
return; |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1239 |
} |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1240 |
memcpy(request->data, datagram->data, request->length); |
1200 | 1241 |
} |
1385
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1242 |
|
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1243 |
request->state = EC_INT_REQUEST_SUCCESS; |
1927
365a90e93161
Fixed NULL pointer dereference caused by wrong usage of DBG macro.
Florian Pose <fp@igh-essen.com>
parents:
1925
diff
changeset
|
1244 |
EC_SLAVE_DBG(request->slave, 1, "Register request successful.\n"); |
1385
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1245 |
} else { |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1246 |
request->state = EC_INT_REQUEST_FAILURE; |
1921 | 1247 |
EC_MASTER_ERR(master, "Register request failed.\n"); |
1385
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1248 |
} |
241a7511eee9
Process working counter of phy_* commands.
Florian Pose <fp@igh-essen.com>
parents:
1380
diff
changeset
|
1249 |
|
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1250 |
kref_put(&request->refcount, ec_master_reg_request_release); |
1388
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1251 |
wake_up(&master->reg_queue); |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1252 |
|
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1253 |
// check for another register request |
3c886ec376f5
Renamed phy_ commands to reg_.
Florian Pose <fp@igh-essen.com>
parents:
1386
diff
changeset
|
1254 |
if (ec_fsm_master_action_process_register(fsm)) |
1200 | 1255 |
return; // processing another request |
1256 |
||
1257 |
ec_fsm_master_restart(fsm); |
|
1258 |
} |
|
1259 |
||
1260 |
/*****************************************************************************/ |
|
2027
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1261 |
|
2030
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1262 |
/** called by kref_put if the SII write request's refcount becomes zero. |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1263 |
* |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1264 |
*/ |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1265 |
void ec_master_sii_write_request_release(struct kref *ref) |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1266 |
{ |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1267 |
ec_sii_write_request_t *request = container_of(ref, ec_sii_write_request_t, refcount); |
2034
ca03a6737cb7
releasing of refcounted requests fixed: do not call EC_SLAVE_DBG without valid slave
Martin Troxler <ch1010277@ch10pc446>
parents:
2032
diff
changeset
|
1268 |
if (request->slave) |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1269 |
EC_SLAVE_DBG(request->slave, 1, "Releasing SII write request %p.\n", |
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1270 |
request); |
2030
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1271 |
kfree(request->words); |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1272 |
kfree(request); |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1273 |
} |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1274 |
|
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1275 |
/*****************************************************************************/ |
2bd8ad8bf41f
Sii write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_sii_write_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2029
diff
changeset
|
1276 |
|
2031
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1277 |
/** called by kref_put if the reg request's refcount becomes zero. |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1278 |
* |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1279 |
*/ |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1280 |
void ec_master_reg_request_release(struct kref *ref) |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1281 |
{ |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1282 |
ec_reg_request_t *request = container_of(ref, ec_reg_request_t, refcount); |
2034
ca03a6737cb7
releasing of refcounted requests fixed: do not call EC_SLAVE_DBG without valid slave
Martin Troxler <ch1010277@ch10pc446>
parents:
2032
diff
changeset
|
1283 |
if (request->slave) |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1284 |
EC_SLAVE_DBG(request->slave, 1, "Releasing reg request %p.\n", |
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1285 |
request); |
2031
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1286 |
if (request->data) |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1287 |
kfree(request->data); |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1288 |
kfree(request); |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1289 |
} |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1290 |
|
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1291 |
/*****************************************************************************/ |
7a025a9e192d
Register read/write wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_reg_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2030
diff
changeset
|
1292 |
|
2029
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1293 |
/** called by kref_put if the SDO request's refcount becomes zero. |
2027
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1294 |
* |
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1295 |
*/ |
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1296 |
void ec_master_sdo_request_release(struct kref *ref) |
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1297 |
{ |
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1298 |
ec_master_sdo_request_t *request = container_of(ref, ec_master_sdo_request_t, refcount); |
2034
ca03a6737cb7
releasing of refcounted requests fixed: do not call EC_SLAVE_DBG without valid slave
Martin Troxler <ch1010277@ch10pc446>
parents:
2032
diff
changeset
|
1299 |
if (request->slave) |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1300 |
EC_SLAVE_DBG(request->slave, 1, "Releasing SDO request %p.\n", |
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1301 |
request); |
2027
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1302 |
ec_sdo_request_clear(&request->req); |
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1303 |
kfree(request); |
ac35f4d38a31
SDO wait_event() deadlock fixed: refcount ec_master_sdo_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2020
diff
changeset
|
1304 |
} |
2029
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1305 |
|
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1306 |
/*****************************************************************************/ |
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1307 |
|
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1308 |
/** called by kref_put if the FoE request's refcount becomes zero. |
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1309 |
* |
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1310 |
*/ |
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1311 |
void ec_master_foe_request_release(struct kref *ref) |
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1312 |
{ |
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1313 |
ec_master_foe_request_t *request = container_of(ref, ec_master_foe_request_t, refcount); |
2034
ca03a6737cb7
releasing of refcounted requests fixed: do not call EC_SLAVE_DBG without valid slave
Martin Troxler <ch1010277@ch10pc446>
parents:
2032
diff
changeset
|
1314 |
if (request->slave) |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1315 |
EC_SLAVE_DBG(request->slave, 1, "Releasing FoE request %p.\n", |
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1316 |
request); |
2029
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1317 |
ec_foe_request_clear(&request->req); |
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1318 |
kfree(request); |
5ef6507fc77a
FoE wait_event() deadlock fixed: refcount ec_master_foe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2028
diff
changeset
|
1319 |
} |
2032
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1320 |
|
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1321 |
/*****************************************************************************/ |
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1322 |
|
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1323 |
/** called by kref_put if the SoE request's refcount becomes zero. |
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1324 |
* |
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1325 |
*/ |
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1326 |
void ec_master_soe_request_release(struct kref *ref) |
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1327 |
{ |
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1328 |
ec_master_soe_request_t *request = container_of(ref, ec_master_soe_request_t, refcount); |
2034
ca03a6737cb7
releasing of refcounted requests fixed: do not call EC_SLAVE_DBG without valid slave
Martin Troxler <ch1010277@ch10pc446>
parents:
2032
diff
changeset
|
1329 |
if (request->slave) |
2094
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1330 |
EC_SLAVE_DBG(request->slave, 1, "Releasing SoE request %p.\n", |
83e9160319ec
Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents:
2045
diff
changeset
|
1331 |
request); |
2032
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1332 |
ec_soe_request_clear(&request->req); |
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1333 |
kfree(request); |
57c618557912
SoE request wait_event() deadlock fixed: use wait_event_interruptible and refcount ec_master_soe_request_t objects with kref
Martin Troxler <ch1010277@ch10pc446>
parents:
2031
diff
changeset
|
1334 |
} |