master/fsm_master.c
author Florian Pose <fp@igh-essen.com>
Fri, 25 Apr 2008 14:32:56 +0000
changeset 908 386b908033be
parent 907 570ae1c64465
child 910 9fd31755f576
permissions -rw-r--r--
Replaced self_configured flag with force_config flag.
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
 *
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
     3
 *  $Id$
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
     4
 *
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
     5
 *  Copyright (C) 2006  Florian Pose, Ingenieurgemeinschaft IgH
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
 *
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
     9
 *  The IgH EtherCAT Master is free software; you can redistribute it
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    10
 *  and/or modify it under the terms of the GNU General Public License
246
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    11
 *  as published by the Free Software Foundation; either version 2 of the
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    12
 *  License, or (at your option) any later version.
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    13
 *
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    14
 *  The IgH EtherCAT Master is distributed in the hope that it will be
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    15
 *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    16
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    17
 *  GNU General Public License for more details.
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    18
 *
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    19
 *  You should have received a copy of the GNU General Public License
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    20
 *  along with the IgH EtherCAT Master; if not, write to the Free Software
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    21
 *  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
    22
 *
246
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    23
 *  The right to use EtherCAT Technology is granted and comes free of
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    24
 *  charge under condition of compatibility of product made by
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    25
 *  Licensee. People intending to distribute/sell products based on the
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    26
 *  code, have to sign an agreement to guarantee that products using
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    27
 *  software based on IgH EtherCAT master stay compatible with the actual
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    28
 *  EtherCAT specification (which are released themselves as an open
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    29
 *  standard) as the (only) precondition to have the right to use EtherCAT
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    30
 *  Technology, IP and trade marks.
0bf7c769de06 Changed license headers and added EtherCAT license notice.
Florian Pose <fp@igh-essen.com>
parents: 238
diff changeset
    31
 *
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    32
 *****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    33
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    34
/** \file
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    35
 * EtherCAT master state machine.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    36
 */
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    37
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    38
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    39
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    40
#include "globals.h"
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    41
#include "master.h"
329
d004349777fc SDO configuration interface, SDO download state machine.
Florian Pose <fp@igh-essen.com>
parents: 325
diff changeset
    42
#include "mailbox.h"
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
    43
#include "slave_config.h"
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
    44
#ifdef EC_EOE
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
    45
#include "ethernet.h"
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
    46
#endif
849
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
    47
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
    48
#include "fsm_master.h"
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
    49
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
    50
/*****************************************************************************/
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
    51
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
    52
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
    53
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
    54
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
    55
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
    56
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
    57
void ec_fsm_master_state_clear_addresses(ec_fsm_master_t *);
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    58
void ec_fsm_master_state_scan_slave(ec_fsm_master_t *);
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
    59
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
    60
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
    61
