[PATCH] Add compat ioctl's for CAPI

From: Marcel Holtmann
Date: Mon Apr 19 2004 - 10:07:07 EST


Hi Linus,

this patch adds the needed compat ioctl's for the CAPI on 64bit
platforms.

Regards

Marcel

===== fs/compat_ioctl.c 1.24 vs edited =====
--- 1.24/fs/compat_ioctl.c Mon Apr 12 19:54:18 2004
+++ edited/fs/compat_ioctl.c Mon Apr 19 15:26:07 2004
@@ -70,8 +70,10 @@

#include <net/sock.h> /* siocdevprivate_ioctl */
#include <net/bluetooth/bluetooth.h>
-#include <net/bluetooth/rfcomm.h>
#include <net/bluetooth/hci.h>
+#include <net/bluetooth/rfcomm.h>
+
+#include <linux/capi.h>

#include <scsi/scsi.h>
/* Ugly hack. */
===== include/linux/compat_ioctl.h 1.21 vs edited =====
--- 1.21/include/linux/compat_ioctl.h Sat Apr 17 20:19:27 2004
+++ edited/include/linux/compat_ioctl.h Mon Apr 19 15:25:39 2004
@@ -597,7 +597,7 @@
COMPATIBLE_IOCTL(RNDADDENTROPY)
COMPATIBLE_IOCTL(RNDZAPENTCNT)
COMPATIBLE_IOCTL(RNDCLEARPOOL)
-/* Bluetooth ioctls */
+/* Bluetooth */
COMPATIBLE_IOCTL(HCIDEVUP)
COMPATIBLE_IOCTL(HCIDEVDOWN)
COMPATIBLE_IOCTL(HCIDEVRESET)
@@ -631,6 +631,20 @@
COMPATIBLE_IOCTL(CMTPCONNDEL)
COMPATIBLE_IOCTL(CMTPGETCONNLIST)
COMPATIBLE_IOCTL(CMTPGETCONNINFO)
+/* CAPI */
+COMPATIBLE_IOCTL(CAPI_REGISTER)
+COMPATIBLE_IOCTL(CAPI_GET_MANUFACTURER)
+COMPATIBLE_IOCTL(CAPI_GET_VERSION)
+COMPATIBLE_IOCTL(CAPI_GET_SERIAL)
+COMPATIBLE_IOCTL(CAPI_GET_PROFILE)
+COMPATIBLE_IOCTL(CAPI_MANUFACTURER_CMD)
+COMPATIBLE_IOCTL(CAPI_GET_ERRCODE)
+COMPATIBLE_IOCTL(CAPI_INSTALLED)
+COMPATIBLE_IOCTL(CAPI_GET_FLAGS)
+COMPATIBLE_IOCTL(CAPI_SET_FLAGS)
+COMPATIBLE_IOCTL(CAPI_CLR_FLAGS)
+COMPATIBLE_IOCTL(CAPI_NCCI_OPENCOUNT)
+COMPATIBLE_IOCTL(CAPI_NCCI_GETUNIT)
/* Misc. */
COMPATIBLE_IOCTL(0x41545900) /* ATYIO_CLKR */
COMPATIBLE_IOCTL(0x41545901) /* ATYIO_CLKW */