master/fsm_master.c
author Florian Pose <fp@igh-essen.com>
Thu, 19 Feb 2015 15:19:29 +0100
changeset 2598 19ff84bbbcb3
parent 2589 2b9c78543663
child 2600 1a969896d52e
permissions -rw-r--r--
Fixed bug concerning netdev_completed_queue(); thanks to B. Benner.
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
 *
2414
f35c7c8e6591 Replaced all mangled hg keywords.
Florian Pose <fp@igh-essen.com>
parents: 2166
diff changeset
     3
 *  $Id$
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
     4
 *
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
     5
 *  Copyright (C) 2006-2012  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
 */
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
    51
#define EC_SYSTEM_TIME_TOLERANCE_NS 1000000
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
    52
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
    53
/*****************************************************************************/
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
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
    55
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
    56
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
    57
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
    58
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
    59
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
    60
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
    61
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
    62
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
    63
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
    64
void ec_fsm_master_state_dc_write_offset(ec_fsm_master_t *);
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
    65
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
    66
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
    67
void ec_fsm_master_state_sdo_request(ec_fsm_master_t *);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
    68
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
    69
void ec_fsm_master_enter_clear_addresses(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
    70
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
    71
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    72
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    73
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    74
/** Constructor.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    75
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    76
void ec_fsm_master_init(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    77
        ec_fsm_master_t *fsm, /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    78
        ec_master_t *master, /**< EtherCAT master. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    79
        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
    80
        )
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    81
{
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    82
    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
    83
    fsm->datagram = datagram;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
    84
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
    85
    ec_fsm_master_reset(fsm);
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    86
436
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
    87
    // init sub-state-machines
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
    88
    ec_fsm_coe_init(&fsm->fsm_coe);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
    89
    ec_fsm_soe_init(&fsm->fsm_soe);
1174
235f34ca50e2 Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents: 1079
diff changeset
    90
    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
    91
    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
    92
    ec_fsm_slave_config_init(&fsm->fsm_slave_config, fsm->datagram,
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
    93
            &fsm->fsm_change, &fsm->fsm_coe, &fsm->fsm_soe, &fsm->fsm_pdo);
831
ded9519c8d6e Reading of Pdo mapping via CoE during scan.
Florian Pose <fp@igh-essen.com>
parents: 830
diff changeset
    94
    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
    95
            &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
    96
    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
    97
}
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    98
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    99
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   100
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   101
/** Destructor.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   102
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   103
void ec_fsm_master_clear(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   104
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   105
        )
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   106
{
436
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   107
    // 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
   108
    ec_fsm_coe_clear(&fsm->fsm_coe);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   109
    ec_fsm_soe_clear(&fsm->fsm_soe);
1174
235f34ca50e2 Major Pdo configuration change: Read mapping of unknown Pdos during
Florian Pose <fp@igh-essen.com>
parents: 1079
diff changeset
   110
    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
   111
    ec_fsm_change_clear(&fsm->fsm_change);
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   112
    ec_fsm_slave_config_clear(&fsm->fsm_slave_config);
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   113
    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
   114
    ec_fsm_sii_clear(&fsm->fsm_sii);
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   115
}
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   116
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   117
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   118
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   119
/** Reset state machine.
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   120
 */
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   121
void ec_fsm_master_reset(
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   122
        ec_fsm_master_t *fsm /**< Master state machine. */
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   123
        )
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   124
{
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   125
    ec_device_index_t dev_idx;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   126
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   127
    fsm->state = ec_fsm_master_state_start;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   128
    fsm->idle = 0;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   129
    fsm->dev_idx = EC_DEVICE_MAIN;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   130
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   131
    for (dev_idx = EC_DEVICE_MAIN;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   132
            dev_idx < ec_master_num_devices(fsm->master); dev_idx++) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   133
        fsm->link_state[dev_idx] = 0;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   134
        fsm->slaves_responding[dev_idx] = 0;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   135
        fsm->slave_states[dev_idx] = EC_SLAVE_STATE_UNKNOWN;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   136
    }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   137
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   138
    fsm->rescan_required = 0;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   139
}
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   140
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   141
/*****************************************************************************/
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   142
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   143
/** Executes the current state of the state machine.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   144
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   145
 * 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
   146
 * 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
   147
 *
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
   148
 * \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
   149
 */
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
   150
