[Linux1394-cvslog] rev 783 - trunk

[SVN U. <ben...@li...>]

Author: bencollins
Date: 2003-02-13 19:41:03 -0500 (Thu, 13 Feb 2003)
New Revision: 783

Modified:
   trunk/amdtp.c
Log:
Register ioctl's as compatible.


Modified: trunk/amdtp.c
==============================================================================
--- trunk/amdtp.c	(original)
+++ trunk/amdtp.c	2003-02-13 19:41:04.000000000 -0500
@@ -74,6 +74,8 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/poll.h>
+#include <linux/ioctl32.h>
+#include <linux/compat.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
 
@@ -1276,6 +1278,13 @@
 		return -EIO;
 	}
 
+#ifdef CONFIG_COMPAT
+	register_ioctl32_conversion(AMDTP_IOC_CHANNEL, NULL);
+	register_ioctl32_conversion(AMDTP_IOC_PLUG, NULL);
+	register_ioctl32_conversion(AMDTP_IOC_PING, NULL);
+	register_ioctl32_conversion(AMDTP_IOC_ZAP, NULL);
+#endif
+
 	HPSB_INFO("Loaded AMDTP driver");
 
 	return 0;
@@ -1283,6 +1292,13 @@
 
 static void __exit amdtp_exit_module (void)
 {
+#ifdef CONFIG_COMPAT
+	unregister_ioctl32_conversion(AMDTP_IOC_CHANNEL);
+	unregister_ioctl32_conversion(AMDTP_IOC_PLUG);
+	unregister_ioctl32_conversion(AMDTP_IOC_PING);
+	unregister_ioctl32_conversion(AMDTP_IOC_ZAP);
+#endif
+
         hpsb_unregister_highlevel(amdtp_highlevel);
         ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_AMDTP);