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

[Mats F. <ma...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
btcommon.h      1.60            1.61=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added IOCTL for Read Scan Enable
Moved sdp_con


The diff of the modified file(s):

--- btcommon.h	2001/02/16 14:24:29	1.60
+++ btcommon.h	2001/02/27 15:07:36	1.61
@@ -142,14 +142,15 @@
 #define HCIWRITESTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x34, u8[22])
 #define HCIDELETESTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x35, u8[7])
 #define HCISETLOCALNAME _IOW(BT_IOC_MAGIC, 0x36, u8[248])
-#define HCIWRITESCANENABLE _IOW(BT_IOC_MAGIC, 0x37, u32)
-#define HCIWRITEPAGESCANACTIVITY _IOW(BT_IOC_MAGIC, 0x38, u32[2])
-#define HCIWRITECLASSOFDEVICE _IOW(BT_IOC_MAGIC, 0x39, u8[3])
-#define HCIREAD_AUTHENTICATION_ENABLE _IOR(BT_IOC_MAGIC, 0x3a, s32)
-#define HCIWRITE_AUTHENTICATION_ENABLE _IOWR(BT_IOC_MAGIC, 0x3b, s32)
-#define HCIREAD_ENCRYPTION_MODE _IOR(BT_IOC_MAGIC, 0x3c, s32)
-#define HCIWRITE_ENCRYPTION_MODE _IOWR(BT_IOC_MAGIC, 0x3d, s32)
-#define HCISET_EVENT_FILTER _IOW(BT_IOC_MAGIC, 0x3e, u8[3])
+#define HCIREADSCANENABLE _IOR(BT_IOC_MAGIC, 0x37, s32)
+#define HCIWRITESCANENABLE _IOW(BT_IOC_MAGIC, 0x38, s32)
+#define HCIWRITEPAGESCANACTIVITY _IOW(BT_IOC_MAGIC, 0x39, u32[2])
+#define HCIWRITECLASSOFDEVICE _IOW(BT_IOC_MAGIC, 0x3a, u8[3])
+#define HCIREAD_AUTHENTICATION_ENABLE _IOR(BT_IOC_MAGIC, 0x3b, s32)
+#define HCIWRITE_AUTHENTICATION_ENABLE _IOWR(BT_IOC_MAGIC, 0x3c, s32)
+#define HCIREAD_ENCRYPTION_MODE _IOR(BT_IOC_MAGIC, 0x3d, s32)
+#define HCIWRITE_ENCRYPTION_MODE _IOWR(BT_IOC_MAGIC, 0x3e, s32)
+#define HCISET_EVENT_FILTER _IOW(BT_IOC_MAGIC, 0x3f, u8[3])
=20
 /* Informational Parameters */
 #define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, u8[6])
@@ -201,6 +202,14 @@
 	u8 data[0]; /* The actual data segment to send */
 } bt_tx_buf;
=20
+/* TCI layer object */
+typedef struct tci_tx_buf{
+	u8 hci_hdr[5];=20
+	u8 l2cap_hdr[4];
+	u8 frame[0];
+} tci_tx_buf;
+
+
 /* SDP layer object */
 typedef struct sdp_tx_buf{
 	u8 hci_hdr[5];=20
@@ -358,6 +367,17 @@
 	l2cap_con *l2cap;
 } rfcomm_con;
=20
+/****************** SDP connection object ****************************/
+enum sdp_states{SDP_DISCONNECTED, SDP_CONNECTING, SDP_CONNECTED};
+
+typedef struct sdp_con{
+	l2cap_con *l2cap;
+	u32 initiator;
+	enum sdp_states state;
+	u32 id;
+}sdp_con;
+
+
 /****************** BT connection object ********************************/
=20
 /* Connection id (32 bits) |PSM(16 bits)|layer_specific(16 bits)|=A0*/
@@ -425,6 +445,7 @@
=20
 typedef struct inquiry_results {
 	u32 nbr_of_units;
+	u32 inq_time;
 	u8 bd_addr[0];
 } inquiry_results;
=20
@@ -435,7 +456,7 @@
 } serport_profile_info;
=20
 extern s32 bt_current_hw;
-extern char bt_hw_firmware_info[255];
+extern u8 bt_hw_firmware_info[255];
=20
 /* unique status codes 32 bits : | layer 16 bits | code 16 bits | */
=20