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

Incremented ioctl interface version; Minor changes.

This commit is contained in:
Florian Pose 2010-06-06 23:16:30 +02:00
parent 26d4687d0e
commit 5c131113dd
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/slave_config.c
View File

@ -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;

3
master/cdev.c
View File

@ -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;
}

4
master/ioctl.h
View File

@ -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;