int ec_fsm_master_exec(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   151
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   152
        )
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
   153
{
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   154
    if (fsm->datagram->state == EC_DATAGRAM_SENT
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   155
        || fsm->datagram->state == EC_DATAGRAM_QUEUED) {
505
bc443ca0077f State machines re-send datagrams on timeout.
Florian Pose <fp@igh-essen.com>
parents: 484
diff changeset
   156
        // 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
   157
        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
   158
    }
2094
83e9160319ec Minor: Fixed line wraps and spacing.
Florian Pose <fp@igh-essen.com>
parents: 2045
diff changeset
   159
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
   160
    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
   161
    return 1;
446
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   162
}
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   163
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   164
/*****************************************************************************/
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   165
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   166
/**
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   167
 * \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
   168
 */
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   169
int ec_fsm_master_idle(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   170
        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
   171
        )
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   172
{
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   173
    return fsm->idle;
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   174
}
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   175
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   176
/*****************************************************************************/
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   177
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   178
/** 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
   179
 */
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   180
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
   181
        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
   182
        )
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   183
{
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   184
    fsm->dev_idx = EC_DEVICE_MAIN;
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   185
    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
   186
    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
   187
}
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   188
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   189
/******************************************************************************
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   190
 * Master state machine
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   191
 *****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   192
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   193
/** Master state: START.
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
 * Starts with getting slave count and slave states.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   196
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   197
void ec_fsm_master_state_start(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   198
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   199
        )
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
   200
{
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   201
    ec_master_t *master = fsm->master;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   202
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   203
    fsm->idle = 1;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   204
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   205
    // check for emergency requests
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   206
    if (!list_empty(&master->emerg_reg_requests)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   207
        ec_reg_request_t *request;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   208
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   209
        // get first request
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   210
        request = list_entry(master->emerg_reg_requests.next,
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   211
                ec_reg_request_t, list);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   212
        list_del_init(&request->list); // dequeue
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   213
        request->state = EC_INT_REQUEST_BUSY;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   214
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   215
        if (request->transfer_size > fsm->datagram->mem_size) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   216
            EC_MASTER_ERR(master, "Emergency request data too large!\n");
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   217
            request->state = EC_INT_REQUEST_FAILURE;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   218
            wake_up_all(&master->request_queue);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   219
            fsm->state(fsm); // continue
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   220
            return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   221
        }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   222
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   223
        if (request->dir != EC_DIR_OUTPUT) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   224
            EC_MASTER_ERR(master, "Emergency requests must be"
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   225
                    " write requests!\n");
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   226
            request->state = EC_INT_REQUEST_FAILURE;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   227
            wake_up_all(&master->request_queue);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   228
            fsm->state(fsm); // continue
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   229
            return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   230
        }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   231
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   232
        EC_MASTER_DBG(master, 1, "Writing emergency register request...\n");
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   233
        ec_datagram_apwr(fsm->datagram, request->ring_position,
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   234
                request->address, request->transfer_size);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   235
        memcpy(fsm->datagram->data, request->data, request->transfer_size);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   236
        fsm->datagram->device_index = EC_DEVICE_MAIN;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   237
        request->state = EC_INT_REQUEST_SUCCESS;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   238
        wake_up_all(&master->request_queue);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   239
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   240
    }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   241
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
   242
    ec_datagram_brd(fsm->datagram, 0x0130, 2);
1225
4d5b739edcb5 Introduced ec_datagram_zero().
Florian Pose <fp@igh-essen.com>
parents: 1219
diff changeset
   243
    ec_datagram_zero(fsm->datagram);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   244
    fsm->datagram->device_index = fsm->dev_idx;
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
   245
    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
   246
}
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   247
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   248
/*****************************************************************************/
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   249
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   250
/** Master state: BROADCAST.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   251
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   252
 * Processes the broadcast read slave count and slaves states.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   253
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   254
void ec_fsm_master_state_broadcast(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   255
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   256
        )
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
   257
{
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
   258
    ec_datagram_t *datagram = fsm->datagram;
1005
5af7ab9a98b1 Minor change.
Florian Pose <fp@igh-essen.com>
parents: 1003
diff changeset
   259
    unsigned int i, size;
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   260
    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
   261
    ec_master_t *master = fsm->master;
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   262
553
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   263
    // bus topology change?
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   264
    if (datagram->working_counter != fsm->slaves_responding[fsm->dev_idx]) {
1961
48f536aefc18 Rescan command.
Florian Pose <fp@igh-essen.com>
parents: 1931
diff changeset
   265
        fsm->rescan_required = 1;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   266
        fsm->slaves_responding[fsm->dev_idx] = datagram->working_counter;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   267
        EC_MASTER_INFO(master, "%u slave(s) responding on %s device.\n",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   268
                fsm->slaves_responding[fsm->dev_idx],
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   269
                ec_device_names[fsm->dev_idx != 0]);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   270
    }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   271
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   272
    if (fsm->link_state[fsm->dev_idx] &&
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   273
            !master->devices[fsm->dev_idx].link_state) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   274
        ec_device_index_t dev_idx;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   275
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   276
        EC_MASTER_DBG(master, 1, "Master state machine detected "
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   277
                "link down on %s device. Clearing slave list.\n",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   278
                ec_device_names[fsm->dev_idx != 0]);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   279
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   280
#ifdef EC_EOE
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   281
        ec_master_eoe_stop(master);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   282
        ec_master_clear_eoe_handlers(master);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   283
#endif
1400
3c4923051e43 Clear slave list on link down.
Florian Pose <fp@igh-essen.com>
parents: 1388
diff changeset
   284
        ec_master_clear_slaves(master);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   285
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   286
        for (dev_idx = EC_DEVICE_MAIN;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   287
                dev_idx < ec_master_num_devices(master); dev_idx++) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   288
            fsm->slave_states[dev_idx] = 0x00;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   289
            fsm->slaves_responding[dev_idx] = 0; /* Reset to trigger rescan on
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   290
                                                    next link up. */
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   291
        }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   292
    }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   293
    fsm->link_state[fsm->dev_idx] = master->devices[fsm->dev_idx].link_state;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   294
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   295
    if (datagram->state == EC_DATAGRAM_RECEIVED &&
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   296
            fsm->slaves_responding[fsm->dev_idx]) {
1021
fa5cf205f4f0 Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents: 1005
diff changeset
   297
        uint8_t states = EC_READ_U8(datagram->data);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   298
        if (states != fsm->slave_states[fsm->dev_idx]) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   299
            // slave states changed
1021
fa5cf205f4f0 Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents: 1005
diff changeset
   300
            char state_str[EC_STATE_STRING_SIZE];
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   301
            fsm->slave_states[fsm->dev_idx] = states;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   302
            ec_state_string(states, state_str, 1);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   303
            EC_MASTER_INFO(master, "Slave states on %s device: %s.\n",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   304
                    ec_device_names[fsm->dev_idx != 0], state_str);
1021
fa5cf205f4f0 Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents: 1005
diff changeset
   305
        }
