diff --git a/lib/slave_config.c b/lib/slave_config.c index 5eaf416c7cdbd05c8aa39cc4291d82ab4b89e715..49ce635b4fcb85bc0bb17e6985878bad3c2310d3 100644 --- a/lib/slave_config.c +++ b/lib/slave_config.c @@ -473,13 +473,13 @@ void ecrt_slave_config_state(const ec_slave_config_t *sc, /*****************************************************************************/ int ecrt_slave_config_idn(ec_slave_config_t *sc, uint16_t idn, - ec_al_state_t state, const uint8_t *data, size_t size) + ec_al_state_t al_state, const uint8_t *data, size_t size) { ec_ioctl_sc_idn_t io; io.config_index = sc->index; io.idn = idn; - io.state = state; + io.al_state = al_state; io.data = data; io.size = size; diff --git a/master/cdev.c b/master/cdev.c index 49deddd7504f73697127cb0d5cc30842df42b710..167a83de4761eea88487984503fc508157e09d70 100644 --- a/master/cdev.c +++ b/master/cdev.c @@ -2463,7 +2463,8 @@ int ec_cdev_ioctl_sc_idn( up(&master->master_sem); // FIXME - ret = ecrt_slave_config_idn(sc, ioctl.idn, ioctl.state, data, ioctl.size); + ret = ecrt_slave_config_idn( + sc, ioctl.idn, ioctl.al_state, data, ioctl.size); kfree(data); return ret; } diff --git a/master/ioctl.h b/master/ioctl.h index d21a67854829075aa9af7302527702ec3a1c0e16..2606822a038b95383cd8ae86664928aa3ddee0f6 100644 --- a/master/ioctl.h +++ b/master/ioctl.h @@ -56,7 +56,7 @@ * * Increment this when changing the ioctl interface! */ -#define EC_IOCTL_VERSION_MAGIC 5 +#define EC_IOCTL_VERSION_MAGIC 6 // Command-line tool #define EC_IOCTL_MODULE EC_IOR(0x00, ec_ioctl_module_t) @@ -583,7 +583,7 @@ typedef struct { // inputs uint32_t config_index; uint16_t idn; - ec_al_state_t state; + ec_al_state_t al_state; const uint8_t *data; size_t size; } ec_ioctl_sc_idn_t;