etherlabmaster: comparison master/fsm

equal deleted inserted replaced

-:3d5cd81674bd
+:7ba5f9cd8f7e
 #include "master.h"
 #include "fsm_sii.h"
 /*****************************************************************************/
-void ec_fsm_sii_start_reading(ec_fsm_sii_t *);
+void ec_fsm_sii_state_start_reading(ec_fsm_sii_t *);
-void ec_fsm_sii_read_check(ec_fsm_sii_t *);
+void ec_fsm_sii_state_read_check(ec_fsm_sii_t *);
-void ec_fsm_sii_read_fetch(ec_fsm_sii_t *);
+void ec_fsm_sii_state_read_fetch(ec_fsm_sii_t *);
-void ec_fsm_sii_start_writing(ec_fsm_sii_t *);
+void ec_fsm_sii_state_start_writing(ec_fsm_sii_t *);
-void ec_fsm_sii_write_check(ec_fsm_sii_t *);
+void ec_fsm_sii_state_write_check(ec_fsm_sii_t *);
-void ec_fsm_sii_write_check2(ec_fsm_sii_t *);
+void ec_fsm_sii_state_write_check2(ec_fsm_sii_t *);
-void ec_fsm_sii_end(ec_fsm_sii_t *);
+void ec_fsm_sii_state_end(ec_fsm_sii_t *);
-void ec_fsm_sii_error(ec_fsm_sii_t *);
+void ec_fsm_sii_state_error(ec_fsm_sii_t *);
 /*****************************************************************************/
 /**
 Constructor.
 ec_slave_t *slave, /**< slave to read from */
 uint16_t offset, /**< offset to read from */
 ec_fsm_sii_addressing_t mode /**< addressing scheme */
 )
 {
-fsm->state = ec_fsm_sii_start_reading;
+fsm->state = ec_fsm_sii_state_start_reading;
 fsm->slave = slave;
 fsm->offset = offset;
 fsm->mode = mode;
 }
 uint16_t offset, /**< offset to read from */
 const uint16_t *value, /**< pointer to 2 bytes of data */
 ec_fsm_sii_addressing_t mode /**< addressing scheme */
 )
 {
-fsm->state = ec_fsm_sii_start_writing;
+fsm->state = ec_fsm_sii_state_start_writing;
 fsm->slave = slave;
 fsm->offset = offset;
 fsm->mode = mode;
 memcpy(fsm->value, value, 2);
 }
 int ec_fsm_sii_exec(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 fsm->state(fsm);
-return fsm->state != ec_fsm_sii_end && fsm->state != ec_fsm_sii_error;
+return fsm->state != ec_fsm_sii_state_end && fsm->state != ec_fsm_sii_state_error;
 }
 /*****************************************************************************/
 /**
 \return non-zero if successful.
 */
 int ec_fsm_sii_success(ec_fsm_sii_t *fsm /**< Finite state machine */)
 {
-return fsm->state == ec_fsm_sii_end;
+return fsm->state == ec_fsm_sii_state_end;
 }
 /******************************************************************************
 *  SII state machine
 *****************************************************************************/
 /**
 SII state: START READING.
 Starts reading the slave information interface.
 */
-void ec_fsm_sii_start_reading(ec_fsm_sii_t *fsm /**< finite state machine */)
+void ec_fsm_sii_state_start_reading(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 ec_datagram_t *datagram = fsm->datagram;
 // initiate read operation
 switch (fsm->mode) {
 EC_WRITE_U8 (datagram->data,     0x00); // read-only access
 EC_WRITE_U8 (datagram->data + 1, 0x01); // request read operation
 EC_WRITE_U16(datagram->data + 2, fsm->offset);
 fsm->retries = EC_FSM_RETRIES;
-fsm->state = ec_fsm_sii_read_check;
+fsm->state = ec_fsm_sii_state_read_check;
 }
 /*****************************************************************************/
 /**
 SII state: READ CHECK.
 Checks, if the SII-read-datagram has been sent and issues a fetch datagram.
 */
-void ec_fsm_sii_read_check(ec_fsm_sii_t *fsm /**< finite state machine */)
+void ec_fsm_sii_state_read_check(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 ec_datagram_t *datagram = fsm->datagram;
 if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--)
 return;
 if (datagram->state != EC_DATAGRAM_RECEIVED) {
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 EC_ERR("Failed to receive SII read datagram from slave %i"
 " (datagram state %i).\n",
 fsm->slave->ring_position, datagram->state);
 return;
 }
 if (datagram->working_counter != 1) {
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 EC_ERR("Reception of SII read datagram failed on slave %i: ",
 fsm->slave->ring_position);
 ec_datagram_print_wc_error(datagram);
 return;
 }
 ec_datagram_nprd(datagram, fsm->slave->station_address, 0x502, 10);
 break;
 }
 fsm->retries = EC_FSM_RETRIES;
-fsm->state = ec_fsm_sii_read_fetch;
+fsm->state = ec_fsm_sii_state_read_fetch;
 }
 /*****************************************************************************/
 /**
 SII state: READ FETCH.
 Fetches the result of an SII-read datagram.
 */