void ec_fsm_master_state_sdo_request(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
    62
void ec_fsm_master_state_end(ec_fsm_master_t *);
f789bdd78b54 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents: 523
diff changeset
    63
void ec_fsm_master_state_error(ec_fsm_master_t *);
251
c1d0b63a9302 EoE in Free-Run mode; Finished slave configuration state machine.
Florian Pose <fp@igh-essen.com>
parents: 246
diff changeset
    64
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    65
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    66
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    67
/** Constructor.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    68
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    69
void ec_fsm_master_init(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    70
        ec_fsm_master_t *fsm, /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    71
        ec_master_t *master, /**< EtherCAT master. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    72
        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
    73
        )
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    74
{
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    75
    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
    76
    fsm->datagram = datagram;
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
    77
    fsm->state = ec_fsm_master_state_start;
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
    78
    fsm->idle = 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
    79
    fsm->slaves_responding = 0;
553
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
    80
    fsm->topology_change_pending = 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
    81
    fsm->slave_states = EC_SLAVE_STATE_UNKNOWN;
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    82
436
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
    83
    // init sub-state-machines
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
    84
    ec_fsm_slave_config_init(&fsm->fsm_slave_config, fsm->datagram);
831
ded9519c8d6e Reading of Pdo mapping via CoE during scan.
Florian Pose <fp@igh-essen.com>
parents: 830
diff changeset
    85
    ec_fsm_slave_scan_init(&fsm->fsm_slave_scan, fsm->datagram,
ded9519c8d6e Reading of Pdo mapping via CoE during scan.
Florian Pose <fp@igh-essen.com>
parents: 830
diff changeset
    86
            &fsm->fsm_slave_config, &fsm->fsm_coe_map);
528
f789bdd78b54 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents: 523
diff changeset
    87
    ec_fsm_sii_init(&fsm->fsm_sii, fsm->datagram);
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
    88
    ec_fsm_change_init(&fsm->fsm_change, fsm->datagram);
f789bdd78b54 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents: 523
diff changeset
    89
    ec_fsm_coe_init(&fsm->fsm_coe, fsm->datagram);
741
aece53f82df3 Read PDO mapping from SDO dictionary (working, not finished yet).
Florian Pose <fp@igh-essen.com>
parents: 739
diff changeset
    90
    ec_fsm_coe_map_init(&fsm->fsm_coe_map, &fsm->fsm_coe);
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    91
}
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    92
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    93
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
    94
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    95
/** Destructor.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    96
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    97
void ec_fsm_master_clear(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    98
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
    99
        )
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   100
{
436
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   101
    // clear sub-state machines
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   102
    ec_fsm_slave_config_clear(&fsm->fsm_slave_config);
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   103
    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
   104
    ec_fsm_sii_clear(&fsm->fsm_sii);
434
0180d8277311 Layed out state change state machine.
Florian Pose <fp@igh-essen.com>
parents: 433
diff changeset
   105
    ec_fsm_change_clear(&fsm->fsm_change);
436
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   106
    ec_fsm_coe_clear(&fsm->fsm_coe);
741
aece53f82df3 Read PDO mapping from SDO dictionary (working, not finished yet).
Florian Pose <fp@igh-essen.com>
parents: 739
diff changeset
   107
    ec_fsm_coe_map_clear(&fsm->fsm_coe_map);
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   108
}
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   109
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   110
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   111
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   112
/** Executes the current state of the state machine.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   113
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   114
 * 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
   115
 * of the state machine is delayed to the next cycle.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   116
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   117
 * \return false, if state machine has terminated
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   118
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   119
int ec_fsm_master_exec(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   120
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   121
        )
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
   122
{
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
   123
    if (fsm->datagram->state == EC_DATAGRAM_SENT
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
   124
        || 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
   125
        // datagram was not sent or received yet.
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
   126
        return ec_fsm_master_running(fsm);
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
   127
    }
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
   128
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
   129
    fsm->state(fsm);
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
   130
    return ec_fsm_master_running(fsm);
456
dea14706efc2 Explicit use of slave configuration FSM in ecrt_master_activate() and ecrt_master_release().
Florian Pose <fp@igh-essen.com>
parents: 454
diff changeset
   131
}
dea14706efc2 Explicit use of slave configuration FSM in ecrt_master_activate() and ecrt_master_release().
Florian Pose <fp@igh-essen.com>
parents: 454
diff changeset
   132
dea14706efc2 Explicit use of slave configuration FSM in ecrt_master_activate() and ecrt_master_release().
Florian Pose <fp@igh-essen.com>
parents: 454
diff changeset
   133
/*****************************************************************************/
dea14706efc2 Explicit use of slave configuration FSM in ecrt_master_activate() and ecrt_master_release().
Florian Pose <fp@igh-essen.com>
parents: 454
diff changeset
   134
dea14706efc2 Explicit use of slave configuration FSM in ecrt_master_activate() and ecrt_master_release().
Florian Pose <fp@igh-essen.com>
parents: 454
diff changeset
   135
/**
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   136
 * \return false, if state machine has terminated
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   137
 */
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   138
int ec_fsm_master_running(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   139
        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
   140
        )
528
f789bdd78b54 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents: 523
diff changeset
   141
{
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
   142
    return fsm->state != ec_fsm_master_state_end
f789bdd78b54 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents: 523
diff changeset
   143
        && fsm->state != ec_fsm_master_state_error;
446
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   144
}
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   145
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   146
/*****************************************************************************/
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   147
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   148
/**
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   149
 * \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
   150
 */
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   151
int ec_fsm_master_idle(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   152
        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
   153
        )
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   154
{
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   155
    return fsm->idle;
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   156
}
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   157
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   158
/******************************************************************************
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   159
 * Master state machine
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   160
 *****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   161
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   162
/** Master state: START.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   163
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   164
 * Starts with getting slave count and slave states.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   165
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   166
void ec_fsm_master_state_start(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   167
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   168
        )
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
   169
{
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   170
    fsm->idle = 1;
528
f789bdd78b54 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents: 523
diff changeset
   171
    ec_datagram_brd(fsm->datagram, 0x0130, 2);
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
   172
    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
   173
}
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   174
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   175
/*****************************************************************************/
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   176
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   177
/** Master state: BROADCAST.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   178
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   179
 * Processes the broadcast read slave count and slaves states.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   180
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   181
void ec_fsm_master_state_broadcast(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   182
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   183
        )
528
f789bdd78b54 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents: 523
diff changeset
   184
{
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
   185
    ec_datagram_t *datagram = fsm->datagram;
553
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   186
    unsigned int i;
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   187
    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
   188
    ec_master_t *master = fsm->master;
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   189
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   190
    if (datagram->state == EC_DATAGRAM_TIMED_OUT)
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   191
        return; // always retry
505
bc443ca0077f State machines re-send datagrams on timeout.
Florian Pose <fp@igh-essen.com>
parents: 484
diff changeset
   192
553
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   193
    // bus topology change?
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   194
    if (datagram->working_counter != fsm->slaves_responding) {
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   195
        fsm->topology_change_pending = 1;
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   196
        fsm->slaves_responding = datagram->working_counter;
906
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   197
        EC_INFO("%u slave(s) responding.\n", fsm->slaves_responding);
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   198
    }
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   199
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   200
    if (datagram->state != EC_DATAGRAM_RECEIVED) { // link is down
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   201
        fsm->state = ec_fsm_master_state_error;
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   202
        return;
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   203
    }
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   204
553
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   205
    // slave states changed?
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   206
    if (EC_READ_U8(datagram->data) != fsm->slave_states) {
403
7bb931deccd9 Added EC_SLAVE_STATE_ACK_ERR to ec_state_string(); added EC_STATE_STRING_SIZE
Florian Pose <fp@igh-essen.com>
parents: 402
diff changeset
   207
        char states[EC_STATE_STRING_SIZE];
553
a4e0267825e3 Introduced topology_change_pending to delay bus scanning until IDLE mode
Florian Pose <fp@igh-essen.com>
parents: 538
diff changeset
   208
        fsm->slave_states = EC_READ_U8(datagram->data);
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
   209
        ec_state_string(fsm->slave_states, states);
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   210
        EC_INFO("Slave states: %s.\n", states);
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   211
    }
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   212
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   213
    if (fsm->topology_change_pending) {
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   214
        down(&master->scan_sem);
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   215
        if (!master->allow_scan) {
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   216
            up(&master->scan_sem);
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   217
        } else {
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   218
            master->scan_busy = 1;
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   219
            up(&master->scan_sem);
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   220
            
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   221
            // topology change when scan is allowed:
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   222
            // clear all slaves and scan the bus
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   223
            fsm->topology_change_pending = 0;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   224
            fsm->idle = 0;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   225
            fsm->scan_jiffies = jiffies;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   226
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   227
#ifdef EC_EOE
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   228
            ec_master_eoe_stop(master);
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   229
            ec_master_clear_eoe_handlers(master);
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   230
#endif
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   231
            ec_master_destroy_slaves(master);
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   232
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   233
            master->slave_count = datagram->working_counter;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   234
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   235
            if (!master->slave_count) {
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   236
                // 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
   237
                master->scan_busy = 0;
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   238
                wake_up_interruptible(&master->scan_queue);
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   239
                fsm->state = ec_fsm_master_state_end;
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   240
                return;
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   241
            }
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   242
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   243
            // init slaves
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   244
            for (i = 0; i < master->slave_count; i++) {
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   245
                if (!(slave = (ec_slave_t *) kmalloc(sizeof(ec_slave_t),
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   246
                                GFP_ATOMIC))) {
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   247
                    EC_ERR("Failed to allocate slave %i!\n", i);
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   248
                    ec_master_destroy_slaves(master);
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   249
                    master->scan_busy = 0;
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   250
                    wake_up_interruptible(&master->scan_queue);
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   251
                    fsm->state = ec_fsm_master_state_error;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   252
                    return;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   253
                }
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   254
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   255
                if (ec_slave_init(slave, master, i, i + 1)) {
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   256
                    // freeing of "slave" already done
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   257
                    ec_master_destroy_slaves(master);
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   258
                    master->scan_busy = 0;
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   259
                    wake_up_interruptible(&master->scan_queue);
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   260
                    fsm->state = ec_fsm_master_state_error;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   261
                    return;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   262
                }
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   263
908
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   264
                // do not force reconfiguration in operation mode to avoid
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   265
                // unnecesssary process data interruptions
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   266
                if (master->mode != EC_MASTER_MODE_OPERATION)
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   267
                    slave->force_config = 1;
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   268
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   269
                list_add_tail(&slave->list, &master->slaves);
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   270
            }
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   271
904
ba6f222aa06e Removed some debugging.
Florian Pose <fp@igh-essen.com>
parents: 900
diff changeset
   272
            // broadcast clear all station addresses
717
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   273
            ec_datagram_bwr(datagram, 0x0010, 2);
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   274
            EC_WRITE_U16(datagram->data, 0x0000);
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   275
            fsm->retries = EC_FSM_RETRIES;
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   276
            fsm->state = ec_fsm_master_state_clear_addresses;
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   277
            return;
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   278
        }
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   279
    }
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   280
853
726326d0aef4 Fixed bug if scanning is not allowed when link goes up.
Florian Pose <fp@igh-essen.com>
parents: 849
diff changeset
   281
    if (list_empty(&master->slaves)) {
726326d0aef4 Fixed bug if scanning is not allowed when link goes up.
Florian Pose <fp@igh-essen.com>
parents: 849
diff changeset
   282
        fsm->state = ec_fsm_master_state_end;
726326d0aef4 Fixed bug if scanning is not allowed when link goes up.
Florian Pose <fp@igh-essen.com>
parents: 849
diff changeset
   283
    } else {
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   284
        // fetch state from first slave
853
726326d0aef4 Fixed bug if scanning is not allowed when link goes up.
Florian Pose <fp@igh-essen.com>
parents: 849
diff changeset
   285
        fsm->slave = list_entry(master->slaves.next, ec_slave_t, list);
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   286
        ec_datagram_fprd(fsm->datagram, fsm->slave->station_address,
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   287
                0x0130, 2);
853
726326d0aef4 Fixed bug if scanning is not allowed when link goes up.
Florian Pose <fp@igh-essen.com>
parents: 849
diff changeset
   288
        fsm->retries = EC_FSM_RETRIES;
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   289
        fsm->state = ec_fsm_master_state_read_state;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   290
    }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   291
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   292
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   293
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   294
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   295
/** Check for pending SII write requests and process one.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   296
 * 
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   297
 * \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
   298
 */
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   299
int ec_fsm_master_action_process_sii(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   300
        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
   301
        )
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   302
{
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   303
    ec_master_t *master = fsm->master;
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   304
    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
   305
604
74ceacf42710 Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents: 603
diff changeset
   306
    // 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
   307
    while (1) {
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   308
        down(&master->sii_sem);
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   309
        if (list_empty(&master->sii_requests)) {
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   310
            up(&master->sii_sem);
604
74ceacf42710 Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents: 603
diff changeset
   311
            break;
74ceacf42710 Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents: 603
diff changeset
   312
        }
74ceacf42710 Fixed possible race with next request pointer again.
Florian Pose <fp@igh-essen.com>
parents: 603
diff changeset
   313
        // get first request
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   314
        request = list_entry(master->sii_requests.next,
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   315
                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
   316
        list_del_init(&request->list); // dequeue
861
6e3de145421a Introduced ec_sdo_request_state_t, making ec_request_t private again;
Florian Pose <fp@igh-essen.com>
parents: 859
diff changeset
   317
        request->state = EC_REQUEST_BUSY;
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   318
        up(&master->sii_sem);
601
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   319
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   320
        // found pending SII write operation. execute it!
607
7b1daa325c5f Implemented alias reading/writing via sysfs.
Florian Pose <fp@igh-essen.com>
parents: 605
diff changeset
   321
        if (master->debug_level)
906
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   322
            EC_DBG("Writing SII data to slave %u...\n",
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   323
                    request->slave->ring_position);
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   324
        fsm->sii_request = request;
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   325
        fsm->sii_index = 0;
754
0b47b49c5976 Changed unit of ec_eeprom_write_request_t from word to byte.
Florian Pose <fp@igh-essen.com>
parents: 743
diff changeset
   326
        ec_fsm_sii_write(&fsm->fsm_sii, request->slave, request->word_offset,
815
002fe9ec778f Implemented missing datagram types.
Florian Pose <fp@igh-essen.com>
parents: 814
diff changeset
   327
                request->data, EC_FSM_SII_USE_CONFIGURED_ADDRESS);
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   328
        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
   329
        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
   330
        return 1;
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   331
    }
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   332
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   333
    return 0;
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   334
}
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   335
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   336
/*****************************************************************************/
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   337
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   338
/** Check for pending Sdo requests and process one.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   339
 * 
814
a51f857b1b2d Renamed [PS]DO to [PS]do.
Florian Pose <fp@igh-essen.com>
parents: 794
diff changeset
   340
 * \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
   341
 */
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   342
int ec_fsm_master_action_process_sdo(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   343
        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
   344
        )
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   345
{
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   346
    ec_master_t *master = fsm->master;
849
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
   347
    ec_master_sdo_request_t *request;
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   348
    ec_sdo_request_t *req;
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   349
    ec_slave_t *slave;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   350
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   351
    // search for internal requests to be processed
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   352
    list_for_each_entry(slave, &master->slaves, list) {
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   353
        if (!slave->config)
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   354
            continue;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   355
        list_for_each_entry(req, &slave->config->sdo_requests, list) {
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   356
            if (req->state == EC_REQUEST_QUEUED) {
880
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   357
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   358
                if (ec_sdo_request_timed_out(req)) {
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   359
                    req->state = EC_REQUEST_FAILURE;
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   360
                    if (master->debug_level)
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   361
                        EC_DBG("Sdo request for slave %u timed out...\n",
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   362
                                slave->ring_position);
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   363
                    continue;
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   364
                }
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   365
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   366
                if (slave->current_state == EC_SLAVE_STATE_INIT ||
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   367
                        slave->error_flag) {
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   368
                    req->state = EC_REQUEST_FAILURE;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   369
                    continue;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   370
                }
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   371
880
f6212c54a5e3 Implemented Sdo timeout.
Florian Pose <fp@igh-essen.com>
parents: 872
diff changeset
   372
                req->state = EC_REQUEST_BUSY;
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   373
                if (master->debug_level)
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   374
                    EC_DBG("Processing Sdo request for slave %u...\n",
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   375
                            slave->ring_position);
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   376
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   377
                fsm->idle = 0;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   378
                fsm->sdo_request = req;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   379
                fsm->slave = slave;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   380
                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
   381
                ec_fsm_coe_transfer(&fsm->fsm_coe, slave, req);
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   382
                ec_fsm_coe_exec(&fsm->fsm_coe); // execute immediately
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   383
                return 1;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   384
            }
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   385
        }
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   386
    }
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   387
    
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   388
    // search the first external request to be processed
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   389
    while (1) {
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   390
        down(&master->sdo_sem);
849
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
   391
        if (list_empty(&master->slave_sdo_requests)) {
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   392
            up(&master->sdo_sem);
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   393
            break;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   394
        }
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   395
        // get first request
849
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
   396
        request = list_entry(master->slave_sdo_requests.next,
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
   397
                ec_master_sdo_request_t, list);
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   398
        list_del_init(&request->list); // dequeue
861
6e3de145421a Introduced ec_sdo_request_state_t, making ec_request_t private again;
Florian Pose <fp@igh-essen.com>
parents: 859
diff changeset
   399
        request->req.state = EC_REQUEST_BUSY;
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   400
        up(&master->sdo_sem);
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   401
831
ded9519c8d6e Reading of Pdo mapping via CoE during scan.
Florian Pose <fp@igh-essen.com>
parents: 830
diff changeset
   402
        slave = request->slave;
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   403
        if (slave->current_state == EC_SLAVE_STATE_INIT ||
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   404
                slave->error_flag) {
849
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
   405
            EC_ERR("Discarding Sdo request, slave %u not ready.\n",
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   406
                    slave->ring_position);
849
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
   407
            request->req.state = EC_REQUEST_FAILURE;
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   408
            wake_up(&master->sdo_queue);
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   409
            continue;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   410
        }
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   411
849
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
   412
        // Found pending Sdo request. Execute it!
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   413
        if (master->debug_level)
906
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   414
            EC_DBG("Processing Sdo request for slave %u...\n",
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   415
                    slave->ring_position);
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   416
849
4b712ec8929d Removed slave pointer from ec_sdo_request_t class.
Florian Pose <fp@igh-essen.com>
parents: 834
diff changeset
   417
        // Start uploading Sdo
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   418
        fsm->idle = 0;
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   419
        fsm->sdo_request = &request->req;
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   420
        fsm->slave = slave;
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   421
        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
   422
        ec_fsm_coe_transfer(&fsm->fsm_coe, slave, &request->req);
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   423
        ec_fsm_coe_exec(&fsm->fsm_coe); // execute immediately
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   424
        return 1;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   425
    }
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   426
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   427
    return 0;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   428
}
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   429
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   430
/*****************************************************************************/
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   431
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   432
/** Master action: IDLE.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   433
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   434
 * Does secondary work.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   435
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   436
void ec_fsm_master_action_idle(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   437
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   438
        )
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   439
{
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   440
    ec_master_t *master = fsm->master;
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   441
    ec_slave_t *slave;
304
558a6669da90 Better master state machines.
Florian Pose <fp@igh-essen.com>
parents: 301
diff changeset
   442
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   443
    // Check for pending Sdo requests
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   444
    if (ec_fsm_master_action_process_sdo(fsm))
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   445
        return;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   446
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
   447
    if (master->mode == EC_MASTER_MODE_IDLE) {
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   448
814
a51f857b1b2d Renamed [PS]DO to [PS]do.
Florian Pose <fp@igh-essen.com>
parents: 794
diff changeset
   449
        // check, if slaves have an Sdo dictionary to read out.
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
   450
        list_for_each_entry(slave, &master->slaves, list) {
834
0791aac03180 Separated SII data from slave.
Florian Pose <fp@igh-essen.com>
parents: 831
diff changeset
   451
            if (!(slave->sii.mailbox_protocols & EC_MBOX_COE)
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
   452
                || 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
   453
                || slave->current_state == EC_SLAVE_STATE_INIT
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   454
                || jiffies - slave->jiffies_preop < EC_WAIT_SDO_DICT * HZ
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   455
                || slave->error_flag) continue;
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   456
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   457
            if (master->debug_level) {
905
6d74ebc603ee Renamed state sdodict to sdo_dictionary.
Florian Pose <fp@igh-essen.com>
parents: 904
diff changeset
   458
                EC_DBG("Fetching Sdo dictionary from slave %u.\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
   459
                       slave->ring_position);
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   460
            }
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   461
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   462
            slave->sdo_dictionary_fetched = 1;
6607875255d9 SDO dictionary and SDO access only in IDLE mode, because of kmalloc()s.
Florian Pose <fp@igh-essen.com>
parents: 441
diff changeset
   463
814
a51f857b1b2d Renamed [PS]DO to [PS]do.
Florian Pose <fp@igh-essen.com>
parents: 794
diff changeset
   464
            // start fetching Sdo dictionary
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   465
            fsm->idle = 0;
441
ffa13db95e10 SDO uploading via Sysfs without master FSM calling wake_up().
Florian Pose <fp@igh-essen.com>
parents: 437
diff changeset
   466
            fsm->slave = slave;
905
6d74ebc603ee Renamed state sdodict to sdo_dictionary.
Florian Pose <fp@igh-essen.com>
parents: 904
diff changeset
   467
            fsm->state = ec_fsm_master_state_sdo_dictionary;
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
   468
            ec_fsm_coe_dictionary(&fsm->fsm_coe, slave);
441
ffa13db95e10 SDO uploading via Sysfs without master FSM calling wake_up().
Florian Pose <fp@igh-essen.com>
parents: 437
diff changeset
   469
            ec_fsm_coe_exec(&fsm->fsm_coe); // execute immediately
ffa13db95e10 SDO uploading via Sysfs without master FSM calling wake_up().
Florian Pose <fp@igh-essen.com>
parents: 437
diff changeset
   470
            return;
ffa13db95e10 SDO uploading via Sysfs without master FSM calling wake_up().
Florian Pose <fp@igh-essen.com>
parents: 437
diff changeset
   471
        }
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
   472
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   473
        // check for pending SII write operations.
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   474
        if (ec_fsm_master_action_process_sii(fsm))
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   475
            return; // SII write request found
304
558a6669da90 Better master state machines.
Florian Pose <fp@igh-essen.com>
parents: 301
diff changeset
   476
    }
558a6669da90 Better master state machines.
Florian Pose <fp@igh-essen.com>
parents: 301
diff changeset
   477
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
   478
    fsm->state = ec_fsm_master_state_end;
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   479
}
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   480
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   481
/*****************************************************************************/
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   482
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   483
/** Master action: Get state of next slave.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   484
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   485
void ec_fsm_master_action_next_slave_state(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   486
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   487
        )
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   488
{
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   489
    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
   490
    ec_slave_t *slave = fsm->slave;
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   491
304
558a6669da90 Better master state machines.
Florian Pose <fp@igh-essen.com>
parents: 301
diff changeset
   492
    // is there another slave to query?
292
2cf6ae0a2419 Minor changes in fsm.c and slave.c
Florian Pose <fp@igh-essen.com>
parents: 291
diff changeset
   493
    if (slave->list.next != &master->slaves) {
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   494
        // fetch state from next slave
650
c68995623e94 Introduced idle flag in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 649
diff changeset
   495
        fsm->idle = 1;
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   496
        fsm->slave = list_entry(slave->list.next, ec_slave_t, list);
815
002fe9ec778f Implemented missing datagram types.
Florian Pose <fp@igh-essen.com>
parents: 814
diff changeset
   497
        ec_datagram_fprd(fsm->datagram, fsm->slave->station_address,
293
14aeb79aa992 Renamed command structure to datagram.
Florian Pose <fp@igh-essen.com>
parents: 292
diff changeset
   498
                         0x0130, 2);
505
bc443ca0077f State machines re-send datagrams on timeout.
Florian Pose <fp@igh-essen.com>
parents: 484
diff changeset
   499
        fsm->retries = EC_FSM_RETRIES;
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   500
        fsm->state = ec_fsm_master_state_read_state;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   501
        return;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   502
    }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   503
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   504
    // all slaves processed
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   505
    ec_fsm_master_action_idle(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   506
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   507
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   508
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   509
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   510
/** Master action: Configure.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   511
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   512
void ec_fsm_master_action_configure(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   513
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   514
        )
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   515
{
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   516
    ec_master_t *master = fsm->master;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   517
    ec_slave_t *slave = fsm->slave;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   518
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   519
    // Does the slave have to be configured?
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   520
    if (!slave->error_flag
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   521
            && (slave->current_state != slave->requested_state
908
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   522
                || slave->force_config)) {
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   523
        // Start slave configuration, if it is allowed.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   524
        down(&master->config_sem);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   525
        if (!master->allow_config) {
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   526
            up(&master->config_sem);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   527
        } else {
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   528
            master->config_busy = 1;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   529
            up(&master->config_sem);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   530
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   531
            if (master->debug_level) {
908
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   532
                char old_state[EC_STATE_STRING_SIZE],
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   533
                     new_state[EC_STATE_STRING_SIZE];
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   534
                ec_state_string(slave->current_state, old_state);
908
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   535
                ec_state_string(slave->requested_state, new_state);
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   536
                EC_DBG("Changing state of slave %u from %s to %s%s.\n",
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   537
                        slave->ring_position, old_state, new_state,
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   538
                        slave->force_config ? " (forced)" : "");
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   539
            }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   540
908
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   541
            // configuration will be done immediately; therefore reset the
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   542
            // force flag
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   543
            slave->force_config = 0;
386b908033be Replaced self_configured flag with force_config flag.
Florian Pose <fp@igh-essen.com>
parents: 907
diff changeset
   544
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   545
            fsm->idle = 0;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   546
            fsm->state = ec_fsm_master_state_configure_slave;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   547
            ec_fsm_slave_config_start(&fsm->fsm_slave_config, slave);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   548
            fsm->state(fsm); // execute immediately
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   549
            return;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   550
        }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   551
    }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   552
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   553
    // slave has error flag set; process next one
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   554
    ec_fsm_master_action_next_slave_state(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   555
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   556
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   557
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   558
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   559
/** Master action: Acknowledge.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   560
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   561
void ec_fsm_master_action_acknowledge(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   562
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   563
        )
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   564
{
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   565
    ec_slave_t *slave = fsm->slave;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   566
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   567
    if (!slave->error_flag) {
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   568
        // Check, if new slave state has to be acknowledged
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   569
        if (slave->current_state & EC_SLAVE_STATE_ACK_ERR) {
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   570
            fsm->idle = 0;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   571
            fsm->state = ec_fsm_master_state_acknowledge;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   572
            ec_fsm_change_ack(&fsm->fsm_change, slave);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   573
            fsm->state(fsm); // execute immediately
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   574
            return;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   575
        }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   576
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   577
        // No acknowlegde necessary; check for configuration
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   578
        ec_fsm_master_action_configure(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   579
        return;
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
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   582
    // slave has error flag set; process next one
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   583
    ec_fsm_master_action_next_slave_state(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   584
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   585
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   586
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   587
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   588
/** Master state: READ STATE.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   589
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   590
 * Fetches the AL state of a slave.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   591
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   592
void ec_fsm_master_state_read_state(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   593
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   594
        )
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   595
{
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   596
    ec_slave_t *slave = fsm->slave;
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
   597
    ec_datagram_t *datagram = fsm->datagram;
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   598
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   599
    if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--)
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   600
        return;
505
bc443ca0077f State machines re-send datagrams on timeout.
Florian Pose <fp@igh-essen.com>
parents: 484
diff changeset
   601
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   602
    if (datagram->state != EC_DATAGRAM_RECEIVED) {
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   603
        EC_ERR("Failed to receive AL state datagram for slave %u"
713
ae41cadd25b6 Better handling of unexpected working counters; introduced
Florian Pose <fp@igh-essen.com>
parents: 661
diff changeset
   604
                " (datagram state %i)\n",
ae41cadd25b6 Better handling of unexpected working counters; introduced
Florian Pose <fp@igh-essen.com>
parents: 661
diff changeset
   605
                slave->ring_position, datagram->state);
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
   606
        fsm->state = ec_fsm_master_state_error;
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   607
        return;
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   608
    }
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   609
260
5fe7df7f2433 Correct behaviour of master state machine in RT mode.
Florian Pose <fp@igh-essen.com>
parents: 259
diff changeset
   610
    // did the slave not respond to its station address?
906
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   611
    if (datagram->working_counter != 1) {
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   612
        if (!slave->error_flag) {
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   613
            slave->error_flag = 1;
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   614
            if (fsm->master->debug_level)
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   615
                EC_DBG("Slave %u did not respond to state query.\n",
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   616
                        fsm->slave->ring_position);
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   617
        }
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   618
        fsm->topology_change_pending = 1;
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   619
        fsm->state = ec_fsm_master_state_error;
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   620
        return;
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   621
    }
f95e3e33c0cf Removed slave online flag.
Florian Pose <fp@igh-essen.com>
parents: 905
diff changeset
   622
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   623
    // A single slave responded
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   624
    ec_slave_set_state(slave, EC_READ_U8(datagram->data));
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   625
    ec_fsm_master_action_acknowledge(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   626
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   627
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   628
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   629
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   630
/** Master state: ACKNOWLEDGE.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   631
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   632
void ec_fsm_master_state_acknowledge(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   633
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   634
        )
454
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   635
{
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   636
    ec_slave_t *slave = fsm->slave;
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   637
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   638
    if (ec_fsm_change_exec(&fsm->fsm_change))
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   639
        return;
454
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   640
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   641
    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
   642
        fsm->slave->error_flag = 1;
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   643
        EC_ERR("Failed to acknowledge state change on slave %u.\n",
454
25cc4a3b9e0a State acknowledgement in master state machine.
Florian Pose <fp@igh-essen.com>
parents: 448
diff changeset
   644
               slave->ring_position);
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   645
    }
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   646
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   647
    ec_fsm_master_action_configure(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   648
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   649
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   650
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   651
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   652
/** Master state: CLEAR ADDRESSES.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   653
 */
717
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   654
void ec_fsm_master_state_clear_addresses(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   655
        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
   656
        )
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   657
{
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   658
    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
   659
    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
   660
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   661
    if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--)
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   662
        return;
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   663
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   664
    if (datagram->state != EC_DATAGRAM_RECEIVED) {
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   665
        EC_ERR("Failed to receive address clearing datagram (state %i).\n",
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   666
                datagram->state);
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   667
        master->scan_busy = 0;
794
684dea874956 Allow bus configuration when link is down.
Florian Pose <fp@igh-essen.com>
parents: 792
diff changeset
   668
        wake_up_interruptible(&master->scan_queue);
717
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   669
        fsm->state = ec_fsm_master_state_error;
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   670
        return;
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   671
    }
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   672
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   673
    if (datagram->working_counter != master->slave_count) {
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   674
        EC_WARN("Failed to clear all station addresses: Cleared %u of %u",
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   675
                datagram->working_counter, master->slave_count);
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   676
    }
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   677
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   678
    EC_INFO("Scanning bus.\n");
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   679
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   680
    // begin scanning of slaves
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   681
    fsm->slave = list_entry(master->slaves.next, ec_slave_t, list);
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   682
    fsm->state = ec_fsm_master_state_scan_slave;
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   683
    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
   684
    ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan); // execute immediately
717
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   685
}
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   686
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   687
/*****************************************************************************/
87abf1166e88 Clear station addresses with broadcast before setting them.
Florian Pose <fp@igh-essen.com>
parents: 716
diff changeset
   688
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   689
/** Master state: SCAN SLAVE.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   690
 *
652
15cff76b66c7 Added scan time output.
Florian Pose <fp@igh-essen.com>
parents: 650
diff changeset
   691
 * 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
   692
 */
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   693
void ec_fsm_master_state_scan_slave(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   694
        ec_fsm_master_t *fsm /**< Master state machine. */
652
15cff76b66c7 Added scan time output.
Florian Pose <fp@igh-essen.com>
parents: 650
diff changeset
   695
        )
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   696
{
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   697
    ec_master_t *master = fsm->master;
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   698
    ec_slave_t *slave = fsm->slave;
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   699
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   700
    if (ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan))