fa5cf205f4f0 Set slave_states to 0x00 when no slaves are present.
Florian Pose <fp@igh-essen.com>
parents: 1005
diff changeset
   306
    } else {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   307
        fsm->slave_states[fsm->dev_idx] = 0x00;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   308
    }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   309
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   310
    fsm->dev_idx++;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   311
    if (fsm->dev_idx < ec_master_num_devices(master)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   312
        // check number of responding slaves on next device
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   313
        fsm->state = ec_fsm_master_state_start;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   314
        fsm->state(fsm); // execute immediately
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   315
        return;
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   316
    }
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   317
1961
48f536aefc18 Rescan command.
Florian Pose <fp@igh-essen.com>
parents: 1931
diff changeset
   318
    if (fsm->rescan_required) {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   319
        down(&master->scan_sem);
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   320
        if (!master->allow_scan) {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   321
            up(&master->scan_sem);
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   322
        } else {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   323
            unsigned int count = 0, next_dev_slave, ring_position;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   324
            ec_device_index_t dev_idx;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   325
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   326
            master->scan_busy = 1;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   327
            up(&master->scan_sem);
1335
09c6fce1ae45 merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents: 1327
diff changeset
   328
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   329
            // clear all slaves and scan the bus
1961
48f536aefc18 Rescan command.
Florian Pose <fp@igh-essen.com>
parents: 1931
diff changeset
   330
            fsm->rescan_required = 0;
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   331
            fsm->idle = 0;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   332
            fsm->scan_jiffies = jiffies;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   333
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   334
#ifdef EC_EOE
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   335
            ec_master_eoe_stop(master);
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   336
            ec_master_clear_eoe_handlers(master);
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   337
#endif
992
50a44cbd30af Removed kobjects from sdo and slave.
Florian Pose <fp@igh-essen.com>
parents: 987
diff changeset
   338
            ec_master_clear_slaves(master);
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   339
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   340
            for (dev_idx = EC_DEVICE_MAIN;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   341
                    dev_idx < ec_master_num_devices(master); dev_idx++) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   342
                count += fsm->slaves_responding[dev_idx];
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   343
            }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   344
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   345
            if (!count) {
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   346
                // 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
   347
                master->scan_busy = 0;
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   348
                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
   349
                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
   350
                return;
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   351
            }
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   352
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   353
            size = sizeof(ec_slave_t) * count;
2146
05c6ddef33ab Fixed missing return causing slaves not going to OP.
Florian Pose <fp@igh-essen.com>
parents: 2145
diff changeset
   354
            if (!(master->slaves =
05c6ddef33ab Fixed missing return causing slaves not going to OP.
Florian Pose <fp@igh-essen.com>
parents: 2145
diff changeset
   355
                        (ec_slave_t *) kmalloc(size, GFP_KERNEL))) {
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   356
                EC_MASTER_ERR(master, "Failed to allocate %u bytes"
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   357
                        " of slave memory!\n", size);
1000
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   358
                master->scan_busy = 0;
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   359
                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
   360
                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
   361
                return;
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   362
            }
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   363
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   364
            // init slaves
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   365
            dev_idx = EC_DEVICE_MAIN;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   366
            next_dev_slave = fsm->slaves_responding[dev_idx];
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   367
            ring_position = 0;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   368
            for (i = 0; i < count; i++, ring_position++) {
1000
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   369
                slave = master->slaves + i;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   370
                while (i >= next_dev_slave) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   371
                    dev_idx++;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   372
                    next_dev_slave += fsm->slaves_responding[dev_idx];
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   373
                    ring_position = 0;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   374
                }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   375
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   376
                ec_slave_init(slave, master, dev_idx, ring_position, i + 1);
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   377
1029
61ffe5f22306 Renamed master 'mode' to 'phase'.
Florian Pose <fp@igh-essen.com>
parents: 1028
diff changeset
   378
                // 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
   379
                // unnecesssary process data interruptions
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   380
                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
   381
                    slave->force_config = 1;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   382
                }
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   383
            }
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   384
            master->slave_count = count;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   385
            master->fsm_slave = master->slaves;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   386
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   387
            /* start with first device with slaves responding; at least one
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   388
             * has responding slaves, otherwise count would be zero. */
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   389
            fsm->dev_idx = EC_DEVICE_MAIN;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   390
            while (!fsm->slaves_responding[fsm->dev_idx]) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   391
                fsm->dev_idx++;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   392
            }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   393
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   394
            ec_fsm_master_enter_clear_addresses(fsm);
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   395
            return;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   396
        }
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   397
    }
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   398
1000
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   399
    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
   400
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
   401
        // 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
   402
        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
   403
            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
   404
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
   405
            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
   406
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
   407
            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
   408
            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
   409
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
   410
        } 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
   411
            // 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
   412
            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
   413
            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
   414
                    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
   415
            ec_datagram_zero(datagram);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   416
            fsm->datagram->device_index = fsm->slave->device_index;
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
   417
            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
   418
            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
   419
        }
1000
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   420
    } else {
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   421
        ec_fsm_master_restart(fsm);
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   422
    }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   423
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   424
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   425
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   426
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   427
/** 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
   428
 *
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   429
 * \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
   430
 */
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   431
int ec_fsm_master_action_process_sii(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   432
        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
   433
        )
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   434
{
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   435
    ec_master_t *master = fsm->master;
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   436
    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
   437
604
74ceacf42710 Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents: 603
diff changeset
   438
    // 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
   439
    while (1) {
1079
ef1266652c4d Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents: 1064
diff changeset
   440
        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
   441
            break;
1079
ef1266652c4d Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents: 1064
diff changeset
   442
604
74ceacf42710 Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents: 603
diff changeset
   443
        // get first request
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   444
        request = list_entry(master->sii_requests.next,
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   445
                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
   446
        list_del_init(&request->list); // dequeue
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
   447
        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
   448
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   449
        // found pending SII write operation. execute it!
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   450
        EC_SLAVE_DBG(request->slave, 1, "Writing SII data...\n");
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   451
        fsm->sii_request = request;
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   452
        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
   453
        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
   454
                request->words, EC_FSM_SII_USE_CONFIGURED_ADDRESS);
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   455
        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
   456
        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
   457
        return 1;
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   458
    }
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   459
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   460
    return 0;
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   461
}
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   462
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   463
/*****************************************************************************/
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   464
1327
4d179b06dd3c merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents: 1326
diff changeset
   465
/** 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
   466
 *
1327
4d179b06dd3c merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents: 1326
diff changeset
   467
 * \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
   468
 */
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   469
int ec_fsm_master_action_process_sdo(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   470
        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
   471
        )
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
    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
   474
    ec_slave_t *slave;
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   475
    ec_sdo_request_t *req;
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   476
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   477
    // 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
   478
    for (slave = master->slaves;
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   479
            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
   480
            slave++) {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   481
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   482
        if (!slave->config) {
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   483
            continue;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   484
        }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   485
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   486
        list_for_each_entry(req, &slave->config->sdo_requests, list) {
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
   487
            if (req->state == EC_INT_REQUEST_QUEUED) {
880
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   488
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   489
                if (ec_sdo_request_timed_out(req)) {
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
   490
                    req->state = EC_INT_REQUEST_FAILURE;
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   491
                    EC_SLAVE_DBG(slave, 1, "Internal SDO request"
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   492
                            " timed out.\n");
880
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   493
                    continue;
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   494
                }
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   495
987
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   496
                if (slave->current_state == EC_SLAVE_STATE_INIT) {
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
   497
                    req->state = EC_INT_REQUEST_FAILURE;
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   498
                    continue;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   499
                }
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   500
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
   501
                req->state = EC_INT_REQUEST_BUSY;
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   502
                EC_SLAVE_DBG(slave, 1, "Processing internal"
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   503
                        " SDO request...\n");
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   504
                fsm->idle = 0;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   505
                fsm->sdo_request = req;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   506
                fsm->slave = slave;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   507
                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
   508
                ec_fsm_coe_transfer(&fsm->fsm_coe, slave, req);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   509
                ec_fsm_coe_exec(&fsm->fsm_coe, fsm->datagram);
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   510
                return 1;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   511
            }
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   512
        }
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   513
    }
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   514
    return 0;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   515
}
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   516
1597
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   517
/*****************************************************************************/
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   518
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   519
/** Master action: IDLE.
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   520
 *
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   521
 * Does secondary work.
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   522
 */
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   523
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
   524
        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
   525
        )
