etherlabmaster: comparison master/fsm

equal deleted inserted replaced

-:bfc3f1ab52de
+:a51f857b1b2d
 }
 /*****************************************************************************/
 /**
-* Check for SDO configurations to be applied.
+* Check for Sdo configurations to be applied.
 */
 void ec_fsm_slave_conf_enter_sdo_conf(ec_fsm_slave_t *fsm /**< slave state machine */)
 {
 ec_slave_t *slave = fsm->slave;
 ec_fsm_slave_conf_enter_safeop(fsm);
 return;
 }
 // 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_conf_enter_mapping(fsm);
 return;
 }
-// start SDO configuration
+// start Sdo configuration
 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);
 ec_fsm_coe_exec(&fsm->fsm_coe); // execute immediately
 )
 {
 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_state_error;
 return;
 }
-// Another SDO to configure?
+// Another Sdo to configure?
 if (fsm->sdodata->list.next != &fsm->slave->config->sdo_configs) {
 fsm->sdodata =
 list_entry(fsm->sdodata->list.next, ec_sdo_data_t, list);
 ec_fsm_coe_download(&fsm->fsm_coe, fsm->slave, fsm->sdodata);
 ec_fsm_coe_exec(&fsm->fsm_coe); // execute immediately
 return;
 }
-// All SDOs are now configured.
+// All Sdos are now configured.
 ec_fsm_slave_conf_enter_mapping(fsm);
 }
 /*****************************************************************************/
 /**
-* Check for PDO mappings to be applied.
+* Check for Pdo mappings to be applied.
 */
 void ec_fsm_slave_conf_enter_mapping(
 ec_fsm_slave_t *fsm /**< slave state machine */
 )
 {
-// start configuring PDO mapping
+// start configuring Pdo mapping
 fsm->state = ec_fsm_slave_conf_state_mapping;
 ec_fsm_pdo_mapping_start(&fsm->fsm_pdo_map, fsm->slave);
 ec_fsm_pdo_mapping_exec(&fsm->fsm_pdo_map); // execute immediately
 }
 )
 {
 if (ec_fsm_pdo_mapping_exec(&fsm->fsm_pdo_map)) return;
 if (!ec_fsm_pdo_mapping_success(&fsm->fsm_pdo_map)) {
-EC_ERR("PDO mapping configuration failed for slave %u.\n",
+EC_ERR("Pdo mapping configuration failed for slave %u.\n",
 fsm->slave->ring_position);
 fsm->slave->error_flag = 1;
 fsm->state = ec_fsm_slave_state_error;
 return;
 }
 }
 /*****************************************************************************/
 /**
-* Check for PDO sync managers to be configured.
+* Check for Pdo sync managers to be configured.
 */
 void ec_fsm_slave_conf_enter_pdo_sync(
 ec_fsm_slave_t *fsm /**< slave state machine */
 )
 }
 /*****************************************************************************/
 /**
-* Configure PDO sync managers.
+* Configure Pdo sync managers.
 */
 void ec_fsm_slave_conf_state_pdo_sync(ec_fsm_slave_t *fsm /**< slave state machine */)
 {
 ec_datagram_t *datagram = fsm->datagram;
 memset(datagram->data, 0x00, EC_FMMU_PAGE_SIZE * slave->base_fmmu_count);
 for (i = 0; i < slave->config->used_fmmus; i++) {
 fmmu = &slave->config->fmmu_configs[i];
 if (!(sync = ec_slave_get_pdo_sync(slave, fmmu->dir))) {
 fsm->state = ec_fsm_slave_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;
 }
 ec_fmmu_config_page(fmmu, sync,
 datagram->data + EC_FMMU_PAGE_SIZE * i);

changeset 814	a51f857b1b2d
parent 813	bfc3f1ab52de
child 815	002fe9ec778f