528
f789bdd78b54 Layed out slave state machines in own files fsm_slave.[ch]; renamed fsm.[ch] to fsm_master.[ch]
Florian Pose <fp@igh-essen.com>
parents: 523
diff changeset
   701
        return;
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   702
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   703
#ifdef EC_EOE
834
0791aac03180 Separated SII data from slave.
Florian Pose <fp@igh-essen.com>
parents: 831
diff changeset
   704
    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
   705
        // create EoE handler for this slave
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   706
        ec_eoe_t *eoe;
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   707
        if (!(eoe = kmalloc(sizeof(ec_eoe_t), GFP_KERNEL))) {
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   708
            EC_ERR("Failed to allocate EoE handler memory for slave %u!\n",
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   709
                    slave->ring_position);
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   710
        } else if (ec_eoe_init(eoe, slave)) {
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   711
            EC_ERR("Failed to init EoE handler for slave %u!\n",
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   712
                    slave->ring_position);
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   713
            kfree(eoe);
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   714
        } else {
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   715
            list_add_tail(&eoe->list, &master->eoe_handlers);
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   716
        }
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   717
    }
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   718
#endif
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   719
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   720
    // another slave to fetch?
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   721
    if (slave->list.next != &master->slaves) {
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   722
        fsm->slave = list_entry(slave->list.next, ec_slave_t, list);
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   723
        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
   724
        ec_fsm_slave_scan_exec(&fsm->fsm_slave_scan); // execute immediately
325
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   725
        return;
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   726
    }