09c6fce1ae45 merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents: 1327
diff changeset
   526
{
09c6fce1ae45 merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents: 1327
diff changeset
   527
    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
   528
    ec_slave_t *slave;
1597
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   529
491dea6f4fd7 Moved FOE request queue and fsm into slaves
Martin Troxler <martin.troxler@komaxgroup.com>
parents: 1596
diff changeset
   530
    // Check for pending internal SDO requests
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   531
    if (ec_fsm_master_action_process_sdo(fsm)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   532
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   533
    }
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   534
1831
1875b9fea0ba Implemented reading Sercos-over-EtherCAT services. To be continued...
Florian Pose <fp@igh-essen.com>
parents: 1830
diff changeset
   535
    // enable processing of requests
1804
742607c464c4 Removed tabulators.
Florian Pose <fp@igh-essen.com>
parents: 1606
diff changeset
   536
    for (slave = master->slaves;
742607c464c4 Removed tabulators.
Florian Pose <fp@igh-essen.com>
parents: 1606
diff changeset
   537
            slave < master->slaves + master->slave_count;
742607c464c4 Removed tabulators.
Florian Pose <fp@igh-essen.com>
parents: 1606
diff changeset
   538
            slave++) {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   539
        ec_fsm_slave_set_ready(&slave->fsm);
1804
742607c464c4 Removed tabulators.
Florian Pose <fp@igh-essen.com>
parents: 1606
diff changeset
   540
    }
742607c464c4 Removed tabulators.
Florian Pose <fp@igh-essen.com>
parents: 1606
diff changeset
   541
742607c464c4 Removed tabulators.
Florian Pose <fp@igh-essen.com>
parents: 1606
diff changeset
   542
    // 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
   543
    for (slave = master->slaves;
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   544
            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
   545
            slave++) {
910
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   546
        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
   547
                || (slave->sii.has_general
aa030fb1e980 Only query Sdo information service, if slave supports it.
Florian Pose <fp@igh-essen.com>
parents: 1209
diff changeset
   548
                    && !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
   549
                || 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
   550
                || 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
   551
                || 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
   552
                || 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
   553
                ) 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
   554
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   555
        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
   556
910
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   557
        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
   558
1327
4d179b06dd3c merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents: 1326
diff changeset
   559
        // 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
   560
        fsm->idle = 0;
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   561
        fsm->slave = slave;
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   562
        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
   563
        ec_fsm_coe_dictionary(&fsm->fsm_coe, slave);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   564
        ec_fsm_coe_exec(&fsm->fsm_coe, fsm->datagram); // execute immediately
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   565
        fsm->datagram->device_index = fsm->slave->device_index;
910
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   566
        return;
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   567
    }
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   568
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   569
    // check for pending SII write operations.
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   570
    if (ec_fsm_master_action_process_sii(fsm)) {
910
9fd31755f576 Fetch Sdo dictionaries and process SII requests in operation mode.
Florian Pose <fp@igh-essen.com>
parents: 908
diff changeset
   571
        return; // SII write request found
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   572
	}
1200
ce1a65f06efc Added phy commands.
Florian Pose <fp@igh-essen.com>
parents: 1186
diff changeset
   573
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
   574
    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
   575
}
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   576
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   577
/*****************************************************************************/
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   578
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   579
/** Master action: Get state of next slave.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   580
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   581
void ec_fsm_master_action_next_slave_state(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   582
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   583
        )
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   584
{
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   585
    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
   586
304
558a6669da90 Better master state machines.
Florian Pose <fp@igh-essen.com>
parents: 301
diff changeset
   587
    // 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
   588
    fsm->slave++;
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   589
    if (fsm->slave < master->slaves + master->slave_count) {
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   590
        // fetch state from next slave
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   591
        fsm->idle = 1;
1000
5746fdd1ca2e Store slaves in an array instead of a list.
Florian Pose <fp@igh-essen.com>
parents: 998
diff changeset
   592
        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
   593
                fsm->slave->station_address, 0x0130, 2);
1225
4d5b739edcb5 Introduced ec_datagram_zero().
Florian Pose <fp@igh-essen.com>
parents: 1219
diff changeset
   594
        ec_datagram_zero(fsm->datagram);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   595
        fsm->datagram->device_index = fsm->slave->device_index;
505
bc443ca0077f State machines re-send datagrams on timeout.
Florian Pose <fp@igh-essen.com>
parents: 484
diff changeset
   596
        fsm->retries = EC_FSM_RETRIES;
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   597
        fsm->state = ec_fsm_master_state_read_state;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   598
        return;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   599
    }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   600
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   601
    // all slaves processed
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   602
    ec_fsm_master_action_idle(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   603
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   604
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   605
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   606
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   607
/** Master action: Configure.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   608
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   609
void ec_fsm_master_action_configure(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   610
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   611
        )
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
    ec_master_t *master = fsm->master;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   614
    ec_slave_t *slave = fsm->slave;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   615
2098
0ce254664c81 Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents: 2094
diff changeset
   616
    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
   617
        master->config_changed = 0;
70afe990c10e Bugfix: Reset config_changed flag when aborting state check.
Florian Pose <fp@igh-essen.com>
parents: 2098
diff changeset
   618
2098
0ce254664c81 Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents: 2094
diff changeset
   619
        // 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
   620
        // 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
   621
        // 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
   622
        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
   623
                " (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
   624
0ce254664c81 Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents: 2094
diff changeset
   625
        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
   626
        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
   627
        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
   628
    }
0ce254664c81 Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents: 2094
diff changeset
   629
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   630
    // 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
   631
    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
   632
                || slave->force_config) && !slave->error_flag) {
1177
03d9640c9ce4 Minor change.
Florian Pose <fp@igh-essen.com>
parents: 1174
diff changeset
   633
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   634
        // Start slave configuration
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   635
        down(&master->config_sem);
2117
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   636
        master->config_busy = 1;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   637
        up(&master->config_sem);
2117
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   638
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   639
        if (master->debug_level) {
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   640
            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
   641
                 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
   642
            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
   643
            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
   644
            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
   645
                    old_state, new_state,
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   646
                    slave->force_config ? " (forced)" : "");
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   647
        }
2117
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   648
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   649
        fsm->idle = 0;
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   650
        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
   651
        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
   652
        fsm->state(fsm); // execute immediately
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   653
        fsm->datagram->device_index = fsm->slave->device_index;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   654
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   655
    }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   656
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   657
    // process next slave
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   658
    ec_fsm_master_action_next_slave_state(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   659
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   660
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   661
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   662
987
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   663
/** 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
   664
 *
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   665
 * 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
   666
 */
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   667
void ec_fsm_master_state_read_state(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   668
        ec_fsm_master_t *fsm /**< Master state machine. */
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
{
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   671
    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
   672
    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
   673
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   674
    if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   675
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   676
    }
987
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   677
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   678
    if (datagram->state != EC_DATAGRAM_RECEIVED) {
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   679
        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
   680
        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
   681
        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
   682
        return;
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   683
    }
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   684
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   685
    // 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
   686
    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
   687
        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
   688
            slave->error_flag = 1;
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   689
            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
   690
        }
