diff -r 19248bbf9308 -r 92266462d411 master/fsm_coe_map.c --- a/master/fsm_coe_map.c Fri Feb 29 08:27:17 2008 +0000 +++ b/master/fsm_coe_map.c Fri Feb 29 12:19:48 2008 +0000 @@ -41,7 +41,7 @@ #include "globals.h" #include "master.h" #include "mailbox.h" -#include "canopen.h" +#include "sdo_request.h" #include "fsm_coe_map.h" /*****************************************************************************/ @@ -179,7 +179,7 @@ ec_pdo_mapping_clear_pdos(&fsm->mapping); - ec_sdo_request_init_read(&fsm->request, slave, fsm->sync_sdo_index, 0); + ec_sdo_request_init(&fsm->request, slave, fsm->sync_sdo_index, 0); fsm->state = ec_fsm_coe_map_state_pdo_count; ec_fsm_coe_upload(fsm->fsm_coe, fsm->slave, &fsm->request); ec_fsm_coe_exec(fsm->fsm_coe); // execute immediately @@ -233,7 +233,7 @@ ) { if (fsm->sync_subindex <= fsm->sync_subindices) { - ec_sdo_request_init_read(&fsm->request, fsm->slave, + ec_sdo_request_init(&fsm->request, fsm->slave, fsm->sync_sdo_index, fsm->sync_subindex); fsm->state = ec_fsm_coe_map_state_pdo; ec_fsm_coe_upload(fsm->fsm_coe, fsm->slave, &fsm->request); @@ -290,7 +290,7 @@ list_add_tail(&fsm->pdo->list, &fsm->mapping.pdos); - ec_sdo_request_init_read(&fsm->request, fsm->slave, fsm->pdo->index, 0); + ec_sdo_request_init(&fsm->request, fsm->slave, fsm->pdo->index, 0); fsm->state = ec_fsm_coe_map_state_pdo_entry_count; ec_fsm_coe_upload(fsm->fsm_coe, fsm->slave, &fsm->request); ec_fsm_coe_exec(fsm->fsm_coe); // execute immediately @@ -336,7 +336,7 @@ ) { if (fsm->pdo_subindex <= fsm->pdo_subindices) { - ec_sdo_request_init_read(&fsm->request, fsm->slave, + ec_sdo_request_init(&fsm->request, fsm->slave, fsm->pdo->index, fsm->pdo_subindex); fsm->state = ec_fsm_coe_map_state_pdo_entry; ec_fsm_coe_upload(fsm->fsm_coe, fsm->slave, &fsm->request);