7833cf70c4f2 VERSION 1.1: New realtime interface, only state machines.
Florian Pose <fp@igh-essen.com>
parents: 312
diff changeset
   727
652
15cff76b66c7 Added scan time output.
Florian Pose <fp@igh-essen.com>
parents: 650
diff changeset
   728
    EC_INFO("Bus scanning completed in %u ms.\n",
15cff76b66c7 Added scan time output.
Florian Pose <fp@igh-essen.com>
parents: 650
diff changeset
   729
            (u32) (jiffies - fsm->scan_jiffies) * 1000 / HZ);
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   730
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   731
    master->scan_busy = 0;
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   732
    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
   733
792
3778920f61e4 Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents: 758
diff changeset
   734
    // Attach slave configurations
3778920f61e4 Implemented most realtime interface changes for version 1.4, improved
Florian Pose <fp@igh-essen.com>
parents: 758
diff changeset
   735
    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
   736
716
ac2a81a33d3d Minor fix.
Florian Pose <fp@igh-essen.com>
parents: 715
diff changeset
   737
#ifdef EC_EOE
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   738
    // check if EoE processing has to be started
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   739
    ec_master_eoe_start(master);
715
f12ff7c08623 Added --enable-eoe conditional.
Florian Pose <fp@igh-essen.com>
parents: 713
diff changeset
   740