1961
48f536aefc18 Rescan command.
Florian Pose <fp@igh-essen.com>
parents: 1931
diff changeset
   691
        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
   692
        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
   693
        return;
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   694
    }
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   695
3c9090138140 Display error flag in 'ethercat ls'; cleaned up usage of error flag;
Florian Pose <fp@igh-essen.com>
parents: 986
diff changeset
   696
    // 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
   697
    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
   698
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   699
    if (!slave->error_flag) {
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   700
        // Check, if new slave state has to be acknowledged
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   701
        if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) {
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   702
            fsm->idle = 0;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   703
            fsm->state = ec_fsm_master_state_acknowledge;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   704
            ec_fsm_change_ack(&fsm->fsm_change, slave);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   705
            fsm->state(fsm); // execute immediately
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   706
            return;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   707
        }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   708
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   709
        // No acknowlegde necessary; check for configuration
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   710
        ec_fsm_master_action_configure(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   711
        return;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   712
    }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   713
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   714
    // slave has error flag set; process next one
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   715
    ec_fsm_master_action_next_slave_state(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   716
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   717
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   718
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   719
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   720
/** Master state: ACKNOWLEDGE.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   721
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   722
void ec_fsm_master_state_acknowledge(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   723
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   724
        )
454
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   725
{
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   726
    ec_slave_t *slave = fsm->slave;
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   727
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   728
    if (ec_fsm_change_exec(&fsm->fsm_change)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   729
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   730
    }
454
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   731
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   732
    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
   733
        fsm->slave->error_flag = 1;
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   734
        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
   735
    }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   736
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   737
    ec_fsm_master_action_configure(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   738
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   739
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   740
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   741
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   742
/** Start clearing slave addresses.
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   743
 */
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   744
void ec_fsm_master_enter_clear_addresses(
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   745
        ec_fsm_master_t *fsm /**< Master state machine. */
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   746
        )
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   747
{
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   748
    // broadcast clear all station addresses
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   749
    ec_datagram_bwr(fsm->datagram, 0x0010, 2);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   750
    EC_WRITE_U16(fsm->datagram->data, 0x0000);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   751
    fsm->datagram->device_index = fsm->dev_idx;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   752
    fsm->retries = EC_FSM_RETRIES;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   753
    fsm->state = ec_fsm_master_state_clear_addresses;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   754
}
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   755
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   756
/*****************************************************************************/
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   757
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   758
/** Master state: CLEAR ADDRESSES.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   759
 */
717
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   760
void ec_fsm_master_state_clear_addresses(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   761
        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
   762
        )
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   763
{
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   764
    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
   765
    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
   766
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   767
    if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   768
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   769
    }
717
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   770
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   771
    if (datagram->state != EC_DATAGRAM_RECEIVED) {
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   772
        EC_MASTER_ERR(master, "Failed to receive address"
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   773
                " clearing datagram on %s link: ",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   774
                ec_device_names[fsm->dev_idx != 0]);
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   775
        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
   776
        master->scan_busy = 0;
794
684dea874956 Allow bus configuration when link is down.
Florian Pose <fp@igh-essen.com>
parents: 792
diff changeset
   777
        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
   778
        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
   779
        return;
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   780
    }
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   781
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   782
    if (datagram->working_counter != fsm->slaves_responding[fsm->dev_idx]) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   783
        EC_MASTER_WARN(master, "Failed to clear station addresses on %s link:"
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   784
                " Cleared %u of %u",
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   785
                ec_device_names[fsm->dev_idx != 0], datagram->working_counter,
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   786
                fsm->slaves_responding[fsm->dev_idx]);
717
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   787
    }
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   788
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   789
    EC_MASTER_DBG(master, 1, "Sending broadcast-write"
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   790
            " to measure transmission delays on %s link.\n",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   791
            ec_device_names[fsm->dev_idx != 0]);
1420
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   792
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   793
    ec_datagram_bwr(datagram, 0x0900, 1);
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   794
    ec_datagram_zero(datagram);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   795
    fsm->datagram->device_index = fsm->dev_idx;
1420
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   796
    fsm->retries = EC_FSM_RETRIES;
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   797
    fsm->state = ec_fsm_master_state_dc_measure_delays;
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   798
}
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   799
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   800
/*****************************************************************************/
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   801
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   802
/** Master state: DC MEASURE DELAYS.
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   803
 */
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   804
void ec_fsm_master_state_dc_measure_delays(
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   805
        ec_fsm_master_t *fsm /**< Master state machine. */
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   806
        )
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   807
{
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   808
    ec_master_t *master = fsm->master;
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   809
    ec_datagram_t *datagram = fsm->datagram;
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   810
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   811
    if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   812
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   813
    }
1420
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   814
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   815
    if (datagram->state != EC_DATAGRAM_RECEIVED) {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   816
        EC_MASTER_ERR(master, "Failed to receive delay measuring datagram"
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   817
                " on %s link: ", ec_device_names[fsm->dev_idx != 0]);
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   818
        ec_datagram_print_state(datagram);
1420
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   819
        master->scan_busy = 0;
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   820
        wake_up_interruptible(&master->scan_queue);
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   821
        ec_fsm_master_restart(fsm);
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   822
        return;
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   823
    }
