From d8133702208264ff36aa8cff1a9249f7343adf70 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Mon, 12 Mar 2007 13:59:23 +0000 Subject: [PATCH] Added scan time output. --- master/fsm_master.c | 14 +++++++++----- master/fsm_master.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/master/fsm_master.c b/master/fsm_master.c index 73abda0d..2ed8b1ff 100644 --- a/master/fsm_master.c +++ b/master/fsm_master.c @@ -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 diff --git a/master/fsm_master.h b/master/fsm_master.h index 838eecbb..4b58dcdf 100644 --- a/master/fsm_master.h +++ b/master/fsm_master.h @@ -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 */