#endif
661
bc1de1362efb Dynamic creation of EoE handlers.
Florian Pose <fp@igh-essen.com>
parents: 656
diff changeset
   741
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
   742
    fsm->state = ec_fsm_master_state_end;
238
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   743
}
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   744
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   745
/*****************************************************************************/
b4960499098f Added finite state machine (FSM) processing.
Florian Pose <fp@igh-essen.com>
parents:
diff changeset
   746
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   747
/** Master state: CONFIGURE SLAVE.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   748
 *
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   749
 * Starts configuring a slave.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   750
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   751
void ec_fsm_master_state_configure_slave(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   752
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   753
        )
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   754
{
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   755
    ec_master_t *master = fsm->master;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   756
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   757
    if (ec_fsm_slave_config_exec(&fsm->fsm_slave_config))
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   758
        return;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   759
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   760
    // configuration finished
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   761
    master->config_busy = 0;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   762
    wake_up_interruptible(&master->config_queue);
830
d83d92e1a919 Separated slave state machines.
Florian Pose <fp@igh-essen.com>
parents: 815
diff changeset
   763
900
f8b5c6d21705 Removed bus validation; slave configuration during realtime operation;
Florian Pose <fp@igh-essen.com>
parents: 880
diff changeset
   764
    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
   765
        // 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
   766
    }
656
370aa8c2d1b1 Slave configuration exclusively from master thread; removed
Florian Pose <fp@igh-essen.com>
parents: 652
diff changeset
   767
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   768
    fsm->idle = 1;
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   769
    ec_fsm_master_action_next_slave_state(fsm);
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   770
}
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   771
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   772
/*****************************************************************************/
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   773
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   774
/** Master state: WRITE SII.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   775
 */
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   776
void ec_fsm_master_state_write_sii(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   777
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   778
        )
