bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed fsm->sdodata to fsm->coe_sdodata

This commit is contained in:
Florian Pose 2006-10-17 14:22:19 +00:00
parent 9c7dd75ed9
commit 900cc231e3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
master/fsm.c
View File

@ -1423,7 +1423,7 @@ void ec_fsm_slaveconf_preop(ec_fsm_t *fsm /**< finite state machine */)
return;
}
fsm->slave_state = ec_fsm_slaveconf_sdoconf;
fsm->sdodata = list_entry(slave->sdo_confs.next, ec_sdo_data_t, list);
fsm->coe_sdodata = list_entry(slave->sdo_confs.next, ec_sdo_data_t, list);
fsm->coe_state = ec_fsm_coe_down_start;
fsm->coe_state(fsm); // execute immediately
return;
@ -1473,7 +1473,7 @@ void ec_fsm_slaveconf_fmmu(ec_fsm_t *fsm /**< finite state machine */)
}
fsm->slave_state = ec_fsm_slaveconf_sdoconf;
fsm->sdodata = list_entry(slave->sdo_confs.next, ec_sdo_data_t, list);
fsm->coe_sdodata = list_entry(slave->sdo_confs.next, ec_sdo_data_t, list);
fsm->coe_state = ec_fsm_coe_down_start;
fsm->coe_state(fsm); // execute immediately
}
@ -1497,9 +1497,9 @@ void ec_fsm_slaveconf_sdoconf(ec_fsm_t *fsm /**< finite state machine */)
if (fsm->coe_state != ec_fsm_end) return;
// Another SDO to configure?
if (fsm->sdodata->list.next != &fsm->slave->sdo_confs) {
fsm->sdodata = list_entry(fsm->sdodata->list.next,
ec_sdo_data_t, list);
if (fsm->coe_sdodata->list.next != &fsm->slave->sdo_confs) {
fsm->coe_sdodata = list_entry(fsm->coe_sdodata->list.next,
ec_sdo_data_t, list);
fsm->coe_state = ec_fsm_coe_down_start;
fsm->coe_state(fsm); // execute immediately
return;
@ -2072,7 +2072,7 @@ void ec_fsm_coe_down_start(ec_fsm_t *fsm /**< finite state machine */)
{
ec_datagram_t *datagram = &fsm->datagram;
ec_slave_t *slave = fsm->slave;
ec_sdo_data_t *sdodata = fsm->sdodata;
ec_sdo_data_t *sdodata = fsm->coe_sdodata;
uint8_t *data;
EC_INFO("Downloading SDO 0x%04X:%i to slave %i.\n",
@ -2177,7 +2177,7 @@ void ec_fsm_coe_down_response(ec_fsm_t *fsm /**< finite state machine */)
ec_slave_t *slave = fsm->slave;
uint8_t *data, mbox_prot;
size_t rec_size;
ec_sdo_data_t *sdodata = fsm->sdodata;
ec_sdo_data_t *sdodata = fsm->coe_sdodata;
if (datagram->state != EC_DATAGRAM_RECEIVED
|| datagram->working_counter != 1) {

2
master/fsm.h
View File

@ -80,7 +80,7 @@ struct ec_fsm
uint8_t change_take_time; /**< take sending timestamp */
void (*coe_state)(ec_fsm_t *); /**< CoE state function */
ec_sdo_data_t *sdodata; /**< input/output: SDO data object */
ec_sdo_data_t *coe_sdodata; /**< input/output: SDO data object */
cycles_t coe_start; /**< CoE timestamp */
};