Modified support for 32/64 bit environments, control struct fields have fixed size now.

git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@27 53a565d1-3bb7-0310-b661-cf11e63c67ab

1 files changed, 14 insertions, 18 deletions

diff --git a/src/kernel-raw1394.h b/src/kernel-raw1394.h
index b17a033..ef324d6 100644
--- a/src/kernel-raw1394.h
+++ b/src/kernel-raw1394.h
@@ -1,11 +1,10 @@
-
 #ifndef IEEE1394_RAW1394_H
 #define IEEE1394_RAW1394_H
 
 #define RAW1394_DEVICE_MAJOR      171
 #define RAW1394_DEVICE_NAME       "raw1394"
 
-#define RAW1394_KERNELAPI_VERSION 2
+#define RAW1394_KERNELAPI_VERSION 3
 
 /* state: opened */
 #define RAW1394_REQ_INITIALIZE    1
@@ -45,30 +44,27 @@
 #define RAW1394_ERROR_TIMEOUT     (-1102)
 
 
+#include <asm/types.h>
+
 struct raw1394_request {
-        int type;
-        int error;
-        int misc;
+        __s16 type;
+        __s16 error;
+        __u32 misc;
 
-        unsigned int generation;
-        octlet_t address;
+        __u32 generation;
+        __u32 length;
 
-        unsigned long tag;
+        __u64 address;
 
-        size_t length;
+        __u64 tag;
 
-#ifdef __KERNEL__
-        quadlet_t *sendb;
-        quadlet_t *recvb;
-#else
-        kptr_t sendb;
-        kptr_t recvb;
-#endif
+        __u64 sendb;
+        __u64 recvb;
 };
 
 struct raw1394_khost_list {
-        int nodes;
-        char name[32];
+        __u32 nodes;
+        __u8 name[32];
 };
 
 #ifdef __KERNEL__