bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added scan time output.

This commit is contained in:
Florian Pose 2007-03-12 13:59:23 +00:00
parent b09000d770
commit d813370220
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
master/fsm_master.c
View File

@ -227,6 +227,7 @@ void ec_fsm_master_state_broadcast(ec_fsm_master_t *fsm /**< master state machin
fsm->topology_change_pending = 0;
fsm->tainted = 0;
fsm->idle = 0;
fsm->scan_jiffies = jiffies;
ec_master_eoe_stop(master);
ec_master_destroy_slaves(master);
@ -744,11 +745,13 @@ void ec_fsm_master_state_rewrite_addresses(ec_fsm_master_t *fsm
/*****************************************************************************/
/**
Master state: SCAN SLAVES.
Executes the sub-statemachine for the scanning of a slave.
*/
* Master state: SCAN SLAVES.
* Executes the sub-statemachine for the scanning of a slave.
*/
void ec_fsm_master_state_scan_slaves(ec_fsm_master_t *fsm /**< master state machine */)
void ec_fsm_master_state_scan_slaves(
ec_fsm_master_t *fsm /**< master state machine */
)
{
ec_master_t *master = fsm->master;
ec_slave_t *slave = fsm->slave;
@ -764,7 +767,8 @@ void ec_fsm_master_state_scan_slaves(ec_fsm_master_t *fsm /**< master state mach
return;
}
EC_INFO("Bus scanning completed.\n");
EC_INFO("Bus scanning completed in %u ms.\n",
(u32) (jiffies - fsm->scan_jiffies) * 1000 / HZ);
// set initial states of all slaves to PREOP to make mailbox
// communication possible

1
master/fsm_master.h
View File

@ -82,6 +82,7 @@ struct ec_fsm_master
void (*state)(ec_fsm_master_t *); /**< master state function */
int idle; /**< state machine is in idle phase */
unsigned long scan_jiffies; /**< beginning of slave scanning */
unsigned int slaves_responding; /**< number of responding slaves */
unsigned int topology_change_pending; /**< bus topology changed */
ec_slave_state_t slave_states; /**< states of responding slaves */