# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1275858990 -7200
# Node ID f9204699e7995a65d1f550aa9a0123cdb102ca5e
# Parent  73896ef6d0773037675348d713af0baa92a40b67
Incremented ioctl interface version; Minor changes.

diff -r 73896ef6d077 -r f9204699e799 lib/slave_config.c
--- a/lib/slave_config.c	Sun Jun 06 22:40:22 2010 +0200
+++ b/lib/slave_config.c	Sun Jun 06 23:16:30 2010 +0200
@@ -473,13 +473,13 @@
 /*****************************************************************************/
 
 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 -r 73896ef6d077 -r f9204699e799 master/cdev.c
--- a/master/cdev.c	Sun Jun 06 22:40:22 2010 +0200
+++ b/master/cdev.c	Sun Jun 06 23:16:30 2010 +0200
@@ -2463,7 +2463,8 @@
 
     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 -r 73896ef6d077 -r f9204699e799 master/ioctl.h
--- a/master/ioctl.h	Sun Jun 06 22:40:22 2010 +0200
+++ b/master/ioctl.h	Sun Jun 06 23:16:30 2010 +0200
@@ -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 @@
     // 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;