CVS: The file 'linux/include/linux/bluetooth/btcommon.h' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btcommon.h      1.81            1.82=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

The BTSETBCSPMODE ioctl can now return the old mode.


The diff of the modified file(s):

--- btcommon.h	2001/08/17 09:19:00	1.81
+++ btcommon.h	2001/08/29 09:34:44	1.82
@@ -184,6 +184,12 @@
 /* | len 1 byte | 4 bytes hci header | data (max 256) | */
 #define HCISENDRAWDATA _IOW(BT_IOC_MAGIC, 0x72, u8[261])
=20
+/* | BD(6) | len(2) | data |*/
+#define BTPING _IOW(BT_IOC_MAGIC, 0x73, ping_struct)
+
+/* | BD(6) | type (2) |*/
+#define BTGETINFO _IOW(BT_IOC_MAGIC, 0x74, u8[8])
+
 /* other ioctls used for testing */
 #define BTSENDTESTDATA _IOW(BT_IOC_MAGIC, 0xf0, s32[2])
 #define HCITESTCONNECTREQ _IOW(BT_IOC_MAGIC, 0xf1, u8[6])
@@ -193,7 +199,7 @@
=20
 #define BTSETMSSWITCH _IOW(BT_IOC_MAGIC, 0xf3, u8)
=20
-#define BTSETBCSPMODE _IOW(BT_IOC_MAGIC, 0xf4, u8)
+#define BTSETBCSPMODE _IOWR(BT_IOC_MAGIC, 0xf4, s32)
=20
=20
 #define CSR_PSKEY_MSGHDR_SIZE 3
@@ -202,13 +208,8 @@
 #define BT_CSR_PSKEY  _IOWR(BT_IOC_MAGIC, 0xf5, u16[CSR_PSKEY_MSGHDR_SIZE =
+ CSR_PSKEY_MAXPARAMS])
=20
 #define BTINITBCSP _IO(BT_IOC_MAGIC, 0xf6)
-#define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xf7, u8)
-
-/* | BD(6) | len(2) | data |*/
-#define BTPING _IOW(BT_IOC_MAGIC, 0x73, ping_struct)
=20
-/* | BD(6) | type (2) |*/
-#define BTGETINFO _IOW(BT_IOC_MAGIC, 0x74, u8[8])
+#define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xf7, u8)
=20
 /* NOTE !
  * N_BT should be defined in /include/asm/termios.h=20