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.77            1.78=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* Added BTFIRMWAREINFO ioctl.
* Renumbered a couple of ioctls as BTHWVENDOR and BTWAITFORCONNECTION
  had accidentally gotten the same number...


The diff of the modified file(s):

--- btcommon.h	2001/06/19 06:13:01	1.77
+++ btcommon.h	2001/06/19 10:34:03	1.78
@@ -116,6 +116,7 @@
 /* Define the ioctls to the bt driver */
 #define BT_IOC_MAGIC 'B' /* Use B as a magic number */
 #define BT_IOC_MAXNR 255
+
 #define BTCONNECT _IOW(BT_IOC_MAGIC, 0x00, bt_connection)
 #define BTDISCONNECT _IOW(BT_IOC_MAGIC, 0x01, u32)
 #define BTSETSPEED _IOW(BT_IOC_MAGIC, 0x02, s32)
@@ -127,26 +128,26 @@
 #define BTRESETPHYSICALHW _IO(BT_IOC_MAGIC, 0x08)
 #define BTISINITIATED _IOR(BT_IOC_MAGIC, 0x09, s32)
 #define BTHWVENDOR _IOR(BT_IOC_MAGIC, 0x0A, char[20])
-
-#define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0a, s32)
-#define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0b)
-#define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0c, s32)
-#define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0d, bt_sdp_request)
-#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x0e, u8[22])
+#define BTFIRMWAREINFO _IOR(BT_IOC_MAGIC, 0x0B, char[80])
+#define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0C, s32)
+#define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0D)
+#define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0E, s32)
+#define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0F, bt_sdp_request)
+#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x10, u8[22])
=20
 /* Ioctls executing HCI commands */
=20
 /* Link Control Command */
-#define HCIINQUIRY _IOWR(BT_IOC_MAGIC, 0x10, inquiry_results)
-#define HCILINKKEYREPLY _IOWR(BT_IOC_MAGIC, 0x11, u8[22])
-#define HCILINKKEYNEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x12, u8[6])
-#define HCIPINCODEREPLY _IOWR(BT_IOC_MAGIC, 0x13, u8[23])
-#define HCIPINCODENEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x14, u8[6])
-#define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x15, u8[6])
-#define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x16, u8[7])
+#define HCIINQUIRY _IOWR(BT_IOC_MAGIC, 0x20, inquiry_results)
+#define HCILINKKEYREPLY _IOWR(BT_IOC_MAGIC, 0x21, u8[22])
+#define HCILINKKEYNEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x22, u8[6])
+#define HCIPINCODEREPLY _IOWR(BT_IOC_MAGIC, 0x23, u8[23])
+#define HCIPINCODENEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x24, u8[6])
+#define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x25, u8[6])
+#define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x26, u8[7])
=20
 /* Link Policy Commands */
-#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x20, u8[7])
+#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, u8[7])
=20
 /* Host Controller & Baseband Commands */
 #define HCIRESET _IO(BT_IOC_MAGIC, 0x30)