CVS: The file 'apps/bluetooth/experimental/bt_if.h' has been modified.

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

The following file was modified in apps/bluetooth/experimental:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bt_if.h         1.14            1.15=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

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


The diff of the modified file(s):

--- bt_if.h	2001/06/15 12:36:25	1.14
+++ bt_if.h	2001/06/19 10:35:56	1.15
@@ -131,14 +131,10 @@
=20
 #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, unsigned int)
=20
-
-#define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0a, int)
-#define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0b)
-#define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0c, int)
-
 #define BTSETSPEED _IOW(BT_IOC_MAGIC, 0x02, int)
 #define BTINITSTACK _IO(BT_IOC_MAGIC, 0x03)
 #define BTSETSERTTY _IO(BT_IOC_MAGIC, 0x04)
@@ -148,24 +144,31 @@
 #define BTRESETPHYSICALHW _IO(BT_IOC_MAGIC, 0x08)
 #define BTISINITIATED _IOR(BT_IOC_MAGIC, 0x09, int)
 #define BTHWVENDOR _IOR(BT_IOC_MAGIC, 0x0a, char[20])
+#define BTFIRMWAREINFO _IOR(BT_IOC_MAGIC, 0x0B, char[80])
=20
-#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x0e, unsigned char[22])
+#define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0C, int)
+#define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0D)
+#define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0E, int)
+
+//#define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0F, bt_sdp_request)
+#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x10, unsigned char[22])
+
 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
 /* Ioctls for executing HCI commands */
=20
 /* Link Control Command */
=20
-#define HCIINQUIRY _IOWR(BT_IOC_MAGIC, 0x10, inquiry_results)
-#define HCILINKKEYREPLY _IOWR(BT_IOC_MAGIC, 0x11, unsigned char[22])
-#define HCILINKKEYNEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x12, unsigned char[6])
-#define HCIPINCODEREPLY _IOWR(BT_IOC_MAGIC, 0x13, unsigned char[23])
-#define HCIPINCODENEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x14, unsigned char[6])
-#define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x15, unsigned char=
[6])
-#define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x16, unsigned char=
[7])
+#define HCIINQUIRY _IOWR(BT_IOC_MAGIC, 0x20, inquiry_results)
+#define HCILINKKEYREPLY _IOWR(BT_IOC_MAGIC, 0x21, unsigned char[22])
+#define HCILINKKEYNEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x22, unsigned char[6])
+#define HCIPINCODEREPLY _IOWR(BT_IOC_MAGIC, 0x23, unsigned char[23])
+#define HCIPINCODENEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x24, unsigned char[6])
+#define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x25, unsigned char=
[6])
+#define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x26, unsigned char=
[7])
=20
 /* Link Policy Commands */
=20
-#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x20, unsigned char[7])
+#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, unsigned char[7])
=20
 /* Host Controller & Baseband Commands */
=20
@@ -211,6 +214,8 @@
 /* | BD(6) | type (2) |*/
 #define BTGETINFO _IOW(BT_IOC_MAGIC, 0x74, unsigned char[8])
=20
+/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
+
 /* Used to calculate opcode for HCI commands using raw interface */
 #define OPCODE_LSB(ocf, ogf) ((ocf) & 0xff)
 #define OPCODE_MSB(ocf, ogf) (((ocf) >> 8) | (((ogf) & 0x3f) << 2))
@@ -286,6 +291,7 @@
 #ifndef BT_USERSTACK
 char* bt_hw_vendor(void);
 #endif
+char* bt_firmware_info(void);
 void reset_hw(void);
 int bt_openctrl(void);
 void set_bt_line_disc(int phys_fd, int bt_disc, char* physdev);