Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-21 01:23:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check for data sizes when reading Pdo assignment/mapping from CoE.

Browse Source
This commit is contained in:
Florian Pose
2008-06-19 08:06:49 +00:00
parent 10ce3ceda1
commit 4a6d031f92
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO
+2 -1
View File
@@ -14,9 +14,10 @@ Version 1.4.0:
* Adapt remaining examples.
* READMEs for examples.
* Update documentation.
* Check for sizes of uploaded Sdos when reading mapping from CoE.
* Attach Pdo names from SII or Coe dictioary to Pdos read via CoE.
* Add a -n (numeric) switch to ethercat command.
* Remove Eoe cylces and Idle cycles.
* Store Sdo abort code in sdo_request_t and output it in user space.
Future issues:
master/fsm_coe_map.c
+32 -1
View File
@@ -216,6 +216,14 @@ void ec_fsm_coe_map_state_pdo_count(
return;
}
if (fsm->request.data_size != sizeof(uint8_t)) {
EC_ERR("Invalid data size %u returned when uploading Sdo 0x%04X:%02X "
"from slave %u.\n", fsm->request.data_size,
fsm->request.index, fsm->request.subindex,
fsm->slave->ring_position);
fsm->state = ec_fsm_coe_map_state_error;
return;
}
fsm->sync_subindices = EC_READ_U8(fsm->request.data);
if (fsm->slave->master->debug_level)
@@ -280,6 +288,15 @@ void ec_fsm_coe_map_state_pdo(
return;
}
if (fsm->request.data_size != sizeof(uint16_t)) {
EC_ERR("Invalid data size %u returned when uploading Sdo 0x%04X:%02X "
"from slave %u.\n", fsm->request.data_size,
fsm->request.index, fsm->request.subindex,
fsm->slave->ring_position);
fsm->state = ec_fsm_coe_map_state_error;
return;
}
if (!(fsm->pdo = (ec_pdo_t *)
kmalloc(sizeof(ec_pdo_t), GFP_KERNEL))) {
EC_ERR("Failed to allocate Pdo.\n");
@@ -323,6 +340,14 @@ void ec_fsm_coe_map_state_pdo_entry_count(
return;
}
if (fsm->request.data_size != sizeof(uint8_t)) {
EC_ERR("Invalid data size %u returned when uploading Sdo 0x%04X:%02X "
"from slave %u.\n", fsm->request.data_size,
fsm->request.index, fsm->request.subindex,
fsm->slave->ring_position);
fsm->state = ec_fsm_coe_map_state_error;
return;
}
fsm->pdo_subindices = EC_READ_U8(fsm->request.data);
if (fsm->slave->master->debug_level)
@@ -377,7 +402,13 @@ void ec_fsm_coe_map_state_pdo_entry(
return;
}
{
if (fsm->request.data_size != sizeof(uint32_t)) {
EC_ERR("Invalid data size %u returned when uploading Sdo 0x%04X:%02X "
"from slave %u.\n", fsm->request.data_size,
fsm->request.index, fsm->request.subindex,
fsm->slave->ring_position);
fsm->state = ec_fsm_coe_map_state_error;
} else {
uint32_t pdo_entry_info;
ec_pdo_entry_t *pdo_entry;