269
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
   779
{
601
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   780
    ec_master_t *master = fsm->master;
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   781
    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
   782
    ec_slave_t *slave = request->slave;
269
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
   783
435
779a18d12e6c Removed state machine running() methods.
Florian Pose <fp@igh-essen.com>
parents: 434
diff changeset
   784
    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
   785
100f51f28cf2 Layed out SII state machine.
Florian Pose <fp@igh-essen.com>
parents: 430
diff changeset
   786
    if (!ec_fsm_sii_success(&fsm->fsm_sii)) {
601
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   787
        slave->error_flag = 1;
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   788
        EC_ERR("Failed to write SII data to slave %i.\n",
607
7b1daa325c5f Implemented alias reading/writing via sysfs.
Florian Pose <fp@igh-essen.com>
parents: 605
diff changeset
   789
                slave->ring_position);
649
a4d3fffdaed7 Renamed names of enum type ec_request_state_t.
Florian Pose <fp@igh-essen.com>
parents: 646
diff changeset
   790
        request->state = EC_REQUEST_FAILURE;
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   791
        wake_up(&master->sii_queue);
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   792
        fsm->state = ec_fsm_master_state_error;
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   793
        return;
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   794
    }
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   795
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   796
    fsm->sii_index++;
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   797
    if (fsm->sii_index < request->word_size) {
601
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   798
        ec_fsm_sii_write(&fsm->fsm_sii, slave,
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   799
                request->word_offset + fsm->sii_index,
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   800
                request->data + fsm->sii_index * 2,
815
002fe9ec778f Implemented missing datagram types.
Florian Pose <fp@igh-essen.com>
parents: 814
diff changeset
   801
                EC_FSM_SII_USE_CONFIGURED_ADDRESS);
433
100f51f28cf2 Layed out SII state machine.
Florian Pose <fp@igh-essen.com>
parents: 430
diff changeset
   802
        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
   803
        return;
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
   804
    }
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
   805
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   806
    // finished writing SII
607
7b1daa325c5f Implemented alias reading/writing via sysfs.
Florian Pose <fp@igh-essen.com>
parents: 605
diff changeset
   807
    if (master->debug_level)
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   808
        EC_DBG("Finished writing %u words of SII data to slave %u.\n",
754
0b47b49c5976 Changed unit of ec_eeprom_write_request_t from word to byte.
Florian Pose <fp@igh-essen.com>
parents: 743
diff changeset
   809
                request->word_size, slave->ring_position);
861
6e3de145421a Introduced ec_sdo_request_state_t, making ec_request_t private again;
Florian Pose <fp@igh-essen.com>
parents: 859
diff changeset
   810
    request->state = EC_REQUEST_SUCCESS;
872
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   811
    wake_up(&master->sii_queue);
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   812
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   813
    // TODO: Evaluate new SII contents!
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   814
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   815
    // check for another SII write request
d4e0380d63b3 Renamed EEPROM to SII.
Florian Pose <fp@igh-essen.com>
parents: 861
diff changeset
   816
    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
   817
        return; // processing another request
d6d951b766e3 Introduced EEPROM write requests: EEPROM write operations from user
Florian Pose <fp@igh-essen.com>
parents: 594
diff changeset
   818
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   819
    fsm->state = ec_fsm_master_state_end;
419
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   820
}
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   821
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   822
/*****************************************************************************/
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   823
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   824
/** Master state: SDO DICTIONARY.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   825
 */
