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

Fixed 2 bugs in new Pdo mapping function.

This commit is contained in:
Florian Pose 2008-02-28 15:28:10 +00:00
parent 7338f88b5f
commit f8dfda2b19
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ecrt.h
View File

@ -453,8 +453,8 @@ int ecrt_slave_config_pdo_entry(
*/
int ecrt_slave_config_mapping(
ec_slave_config_t *sc, /**< Slave configuration. */
unsigned int n_entries, /**< Number of Pdos in \a pdos to map. */
const ec_pdo_info_t pdos[] /**< List with Pdo mapping. */
unsigned int n_infos, /**< Number of Pdo infos in \a pdo_infos. */
const ec_pdo_info_t pdo_infos[] /**< List with Pdo mapping. */
);
/** Registers a Pdo entry for process data exchange in a domain.

4
master/pdo_mapping.c
View File

@ -122,8 +122,8 @@ uint16_t ec_pdo_mapping_total_size(
*/
ec_pdo_t *ec_pdo_mapping_add_pdo(
ec_pdo_mapping_t *pm, /**< Pdo mapping. */
uint16_t index, /**< Pdo index. */
ec_direction_t dir /**< Direction. */
ec_direction_t dir, /**< Direction. */
uint16_t index /**< Pdo index. */
)
{
ec_pdo_t *pdo;

4
master/pdo_mapping.h
View File

@ -64,8 +64,8 @@ void ec_pdo_mapping_clear(ec_pdo_mapping_t *);
void ec_pdo_mapping_clear_pdos(ec_pdo_mapping_t *);
ec_pdo_t *ec_pdo_mapping_add_pdo(ec_pdo_mapping_t *, uint16_t,
ec_direction_t);
ec_pdo_t *ec_pdo_mapping_add_pdo(ec_pdo_mapping_t *, ec_direction_t,
uint16_t);
int ec_pdo_mapping_add_pdo_copy(ec_pdo_mapping_t *, const ec_pdo_t *);
int ec_pdo_mapping_copy(ec_pdo_mapping_t *, const ec_pdo_mapping_t *);

15
master/slave_config.c
View File

@ -512,7 +512,7 @@ int ecrt_slave_config_pdo(ec_slave_config_t *sc, ec_direction_t dir,
EC_DBG("Adding Pdo 0x%04X to mapping for dir %u, config %u:%u.\n",
index, dir, sc->alias, sc->position);
if (!(pdo = ec_pdo_mapping_add_pdo(pm, index, dir)))
if (!(pdo = ec_pdo_mapping_add_pdo(pm, dir, index)))
return -1;
ec_slave_config_load_default_pdo_config(sc, pdo);
@ -557,16 +557,16 @@ int ecrt_slave_config_pdo_entry(ec_slave_config_t *sc, uint16_t pdo_index,
/*****************************************************************************/
int ecrt_slave_config_mapping(ec_slave_config_t *sc, unsigned int n_entries,
int ecrt_slave_config_mapping(ec_slave_config_t *sc, unsigned int n_infos,
const ec_pdo_info_t pdo_infos[])
{
unsigned int i;
unsigned int i, j;
const ec_pdo_info_t *pi;
ec_pdo_mapping_t *pm;
ec_pdo_t *pdo;
const ec_pdo_entry_info_t *ei;
for (i = 0; i < n_entries; i++) {
for (i = 0; i < n_infos; i++) {
pi = &pdo_infos[i];
pm = &sc->mapping[pi->dir];
@ -579,7 +579,8 @@ int ecrt_slave_config_mapping(ec_slave_config_t *sc, unsigned int n_entries,
}
if (sc->master->debug_level)
EC_DBG("Adding Pdo 0x%04X to mapping.\n", pi->index);
EC_DBG("Adding Pdo 0x%04X to mapping for dir %u, config %u:%u.\n",
pi->index, pi->dir, sc->alias, sc->position);
if (!(pdo = ec_pdo_mapping_add_pdo(pm, pi->dir, pi->index)))
return -1;
@ -588,8 +589,8 @@ int ecrt_slave_config_mapping(ec_slave_config_t *sc, unsigned int n_entries,
if (sc->master->debug_level)
EC_DBG(" Pdo configuration information provided.\n");
for (i = 0; i < pi->n_entries; i++) {
ei = &pi->entries[i];
for (j = 0; j < pi->n_entries; j++) {
ei = &pi->entries[j];
if (!ec_pdo_add_entry(pdo, ei->index, ei->subindex,
ei->bit_length))
return -1;