5eb814732c46 Measure port receive times.
Florian Pose <fp@igh-essen.com>
parents: 1408
diff changeset
   824
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   825
    EC_MASTER_DBG(master, 1, "%u slaves responded to delay measuring"
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   826
            " on %s link.\n",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   827
            datagram->working_counter, ec_device_names[fsm->dev_idx != 0]);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   828
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   829
    do {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   830
        fsm->dev_idx++;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   831
    } while (fsm->dev_idx < ec_master_num_devices(master) &&
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   832
            !fsm->slaves_responding[fsm->dev_idx]);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   833
    if (fsm->dev_idx < ec_master_num_devices(master)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   834
        ec_fsm_master_enter_clear_addresses(fsm);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   835
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   836
    }
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   837
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   838
    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
   839
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   840
    // 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
   841
    fsm->slave = master->slaves;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   842
    EC_MASTER_DBG(master, 1, "Scanning slave %u on %s link.\n",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   843
            fsm->slave->ring_position,
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   844
            ec_device_names[fsm->slave->device_index != 0]);
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   845
    fsm->state = ec_fsm_master_state_scan_slave;
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   846
    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
   847
    ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan); // execute immediately
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   848
    fsm->datagram->device_index = fsm->slave->device_index;
717
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   849
}
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   850
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   851
/*****************************************************************************/
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   852
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   853
/** Master state: SCAN SLAVE.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   854
 *
652
15cff76b66c7 Added scan time output.
Florian Pose <fp@igh-essen.com>
parents: 650
diff changeset
   855
 * Executes the sub-statemachine for the scanning of a slave.
15cff76b66c7 Added scan time output.
Florian Pose <fp@igh-essen.com>
parents: 650
diff changeset
   856
 */
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   857
void ec_fsm_master_state_scan_slave(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   858
        ec_fsm_master_t *fsm /**< Master state machine. */
652
15cff76b66c7 Added scan time output.
Florian Pose <fp@igh-essen.com>
parents: 650
diff changeset
   859
        )
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   860
{
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   861
    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
   862
#ifdef EC_EOE
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   863
    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
   864
#endif
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   865
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   866
    if (ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   867
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   868
    }
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   869
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   870
#ifdef EC_EOE
834
0791aac03180 Separated SII data from slave.
Florian Pose <fp@igh-essen.com>
parents: 831
diff changeset
   871
    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
   872
        // create EoE handler for this slave
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   873
        ec_eoe_t *eoe;
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   874
        if (!(eoe = kmalloc(sizeof(ec_eoe_t), GFP_KERNEL))) {
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   875
            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
   876
        } else if (ec_eoe_init(eoe, slave)) {
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
   877
            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
   878
            kfree(eoe);
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   879
        } else {
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   880
            list_add_tail(&eoe->list, &master->eoe_handlers);
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   881
        }
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   882
    }
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   883
#endif
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   884
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   885
    // 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
   886
    fsm->slave++;
1002
0e1aaeb3540d Fixed bug in slave scanning, causing a segmentation fault.
Florian Pose <fp@igh-essen.com>
parents: 1000
diff changeset
   887
    if (fsm->slave < master->slaves + master->slave_count) {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   888
        EC_MASTER_DBG(master, 1, "Scanning slave %u on %s link.\n",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   889
                fsm->slave->ring_position,
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   890
                ec_device_names[fsm->slave->device_index != 0]);
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   891
        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
   892
        ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan); // execute immediately
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   893
        fsm->datagram->device_index = fsm->slave->device_index;
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   894
        return;
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   895
    }
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   896
1931
831f2d34664c Fixed format specifiers.
Florian Pose <fp@igh-essen.com>
parents: 1927
diff changeset
   897
    EC_MASTER_INFO(master, "Bus scanning completed in %lu ms.\n",
831f2d34664c Fixed format specifiers.
Florian Pose <fp@igh-essen.com>
parents: 1927
diff changeset
   898
            (jiffies - fsm->scan_jiffies) * 1000 / HZ);
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   899
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   900
    master->scan_busy = 0;
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   901
    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
   902
1425
c1322a8793c0 Transition delay calculation. TBC...
Florian Pose <fp@igh-essen.com>
parents: 1421
diff changeset
   903
    ec_master_calc_dc(master);
1507
68e89abadd19 Removed unwanted tabulators.
Florian Pose <fp@igh-essen.com>
parents: 1444
diff changeset
   904
792
3778920f61e4 Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents: 758
diff changeset
   905
    // Attach slave configurations
3778920f61e4 Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents: 758
diff changeset
   906
    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
   907
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   908
#ifdef EC_EOE
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   909
    // check if EoE processing has to be started
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   910
    ec_master_eoe_start(master);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   911
#endif
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   912
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
    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
   914
        master->config_changed = 0;
70afe990c10e Bugfix: Reset config_changed flag when aborting state check.
Florian Pose <fp@igh-essen.com>
parents: 2098
diff changeset
   915
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
   916
        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
   917
        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
   918
    } 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
   919
        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
   920
    }
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   921
}
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   922
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   923
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   924
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   925
/** Master state: CONFIGURE SLAVE.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   926
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   927
 * Starts configuring a slave.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   928
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   929
void ec_fsm_master_state_configure_slave(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   930
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   931
        )
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   932
{
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   933
    ec_master_t *master = fsm->master;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   934
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   935
    if (ec_fsm_slave_config_exec(&fsm->fsm_slave_config)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   936
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   937
    }
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   938
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
   939
    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
   940
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   941
    // configuration finished
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   942
    master->config_busy = 0;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   943
    wake_up_interruptible(&master->config_queue);
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   944
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   945
    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
   946
        // 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
   947
    }
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   948
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   949
    fsm->idle = 1;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   950
    ec_fsm_master_action_next_slave_state(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   951
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   952
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   953
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   954
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
   955
/** 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
   956
 */
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
   957
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
   958
        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
   959
        )
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
   960
{
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
   961
    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
   962
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
   963
    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
   964
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
   965
        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
   966
            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
   967
                    || !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
   968
                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
   969
                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
   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
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   972
            EC_SLAVE_DBG(fsm->slave, 1, "Checking system time offset.\n");
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   973
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
   974
            // 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
   975
            //                         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
   976
            //     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
   977
            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
   978
                    0x0910, 24);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   979
            fsm->datagram->device_index = fsm->slave->device_index;
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
   980
            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
   981
            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
   982
            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
   983
        }
