patch-2.4.0-test3 linux/drivers/ieee1394/raw1394.h

• Lines: 55
• Date: Wed Jul 5 13:03:56 2000
• Orig file: v2.4.0-test2/linux/drivers/ieee1394/raw1394.h
• Orig date: Mon Mar 27 08:08:24 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/ieee1394/raw1394.h linux/drivers/ieee1394/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,24 +44,27 @@
 #define RAW1394_ERROR_TIMEOUT     (-1102)
 
 
+#include <asm/types.h>
+
 struct raw1394_request {
-        int type;
-        int error;
-        int misc;
-
-        unsigned int generation;
-        octlet_t address;
-
-        unsigned long tag;
-
-        size_t length;
-        quadlet_t *sendb;
-        quadlet_t *recvb;
+        __u32 type;
+        __s32 error;
+        __u32 misc;
+
+        __u32 generation;
+        __u32 length;
+
+        __u64 address;
+
+        __u64 tag;
+
+        __u64 sendb;
+        __u64 recvb;
 };
 
 struct raw1394_khost_list {
-        int nodes;
-        char name[32];
+        __u32 nodes;
+        __u8 name[32];
 };
 
 #ifdef __KERNEL__