905
6d74ebc603ee Renamed state sdodict to sdo_dictionary.
Florian Pose <fp@igh-essen.com>
parents: 904
diff changeset
   826
void ec_fsm_master_state_sdo_dictionary(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   827
        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
   828
        )
419
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   829
{
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   830
    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
   831
    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
   832
436
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   833
    if (ec_fsm_coe_exec(&fsm->fsm_coe)) return;
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   834
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   835
    if (!ec_fsm_coe_success(&fsm->fsm_coe)) {
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
   836
        fsm->state = ec_fsm_master_state_error;
419
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   837
        return;
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   838
    }
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   839
814
a51f857b1b2d Renamed [PS]DO to [PS]do.
Florian Pose <fp@igh-essen.com>
parents: 794
diff changeset
   840
    // 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
   841
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   842
    if (master->debug_level) {
423
862ff892cf18 Better debugging output for SDO dictionaries.
Florian Pose <fp@igh-essen.com>
parents: 422
diff changeset
   843
        unsigned int sdo_count, entry_count;
862ff892cf18 Better debugging output for SDO dictionaries.
Florian Pose <fp@igh-essen.com>
parents: 422
diff changeset
   844
        ec_slave_sdo_dict_info(slave, &sdo_count, &entry_count);
814
a51f857b1b2d Renamed [PS]DO to [PS]do.
Florian Pose <fp@igh-essen.com>
parents: 794
diff changeset
   845
        EC_DBG("Fetched %i Sdos and %i entries from slave %i.\n",
423
862ff892cf18 Better debugging output for SDO dictionaries.
Florian Pose <fp@igh-essen.com>
parents: 422
diff changeset
   846
               sdo_count, entry_count, slave->ring_position);
419
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   847
    }
cf724fc82a00 Moved SDO dictionary fetching to master FSMs; added SDO parent kobj.
Florian Pose <fp@igh-essen.com>
parents: 411
diff changeset
   848
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   849
    fsm->state = ec_fsm_master_state_end;
269
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
   850
}
a03be9a6fed6 EEPROM writing via SysFS.
Florian Pose <fp@igh-essen.com>
parents: 266
diff changeset
   851