2098
0ce254664c81 Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents: 2094
diff changeset
   984
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
   985
    } 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
   986
        if (master->active) {
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
   987
            EC_MASTER_WARN(master, "No app_time received up to now,"
2145
a63ed5513117 Fixed typo.
Florian Pose <fp@igh-essen.com>
parents: 2117
diff changeset
   988
                    " 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
   989
        } else {
0ce254664c81 Improved DC sync at startup: Abort iterating though slaves and first correct
Florian Pose <fp@igh-essen.com>
parents: 2094
diff changeset
   990
            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
   991
        }
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
   992
    }
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
   993
2117
afb40fd6018e Removed allow_config flag and obsolete request to OP.
Florian Pose <fp@igh-essen.com>
parents: 2113
diff changeset
   994
    // 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
   995
    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
   996
    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
   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
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
/*****************************************************************************/
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
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
/** Configure 32 bit time offset.
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1002
 *
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1003
 * \return 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
  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
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
  1006
        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
  1007
        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
  1008
        u64 old_offset, /**< Time offset register. */
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1009
        unsigned long jiffies_since_read /**< Jiffies for 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
  1010
        )
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
{
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
    ec_slave_t *slave = fsm->slave;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1013
    u32 correction, 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
  1014
    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
  1015
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1016
    system_time32 = (u32) system_time;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1017
    old_offset32 = (u32) old_offset;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1018
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1019
    // correct read system time by elapsed time since read operation
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1020
    correction = jiffies_since_read * 1000 / HZ * 1000000;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1021
    system_time32 += correction;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1022
    time_diff = (u32) slave->master->app_time - system_time32;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1023
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1024
    EC_SLAVE_DBG(slave, 1, "DC 32 bit system time offset calculation:"
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
  1025
            " system_time=%u (corrected with %u),"
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1026
            " app_time=%llu, diff=%i\n",
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1027
            system_time32, correction,
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1028
            slave->master->app_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
  1029
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
    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
  1031
        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
  1032
        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
  1033
                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
  1034
        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
  1035
    } 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
  1036
        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
  1037
        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
  1038
    }
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
}
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
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
/*****************************************************************************/
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
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
/** Configure 64 bit time offset.
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1044
 *
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1045
 * \return 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
  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
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
  1048
        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
  1049
        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
  1050
        u64 old_offset, /**< Time offset register. */
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1051
        unsigned long jiffies_since_read /**< Jiffies for 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
  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
{
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;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1055
    u64 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
  1056
    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
  1057
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1058
    // correct read system time by elapsed time since read operation
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1059
    correction = (u64) (jiffies_since_read * 1000 / HZ) * 1000000;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1060
    system_time += correction;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1061
    time_diff = fsm->slave->master->app_time - system_time;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1062
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1063
    EC_SLAVE_DBG(slave, 1, "DC 64 bit system time offset calculation:"
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
  1064
            " system_time=%llu (corrected with %llu),"
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1065
            " app_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
  1066
            system_time, correction,
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1067
            slave->master->app_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
  1068
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
    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
  1070
        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
  1071
        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
  1072
                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
  1073
    } 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
  1074
        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
  1075
        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
  1076
    }
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
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
    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
  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
/*****************************************************************************/
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
  1082
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
  1083
/** 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
  1084
 */
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
  1085
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
  1086
        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
  1087
        )
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
  1088
{
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
  1089
    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
  1090
    ec_slave_t *slave = fsm->slave;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1091
    u64 system_time, old_offset, new_offset;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1092
    unsigned long jiffies_since_read;
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
  1093
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
  1094
    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
  1095
        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
  1096
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
  1097
    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
  1098
        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
  1099
        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
  1100
        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
  1101
        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
  1102
        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
  1103
    }
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
  1104
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
  1105
    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
  1106
        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
  1107
        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
  1108
        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
  1109
        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
  1110
        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
  1111
    }
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
  1112
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
  1113
    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
  1114
    old_offset = EC_READ_U64(datagram->data + 16); // 0x0920
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1115
    jiffies_since_read = jiffies - datagram->jiffies_sent;
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
  1116
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
  1117
    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
  1118
        new_offset = ec_fsm_master_dc_offset32(fsm,
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1119
                system_time, old_offset, jiffies_since_read);
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
  1120
    } 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
  1121
        new_offset = ec_fsm_master_dc_offset64(fsm,
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1122
                system_time, old_offset, jiffies_since_read);
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
  1123
    }
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
  1124
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
  1125
    // 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
  1126
    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
  1127
    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
  1128
    EC_WRITE_U32(datagram->data + 8, slave->transmission_delay);
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1129
    fsm->datagram->device_index = slave->device_index;
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
  1130
    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
  1131
    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
  1132
}
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
  1133
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
  1134
/*****************************************************************************/
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
  1135
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
  1136
/** 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
  1137
 */
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
  1138
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
  1139
        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
  1140
        )
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
  1141
{
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
  1142
    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
  1143
    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
  1144
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
  1145
    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
  1146
        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
  1147
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
  1148
    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
  1149
        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
  1150
                "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
  1151
        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
  1152
        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
  1153
        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
  1154
        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
  1155
    }
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
  1156
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
  1157
    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
  1158
        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
  1159
        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
  1160
        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
  1161
        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
  1162
        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
  1163
    }
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
  1164
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
  1165
    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
  1166
    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
  1167
}
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
  1168
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
  1169
/*****************************************************************************/
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
  1170
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1171
/** Master state: WRITE SII.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1172
 */
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1173
void ec_fsm_master_state_write_sii(
907
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
        )
