# HG changeset patch # User Florian Pose # Date 1205837370 0 # Node ID c5df898a3618c92af703d4c0a316b8c0dbd38272 # Parent 022f869ea40feb4a1f5e9d362d094e4a9f558455 Fixed access to data pointers in Pdo config and Pdo mapping FSM's. diff -r 022f869ea40f -r c5df898a3618 master/fsm_pdo_config.c --- a/master/fsm_pdo_config.c Tue Mar 18 10:48:55 2008 +0000 +++ b/master/fsm_pdo_config.c Tue Mar 18 10:49:30 2008 +0000 @@ -211,7 +211,7 @@ } // set mapped Pdo count to zero - EC_WRITE_U8(&fsm->request.data, 0); + EC_WRITE_U8(fsm->request.data, 0); fsm->request.data_size = 1; ec_sdo_request_address(&fsm->request, fsm->pdo->index, 0); ecrt_sdo_request_write(&fsm->request); @@ -251,7 +251,7 @@ value = fsm->entry->index << 16 | fsm->entry->subindex << 8 | fsm->entry->bit_length; - EC_WRITE_U32(&fsm->request.data, value); + EC_WRITE_U32(fsm->request.data, value); fsm->request.data_size = 4; ec_sdo_request_address(&fsm->request, fsm->pdo->index, fsm->entry_count); ecrt_sdo_request_write(&fsm->request); @@ -317,7 +317,7 @@ // find next entry if (!(fsm->entry = ec_fsm_pdo_config_next_entry(fsm, &fsm->entry->list))) { // No more entries to add. Write entry count. - EC_WRITE_U8(&fsm->request.data, fsm->entry_count); + EC_WRITE_U8(fsm->request.data, fsm->entry_count); fsm->request.data_size = 1; ec_sdo_request_address(&fsm->request, fsm->pdo->index, 0); ecrt_sdo_request_write(&fsm->request); diff -r 022f869ea40f -r c5df898a3618 master/fsm_pdo_mapping.c --- a/master/fsm_pdo_mapping.c Tue Mar 18 10:48:55 2008 +0000 +++ b/master/fsm_pdo_mapping.c Tue Mar 18 10:49:30 2008 +0000 @@ -202,7 +202,7 @@ } // set mapped Pdo count to zero - EC_WRITE_U8(&fsm->request.data, 0); // zero Pdos mapped + EC_WRITE_U8(fsm->request.data, 0); // zero Pdos mapped fsm->request.data_size = 1; ec_sdo_request_address(&fsm->request, 0x1C10 + fsm->sync->index, 0); ecrt_sdo_request_write(&fsm->request); @@ -244,7 +244,7 @@ ec_fsm_pdo_mapping_t *fsm /**< mapping state machine */ ) { - EC_WRITE_U16(&fsm->request.data, fsm->pdo->index); + EC_WRITE_U16(fsm->request.data, fsm->pdo->index); fsm->request.data_size = 2; ec_sdo_request_address(&fsm->request, 0x1C10 + fsm->sync->index, fsm->pdo_count); @@ -311,7 +311,7 @@ // find next Pdo if (!(fsm->pdo = ec_fsm_pdo_mapping_next_pdo(fsm, &fsm->pdo->list))) { // no more Pdos to map. write Pdo count - EC_WRITE_U8(&fsm->request.data, fsm->pdo_count); + EC_WRITE_U8(fsm->request.data, fsm->pdo_count); fsm->request.data_size = 1; ec_sdo_request_address(&fsm->request, 0x1C10 + fsm->sync->index, 0); ecrt_sdo_request_write(&fsm->request);