430
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
   852
/*****************************************************************************/
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
   853
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   854
/** Master state: SDO REQUEST.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   855
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   856
void ec_fsm_master_state_sdo_request(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   857
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   858
        )
430
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
   859
{
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
   860
    ec_master_t *master = fsm->master;
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   861
    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
   862
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   863
    if (ec_fsm_coe_exec(&fsm->fsm_coe)) return;
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   864
63214beb641d Layed out CoE state machine.
Florian Pose <fp@igh-essen.com>
parents: 435
diff changeset
   865
    if (!ec_fsm_coe_success(&fsm->fsm_coe)) {
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   866
        EC_DBG("Failed to process Sdo request for slave %u.\n",
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   867
                fsm->slave->ring_position);
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   868
        request->state = EC_REQUEST_FAILURE;
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   869
        wake_up(&master->sdo_queue);
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   870
        fsm->state = ec_fsm_master_state_error;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   871
        return;
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   872
    }
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   873
814
a51f857b1b2d Renamed [PS]DO to [PS]do.
Florian Pose <fp@igh-essen.com>
parents: 794
diff changeset
   874
    // Sdo request finished 
861
6e3de145421a Introduced ec_sdo_request_state_t, making ec_request_t private again;
Florian Pose <fp@igh-essen.com>
parents: 859
diff changeset
   875
    request->state = EC_REQUEST_SUCCESS;
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   876
    wake_up(&master->sdo_queue);
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   877
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   878
    if (master->debug_level)
858
69122084d066 Basic reading realtime Sdo access working.
Florian Pose <fp@igh-essen.com>
parents: 853
diff changeset
   879
        EC_DBG("Finished Sdo request for slave %u.\n",
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   880
                fsm->slave->ring_position);
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   881
814
a51f857b1b2d Renamed [PS]DO to [PS]do.
Florian Pose <fp@igh-essen.com>
parents: 794
diff changeset
   882
    // check for another Sdo request
646
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   883
    if (ec_fsm_master_action_process_sdo(fsm))
fbbd4e54e031 Implemented SDO reading with wait queues.
Florian Pose <fp@igh-essen.com>
parents: 645
diff changeset
   884
        return; // processing another request
430
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
   885
637
d5d04c868e0e Removed ecrt_master_run(), removed datagram queueing from state
Florian Pose <fp@igh-essen.com>
parents: 612
diff changeset
   886
    fsm->state = ec_fsm_master_state_end;
430
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
   887
}
74754f45d5fa Implemented SDO reading via Sysfs.
Florian Pose <fp@igh-essen.com>
parents: 429
diff changeset
   888
446
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   889
/*****************************************************************************/
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   890
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   891
/** State: ERROR.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   892
 */
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
   893
void ec_fsm_master_state_error(
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   894
        ec_fsm_master_t *fsm /**< Master state machine. */
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
   895
        )
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
   896
{
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
   897
    fsm->state = ec_fsm_master_state_start;
446
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   898
}
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   899
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   900
/*****************************************************************************/
8fede404c01f Persistent slave lists.
Florian Pose <fp@igh-essen.com>
parents: 442
diff changeset
   901
907
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   902
/** State: END.
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   903
 */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   904
void ec_fsm_master_state_end(
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   905
        ec_fsm_master_t *fsm /**< Master state machine. */
570ae1c64465 Improved master state machine.
Florian Pose <fp@igh-essen.com>
parents: 906
diff changeset
   906
        )
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
   907
{
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
   908
    fsm->state = ec_fsm_master_state_start;
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
   909
}
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
   910
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
   911
/*****************************************************************************/