Minor 64bit improvements.
authorFlorian Pose <fp@igh-essen.com>
Mon, 25 Oct 2010 16:15:12 +0200
changeset 1972 c1b564299829
parent 1971 ba8a75cb1c98
child 1973 4d6774893746
Minor 64bit improvements.
master/cdev.c
master/ioctl.h
--- a/master/cdev.c	Mon Oct 25 15:56:19 2010 +0200
+++ b/master/cdev.c	Mon Oct 25 16:15:12 2010 +0200
@@ -3449,7 +3449,7 @@
 
     data = kmalloc(ioctl.data_size, GFP_KERNEL);
     if (!data) {
-        EC_MASTER_ERR(master, "Failed to allocate %u bytes of IDN data.\n",
+        EC_MASTER_ERR(master, "Failed to allocate %zu bytes of IDN data.\n",
                 ioctl.data_size);
         return -ENOMEM;
     }
--- a/master/ioctl.h	Mon Oct 25 15:56:19 2010 +0200
+++ b/master/ioctl.h	Mon Oct 25 16:15:12 2010 +0200
@@ -56,7 +56,7 @@
  *
  * Increment this when changing the ioctl interface!
  */
-#define EC_IOCTL_VERSION_MAGIC 9
+#define EC_IOCTL_VERSION_MAGIC 10
 
 // Command-line tool
 #define EC_IOCTL_MODULE                EC_IOR(0x00, ec_ioctl_module_t)
@@ -421,7 +421,7 @@
     uint8_t *data;
 
     // outputs
-    uint32_t data_size;
+    size_t data_size;
     uint16_t error_code;
 } ec_ioctl_slave_soe_read_t;
 
@@ -432,7 +432,7 @@
     uint16_t slave_position;
     uint8_t drive_no;
     uint16_t idn;
-    uint32_t data_size;
+    size_t data_size;
     uint8_t *data;
 
     // outputs
@@ -530,7 +530,7 @@
     uint8_t drive_no;
     uint16_t idn;
     ec_al_state_t state;
-    uint32_t size;
+    size_t size;
     uint8_t data[EC_MAX_IDN_DATA_SIZE];
 } ec_ioctl_config_idn_t;