# HG changeset patch # User Florian Pose # Date 1203417206 0 # Node ID c695e53940d479671df07dd542e1dd8bee3396d0 # Parent 684dea874956c8e9f74a8d43c58fd566091b6ba6 Renamed a few configuration states. diff -r 684dea874956 -r c695e53940d4 documentation/graphs/fsm_slave_conf.dot --- a/documentation/graphs/fsm_slave_conf.dot Tue Feb 19 09:58:48 2008 +0000 +++ b/documentation/graphs/fsm_slave_conf.dot Tue Feb 19 10:33:26 2008 +0000 @@ -5,8 +5,8 @@ enter_mbox_sync [shape=point,label=""] enter_fmmu [shape=point,label=""] - enter_sdoconf [shape=point,label=""] - enter_mapconf [shape=point,label=""] + enter_sdo_conf [shape=point,label=""] + enter_mapping [shape=point,label=""] enter_pdo_sync [shape=point,label=""] enter_saveop [shape=point,label=""] @@ -14,7 +14,7 @@ init -> init init -> error init -> enter_mbox_sync - init -> clear_fmmus [label="has FMMUs", weight=10] + init -> clear_fmmus [label="Has FMMUs", weight=10] clear_fmmus -> clear_fmmus clear_fmmus -> error clear_fmmus -> enter_mbox_sync [weight=10] @@ -27,18 +27,18 @@ preop -> preop preop -> error preop -> end [label="PREOP req."] - preop -> enter_sdoconf [weight=10] - enter_sdoconf -> enter_saveop [label="No configuration"] - enter_sdoconf -> enter_mapconf [label="No SDO configs"] - enter_sdoconf -> sdoconf [label="SDO configs", weight=10] - sdoconf -> sdoconf - sdoconf -> error - sdoconf -> enter_mapconf [weight=10] - enter_mapconf -> mapconf [label="CoE supported", weight=10] - enter_mapconf -> enter_pdo_sync - mapconf -> mapconf - mapconf -> error - mapconf -> enter_pdo_sync [weight=10] + preop -> enter_sdo_conf [weight=10] + enter_sdo_conf -> enter_saveop [label="No configuration"] + enter_sdo_conf -> enter_mapping [label="No SDO configs"] + enter_sdo_conf -> sdo_conf [label="SDO configs", weight=10] + sdo_conf -> sdo_conf + sdo_conf -> error + sdo_conf -> enter_mapping [weight=10] + enter_mapping -> mapping [label="CoE supported", weight=10] + enter_mapping -> enter_pdo_sync + mapping -> mapping + mapping -> error + mapping -> enter_pdo_sync [weight=10] enter_pdo_sync -> pdo_sync [label="PDO SMs", weight=10] enter_pdo_sync -> enter_fmmu pdo_sync -> pdo_sync diff -r 684dea874956 -r c695e53940d4 master/fsm_slave.c --- a/master/fsm_slave.c Tue Feb 19 09:58:48 2008 +0000 +++ b/master/fsm_slave.c Tue Feb 19 10:33:26 2008 +0000 @@ -60,10 +60,10 @@ void ec_fsm_slave_conf_state_clear_fmmus(ec_fsm_slave_t *); void ec_fsm_slave_conf_state_mbox_sync(ec_fsm_slave_t *); void ec_fsm_slave_conf_state_preop(ec_fsm_slave_t *); +void ec_fsm_slave_conf_state_sdo_conf(ec_fsm_slave_t *); +void ec_fsm_slave_conf_state_mapping(ec_fsm_slave_t *); void ec_fsm_slave_conf_state_pdo_sync(ec_fsm_slave_t *); void ec_fsm_slave_conf_state_fmmu(ec_fsm_slave_t *); -void ec_fsm_slave_conf_state_sdoconf(ec_fsm_slave_t *); -void ec_fsm_slave_conf_state_mapconf(ec_fsm_slave_t *); void ec_fsm_slave_conf_state_saveop(ec_fsm_slave_t *); void ec_fsm_slave_conf_state_op(ec_fsm_slave_t *); @@ -71,8 +71,8 @@ void ec_fsm_slave_conf_enter_preop(ec_fsm_slave_t *); void ec_fsm_slave_conf_enter_pdo_sync(ec_fsm_slave_t *); void ec_fsm_slave_conf_enter_fmmu(ec_fsm_slave_t *); -void ec_fsm_slave_conf_enter_sdoconf(ec_fsm_slave_t *); -void ec_fsm_slave_conf_enter_mapconf(ec_fsm_slave_t *); +void ec_fsm_slave_conf_enter_sdo_conf(ec_fsm_slave_t *); +void ec_fsm_slave_conf_enter_mapping(ec_fsm_slave_t *); void ec_fsm_slave_conf_enter_saveop(ec_fsm_slave_t *); void ec_fsm_slave_state_end(ec_fsm_slave_t *); @@ -865,7 +865,7 @@ return; } - ec_fsm_slave_conf_enter_sdoconf(fsm); + ec_fsm_slave_conf_enter_sdo_conf(fsm); } /*****************************************************************************/ @@ -874,7 +874,7 @@ * Check for SDO configurations to be applied. */ -void ec_fsm_slave_conf_enter_sdoconf(ec_fsm_slave_t *fsm /**< slave state machine */) +void ec_fsm_slave_conf_enter_sdo_conf(ec_fsm_slave_t *fsm /**< slave state machine */) { ec_slave_t *slave = fsm->slave; @@ -886,12 +886,12 @@ // No CoE configuration to be applied? FIXME if (list_empty(&slave->config->sdo_configs)) { // skip SDO configuration - ec_fsm_slave_conf_enter_mapconf(fsm); + ec_fsm_slave_conf_enter_mapping(fsm); return; } // start SDO configuration - fsm->state = ec_fsm_slave_conf_state_sdoconf; + fsm->state = ec_fsm_slave_conf_state_sdo_conf; fsm->sdodata = list_entry(fsm->slave->config->sdo_configs.next, ec_sdo_data_t, list); ec_fsm_coe_download(&fsm->fsm_coe, fsm->slave, fsm->sdodata); @@ -901,10 +901,10 @@ /*****************************************************************************/ /** - Slave configuration state: SDOCONF. -*/ - -void ec_fsm_slave_conf_state_sdoconf( + Slave configuration state: SDO_CONF. +*/ + +void ec_fsm_slave_conf_state_sdo_conf( ec_fsm_slave_t *fsm /**< slave state machine */ ) { @@ -928,16 +928,16 @@ } // All SDOs are now configured. - ec_fsm_slave_conf_enter_mapconf(fsm); -} - -/*****************************************************************************/ - -/** - * Check for alternative PDO mappings to be applied. + ec_fsm_slave_conf_enter_mapping(fsm); +} + +/*****************************************************************************/ + +/** + * Check for PDO mappings to be applied. */ -void ec_fsm_slave_conf_enter_mapconf( +void ec_fsm_slave_conf_enter_mapping( ec_fsm_slave_t *fsm /**< slave state machine */ ) { @@ -950,7 +950,7 @@ } // start configuring PDO mapping - fsm->state = ec_fsm_slave_conf_state_mapconf; + fsm->state = ec_fsm_slave_conf_state_mapping; ec_fsm_mapping_start(&fsm->fsm_map, fsm->slave); ec_fsm_mapping_exec(&fsm->fsm_map); // execute immediately } @@ -958,10 +958,10 @@ /*****************************************************************************/ /** - Slave configuration state: MAPCONF. -*/ - -void ec_fsm_slave_conf_state_mapconf( + Slave configuration state: MAPPING. +*/ + +void ec_fsm_slave_conf_state_mapping( ec_fsm_slave_t *fsm /**< slave state machine */ ) {