-void ec_fsm_sii_read_fetch(ec_fsm_sii_t *fsm /**< finite state machine */)
+void ec_fsm_sii_state_read_fetch(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 ec_datagram_t *datagram = fsm->datagram;
 if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--)
 return;
 if (datagram->state != EC_DATAGRAM_RECEIVED) {
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 EC_ERR("Failed to receive SII check/fetch datagram from slave %i"
 " (datagram state %i).\n",
 fsm->slave->ring_position, datagram->state);
 return;
 }
 if (datagram->working_counter != 1) {
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 EC_ERR("Reception of SII check/fetch datagram failed on slave %i: ",
 fsm->slave->ring_position);
 ec_datagram_print_wc_error(datagram);
 return;
 }
 // still busy... timeout?
 if (datagram->cycles_received
 - fsm->cycles_start >= (cycles_t) 10 * cpu_khz) {
 if (!fsm->check_once_more) {
 EC_ERR("SII: Read timeout.\n");
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 #if 0
 EC_DBG("SII busy: %02X %02X %02X %02X\n",
 EC_READ_U8(datagram->data + 0),
 EC_READ_U8(datagram->data + 1),
 EC_READ_U8(datagram->data + 2),
 EC_READ_U8(datagram->data + 8), EC_READ_U8(datagram->data + 9));
 #endif
 // SII value received.
 memcpy(fsm->value, datagram->data + 6, 4);
-fsm->state = ec_fsm_sii_end;
+fsm->state = ec_fsm_sii_state_end;
 }
 /*****************************************************************************/
 /**
 SII state: START WRITING.
 Starts reading the slave information interface.
 */
-void ec_fsm_sii_start_writing(ec_fsm_sii_t *fsm /**< finite state machine */)
+void ec_fsm_sii_state_start_writing(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 ec_datagram_t *datagram = fsm->datagram;
 // initiate write operation
 ec_datagram_npwr(datagram, fsm->slave->station_address, 0x502, 8);
 EC_WRITE_U8 (datagram->data + 1, 0x02); // request write operation
 EC_WRITE_U32(datagram->data + 2, fsm->offset);
 memcpy(datagram->data + 6, fsm->value, 2);
 fsm->retries = EC_FSM_RETRIES;
-fsm->state = ec_fsm_sii_write_check;
+fsm->state = ec_fsm_sii_state_write_check;
 }
 /*****************************************************************************/
 /**
 SII state: WRITE CHECK.
 */
-void ec_fsm_sii_write_check(ec_fsm_sii_t *fsm /**< finite state machine */)
+void ec_fsm_sii_state_write_check(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 ec_datagram_t *datagram = fsm->datagram;
 if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--)
 return;
 if (datagram->state != EC_DATAGRAM_RECEIVED) {
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 EC_ERR("Failed to receive SII write datagram for slave %i"
 " (datagram state %i).\n",
 fsm->slave->ring_position, datagram->state);
 return;
 }
 if (datagram->working_counter != 1) {
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 EC_ERR("Reception of SII write datagram failed on slave %i: ",
 fsm->slave->ring_position);
 ec_datagram_print_wc_error(datagram);
 return;
 }
 fsm->check_once_more = 1;
 // issue check/fetch datagram
 ec_datagram_nprd(datagram, fsm->slave->station_address, 0x502, 2);
 fsm->retries = EC_FSM_RETRIES;
-fsm->state = ec_fsm_sii_write_check2;
+fsm->state = ec_fsm_sii_state_write_check2;
 }
 /*****************************************************************************/
 /**
 SII state: WRITE CHECK 2.
 */
-void ec_fsm_sii_write_check2(ec_fsm_sii_t *fsm /**< finite state machine */)
+void ec_fsm_sii_state_write_check2(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 ec_datagram_t *datagram = fsm->datagram;
 if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--)
 return;
 if (datagram->state != EC_DATAGRAM_RECEIVED) {
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 EC_ERR("Failed to receive SII write check datagram from slave %i"
 " (datagram state %i).\n",
 fsm->slave->ring_position, datagram->state);
 return;
 }
 if (datagram->working_counter != 1) {
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 EC_ERR("Reception of SII write check datagram failed on slave %i: ",
 fsm->slave->ring_position);
 ec_datagram_print_wc_error(datagram);
 return;
 }
 // still busy... timeout?
 if (datagram->cycles_received
 - fsm->cycles_start >= (cycles_t) 10 * cpu_khz) {
 if (!fsm->check_once_more) {
 EC_ERR("SII: Write timeout.\n");
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 return;
 }
 fsm->check_once_more = 0;
 }
 return;
 }
 if (EC_READ_U8(datagram->data + 1) & 0x40) {
 EC_ERR("SII: Write operation failed!\n");
-fsm->state = ec_fsm_sii_error;
+fsm->state = ec_fsm_sii_state_error;
 return;
 }
 // success
-fsm->state = ec_fsm_sii_end;
+fsm->state = ec_fsm_sii_state_end;
 }
 /*****************************************************************************/
 /**
 State: ERROR.
 */
-void ec_fsm_sii_error(ec_fsm_sii_t *fsm /**< finite state machine */)
+void ec_fsm_sii_state_error(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 }
 /*****************************************************************************/
 /**
 State: END.
 */
-void ec_fsm_sii_end(ec_fsm_sii_t *fsm /**< finite state machine */)
+void ec_fsm_sii_state_end(ec_fsm_sii_t *fsm /**< finite state machine */)
 {
 }
 /*****************************************************************************/

changeset 753	7ba5f9cd8f7e
parent 713	ae41cadd25b6
child 754	0b47b49c5976