diff -r 399ef727bf62 -r e206f4485f60 master/fsm_slave_config.c --- a/master/fsm_slave_config.c Mon Dec 29 14:10:27 2008 +0000 +++ b/master/fsm_slave_config.c Mon Dec 29 15:19:16 2008 +0000 @@ -74,7 +74,7 @@ ec_datagram_t *datagram, /**< datagram structure to use */ ec_fsm_change_t *fsm_change, /**< State change state machine to use. */ ec_fsm_coe_t *fsm_coe, /**< CoE state machine to use. */ - ec_fsm_pdo_t *fsm_pdo /**< Pdo configuration state machine to use. */ + ec_fsm_pdo_t *fsm_pdo /**< PDO configuration state machine to use. */ ) { ec_sdo_request_init(&fsm->request_copy); @@ -437,7 +437,7 @@ /*****************************************************************************/ -/** Check for Sdo configurations to be applied. +/** Check for SDO configurations to be applied. */ void ec_fsm_slave_config_enter_sdo_conf( ec_fsm_slave_config_t *fsm /**< slave state machine */ @@ -446,12 +446,12 @@ ec_slave_t *slave = fsm->slave; // No CoE configuration to be applied? - if (list_empty(&slave->config->sdo_configs)) { // skip Sdo configuration + if (list_empty(&slave->config->sdo_configs)) { // skip SDO configuration ec_fsm_slave_config_enter_pdo_conf(fsm); return; } - // start Sdo configuration + // start SDO configuration fsm->state = ec_fsm_slave_config_state_sdo_conf; fsm->request = list_entry(fsm->slave->config->sdo_configs.next, ec_sdo_request_t, list); @@ -472,7 +472,7 @@ if (ec_fsm_coe_exec(fsm->fsm_coe)) return; if (!ec_fsm_coe_success(fsm->fsm_coe)) { - EC_ERR("Sdo configuration failed for slave %u.\n", + EC_ERR("SDO configuration failed for slave %u.\n", fsm->slave->ring_position); fsm->slave->error_flag = 1; fsm->state = ec_fsm_slave_config_state_error; @@ -484,7 +484,7 @@ return; } - // Another Sdo to configure? + // Another SDO to configure? if (fsm->request->list.next != &fsm->slave->config->sdo_configs) { fsm->request = list_entry(fsm->request->list.next, ec_sdo_request_t, list); @@ -495,7 +495,7 @@ return; } - // All Sdos are now configured. + // All SDOs are now configured. ec_fsm_slave_config_enter_pdo_conf(fsm); } @@ -507,7 +507,7 @@ ec_fsm_slave_config_t *fsm /**< slave state machine */ ) { - // Start configuring Pdos + // Start configuring PDOs ec_fsm_pdo_start_configuration(fsm->fsm_pdo, fsm->slave); fsm->state = ec_fsm_slave_config_state_pdo_conf; fsm->state(fsm); // execute immediately @@ -530,7 +530,7 @@ } if (!ec_fsm_pdo_success(fsm->fsm_pdo)) { - EC_WARN("Pdo configuration failed on slave %u.\n", + EC_WARN("PDO configuration failed on slave %u.\n", fsm->slave->ring_position); } @@ -539,7 +539,7 @@ /*****************************************************************************/ -/** Check for Pdo sync managers to be configured. +/** Check for PDO sync managers to be configured. */ void ec_fsm_slave_config_enter_pdo_sync( ec_fsm_slave_config_t *fsm /**< slave state machine */ @@ -560,7 +560,7 @@ } if (slave->sii.sync_count <= offset) { - // no Pdo sync managers to configure + // no PDO sync managers to configure ec_fsm_slave_config_enter_fmmu(fsm); return; } @@ -588,7 +588,7 @@ /*****************************************************************************/ -/** Configure Pdo sync managers. +/** Configure PDO sync managers. */ void ec_fsm_slave_config_state_pdo_sync( ec_fsm_slave_config_t *fsm /**< slave state machine */ @@ -662,7 +662,7 @@ if (!(sync = ec_slave_get_sync(slave, fmmu->sync_index))) { slave->error_flag = 1; fsm->state = ec_fsm_slave_config_state_error; - EC_ERR("Failed to determine Pdo sync manager for FMMU on slave" + EC_ERR("Failed to determine PDO sync manager for FMMU on slave" " %u!\n", slave->ring_position); return; }