269
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
  1176
{
601
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
  1177
    ec_master_t *master = fsm->master;
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1178
    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
  1179
    ec_slave_t *slave = request->slave;
269
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
  1180
435
779a18d12e6c Removed state machine running() methods.
Florian Pose <fp@igh-essen.com>
parents: 434
diff changeset
  1181
    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
  1182
100f51f28cf2 Layed out SII state machine.
Florian Pose <fp@igh-essen.com>
parents: 430
diff changeset
  1183
    if (!ec_fsm_sii_success(&fsm->fsm_sii)) {
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
  1184
        EC_SLAVE_ERR(slave, "Failed to write SII data.\n");
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
  1185
        request->state = EC_INT_REQUEST_FAILURE;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1186
        wake_up_all(&master->request_queue);
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
  1187
        ec_fsm_master_restart(fsm);
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1188
        return;
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1189
    }
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1190
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1191
    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
  1192
    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
  1193
        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
  1194
                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
  1195
                request->words + fsm->sii_index,
815
002fe9ec778f Implemented missing datagram types.
Florian Pose <fp@igh-essen.com>
parents: 814
diff changeset
  1196
                EC_FSM_SII_USE_CONFIGURED_ADDRESS);
433
100f51f28cf2 Layed out SII state machine.
Florian Pose <fp@igh-essen.com>
parents: 430
diff changeset
  1197
        ec_fsm_sii_exec(&fsm->fsm_sii); // execute immediately
269
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
  1198
        return;
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
  1199
    }
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
  1200
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1201
    // finished writing SII
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
  1202
    EC_SLAVE_DBG(slave, 1, "Finished writing %zu words of SII data.\n",
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
  1203
            request->nwords);
1079
ef1266652c4d Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents: 1064
diff changeset
  1204
ef1266652c4d Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents: 1064
diff changeset
  1205
    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
  1206
        // alias was written
ef1266652c4d Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents: 1064
diff changeset
  1207
        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
  1208
        // 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
  1209
        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
  1210
    }
ef1266652c4d Improved locking between ioctl()s and master state machine; separate
Florian Pose <fp@igh-essen.com>
parents: 1064
diff changeset
  1211
    // 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
  1212
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
  1213
    request->state = EC_INT_REQUEST_SUCCESS;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1214
    wake_up_all(&master->request_queue);
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1215
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1216
    // check for another SII write request
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
  1217
    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
  1218
        return; // processing another request
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
  1219
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
  1220
    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
  1221
}
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1222
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1223
/*****************************************************************************/
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1224
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1225
/** Master state: SDO DICTIONARY.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1226
 */
905
6d74ebc603ee Renamed state sdodict to sdo_dictionary.
Florian Pose <fp@igh-essen.com>
parents: 904
diff changeset
  1227
void ec_fsm_master_state_sdo_dictionary(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1228
        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
  1229
        )
419
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1230
{
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1231
    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
  1232
    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
  1233
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1234
    if (ec_fsm_coe_exec(&fsm->fsm_coe, fsm->datagram)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1235
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1236
    }
436
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
  1237
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
  1238
    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
  1239
        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
  1240
        return;
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1241
    }
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1242
1327
4d179b06dd3c merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents: 1326
diff changeset
  1243
    // 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
  1244
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1245
    if (master->debug_level) {
423
862ff892cf18 Better debugging output for SDO dictionaries.
Florian Pose <fp@igh-essen.com>
parents: 422
diff changeset
  1246
        unsigned int sdo_count, entry_count;
862ff892cf18 Better debugging output for SDO dictionaries.
Florian Pose <fp@igh-essen.com>
parents: 422
diff changeset
  1247
        ec_slave_sdo_dict_info(slave, &sdo_count, &entry_count);
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
  1248
        EC_SLAVE_DBG(slave, 1, "Fetched %u SDOs and %u entries.\n",
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
  1249
               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
  1250
    }
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
  1251
1186
ff481f097c97 Attach Pdo names from dictionary.
Florian Pose <fp@igh-essen.com>
parents: 1177
diff changeset
  1252
    // attach pdo names from dictionary
ff481f097c97 Attach Pdo names from dictionary.
Florian Pose <fp@igh-essen.com>
parents: 1177
diff changeset
  1253
    ec_slave_attach_pdo_names(slave);
ff481f097c97 Attach Pdo names from dictionary.
Florian Pose <fp@igh-essen.com>
parents: 1177
diff changeset
  1254
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
  1255
    ec_fsm_master_restart(fsm);
269
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
  1256
}
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
  1257
430
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
  1258
/*****************************************************************************/
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
  1259
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1260
/** Master state: SDO REQUEST.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1261
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1262
void ec_fsm_master_state_sdo_request(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1263
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
  1264
        )
430
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
  1265
{
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
  1266
    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
  1267
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1268
    if (!request) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1269
        // configuration was cleared in the meantime
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1270
        ec_fsm_master_restart(fsm);
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1271
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1272
    }
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1273
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1274
    if (ec_fsm_coe_exec(&fsm->fsm_coe, fsm->datagram)) {
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1275
        return;
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1276
    }
436
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
  1277
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
  1278
    if (!ec_fsm_coe_success(&fsm->fsm_coe)) {
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
  1279
        EC_SLAVE_DBG(fsm->slave, 1,
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
  1280
                "Failed to process internal SDO request.\n");
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
  1281
        request->state = EC_INT_REQUEST_FAILURE;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1282
        wake_up_all(&fsm->master->request_queue);
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
  1283
        ec_fsm_master_restart(fsm);
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
  1284
        return;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
  1285
    }
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
  1286
1335
09c6fce1ae45 merge -c1616 branches/1.4-foe: Included FoE patch from Olav Zarges.
Florian Pose <fp@igh-essen.com>
parents: 1327
diff changeset
  1287
    // SDO request finished
1209
8be462afb7f4 Added VoE handler.
Florian Pose <fp@igh-essen.com>
parents: 1200
diff changeset
  1288
    request->state = EC_INT_REQUEST_SUCCESS;
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1289
    wake_up_all(&fsm->master->request_queue);
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
  1290
1921
d9cf40facbc4 Improved syslog macros.
Florian Pose <fp@igh-essen.com>
parents: 1909
diff changeset
  1291
    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
  1292
1327
4d179b06dd3c merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com>
parents: 1326
diff changeset
  1293
    // check for another SDO request
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1294
    if (ec_fsm_master_action_process_sdo(fsm)) {
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
  1295
        return; // processing another request
2589
2b9c78543663 Reverted default branch to stable-1.5.
Florian Pose <fp@igh-essen.com>
parents: 2414
diff changeset
  1296
    }
430
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
  1297
1031
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
  1298
    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
  1299
}
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
  1300
000593b576dd Removed 'end' and 'error' states from master state machine.
Florian Pose <fp@igh-essen.com>
parents: 1029
diff changeset
  1301
/*****************************************************************************/