Renamed state sdodict to sdo_dictionary.
authorFlorian Pose <fp@igh-essen.com>
Fri, 25 Apr 2008 12:23:52 +0000
changeset 905 6d74ebc603ee
parent 904 ba6f222aa06e
child 906 f95e3e33c0cf
Renamed state sdodict to sdo_dictionary.
TODO
documentation/graphs/fsm_master.dot
master/fsm_master.c
--- a/TODO	Fri Apr 25 12:18:46 2008 +0000
+++ b/TODO	Fri Apr 25 12:23:52 2008 +0000
@@ -32,7 +32,6 @@
 * Implement ecrt_slave_config_state().
 * Add something like lsec -n to show numeric vendor IDs.
 * Remove the end state of the master state machine.
-* Rename the sdodict state to sdo_dictionary.
 * Check the position of the acknowledge state.
 * Remove the xmldev files.
 * Separate CoE debugging.
--- a/documentation/graphs/fsm_master.dot	Fri Apr 25 12:18:46 2008 +0000
+++ b/documentation/graphs/fsm_master.dot	Fri Apr 25 12:23:52 2008 +0000
@@ -27,7 +27,7 @@
 
     action_process_states -> action_configure
     action_process_states -> action_process_sdo
-    action_process_states -> sdodict
+    action_process_states -> sdo_dictionary
     action_process_states -> action_process_sii
     action_process_states -> end
 
@@ -54,8 +54,8 @@
     write_sii -> action_process_sii
     write_sii -> end
 
-    //sdodict -> error
-    sdodict -> end
+    //sdo_dictionary -> error
+    sdo_dictionary -> end
 
     //sdo_request -> error
     sdo_request -> action_process_sdo
--- a/master/fsm_master.c	Fri Apr 25 12:18:46 2008 +0000
+++ b/master/fsm_master.c	Fri Apr 25 12:23:52 2008 +0000
@@ -58,7 +58,7 @@
 void ec_fsm_master_state_clear_addresses(ec_fsm_master_t *);
 void ec_fsm_master_state_scan_slaves(ec_fsm_master_t *);
 void ec_fsm_master_state_write_sii(ec_fsm_master_t *);
-void ec_fsm_master_state_sdodict(ec_fsm_master_t *);
+void ec_fsm_master_state_sdo_dictionary(ec_fsm_master_t *);
 void ec_fsm_master_state_sdo_request(ec_fsm_master_t *);
 void ec_fsm_master_state_end(ec_fsm_master_t *);
 void ec_fsm_master_state_error(ec_fsm_master_t *);
@@ -533,7 +533,7 @@
                 || slave->error_flag) continue;
 
             if (master->debug_level) {
-                EC_DBG("Fetching Sdo dictionary from slave %i.\n",
+                EC_DBG("Fetching Sdo dictionary from slave %u.\n",
                        slave->ring_position);
             }
 
@@ -542,7 +542,7 @@
             // start fetching Sdo dictionary
             fsm->idle = 0;
             fsm->slave = slave;
-            fsm->state = ec_fsm_master_state_sdodict;
+            fsm->state = ec_fsm_master_state_sdo_dictionary;
             ec_fsm_coe_dictionary(&fsm->fsm_coe, slave);
             ec_fsm_coe_exec(&fsm->fsm_coe); // execute immediately
             return;
@@ -835,7 +835,9 @@
    Master state: SdoDICT.
 */
 
-void ec_fsm_master_state_sdodict(ec_fsm_master_t *fsm /**< master state machine */)
+void ec_fsm_master_state_sdo_dictionary(
+        ec_fsm_master_t *fsm /**< master state machine */
+        )
 {
     ec_slave_t *slave = fsm->slave;
     ec_master_t *master = fsm->master;