CVS: 3 files have been modified in linux/include/linux/bluetooth.

[Anders J. <and...@us...>]

The following files were modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bt_errno.h      1.2             1.3=20=20=20=20=20=20=20=20=20=20=20=20=20
rfcomm.h        1.40            1.41=20=20=20=20=20=20=20=20=20=20=20=20
sdp.h           1.26            1.27=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* RFCOMM_GETLINE, SDP_GETLINE -> GET_LINE
* Added more errorcodes.


The diff of the modified file(s):

--- bt_errno.h	2001/04/17 15:48:15	1.2
+++ bt_errno.h	2001/10/10 14:59:17	1.3
@@ -45,19 +45,21 @@
=20
 /* Unique status codes 32 bits : | layer 16 bits | code 16 bits | */
 #define MSGCODE(layer, msgcode) ((((layer)<<16)&0xffff0000) | ((msgcode)&0=
xffff))
+#define MSG_GET_LAYER(msg) ((msg >> 16) & 0x0000ffff)
+#define MSG_GET_CODE(msg) (msg & 0x0000ffff)
=20
 /* Layer ID */
-#define MSG_LAYER_HCI 0
-#define MSG_LAYER_L2CAP 1
-#define MSG_LAYER_RFCOMM 2
+#define MSG_LAYER_HCI 1
+#define MSG_LAYER_L2CAP 2
+#define MSG_LAYER_RFCOMM 3
 #define MSG_LAYER_SDP 4
-#define MSG_LAYER_TCS 8
-#define MSG_BT_INTERFACE 16
+#define MSG_LAYER_TCS 5
+#define MSG_BT_INTERFACE 6
=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=3D=3D=3D=3D*/
 /* HCI */
=20
-/* fixme */
+/* Uses errorcodes as specified in the BT specification */
=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=3D=3D=3D=3D*/
 /* L2CAP */
@@ -73,6 +75,10 @@
 /* General l2cap return codes */
 #define L2CAP_FAILED 0xf0
 #define L2CAP_CON_UNRESPONSIVE 0xf1
+#define L2CAP_INVALID_STATE 0xf2
+#define L2CAP_NO_CONNECTION 0xf3
+#define L2CAP_EXCEED_REMOTE_MTU 0xf4
+#define L2CAP_RTX_TIMEOUT 0xf5
=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=3D=3D=3D=3D*/
 /* RFCOMM */
@@ -95,3 +101,4 @@
 #define BT_NOTCONNECTED 0x1
 #define BT_ALREADYCONNECTED 0x2
 #define BT_TIMEOUT 0x3
+#define BT_LINE_BUSY 0x4
--- rfcomm.h	2001/10/05 12:06:43	1.40
+++ rfcomm.h	2001/10/10 14:59:17	1.41
@@ -71,7 +71,6 @@
                              D_ERR("con id 0x%x is not a RFCOMM ID (%s, l.=
%d)\n", id, __FILE__, __LINE__);\
                           } while (0)
=20
-#define GET_RFCOMMLINE(con_id) ((con_id >> 8) & 0xff)
 #define GET_RFCOMMSRVCH(con_id) ((con_id&0xff) >> 1)
 #define GET_RFCOMMDLCI(con_id) (con_id&0xff)
=20
--- sdp.h	2001/03/30 09:45:45	1.26
+++ sdp.h	2001/10/10 14:59:17	1.27
@@ -69,7 +69,6 @@
=20
 #define CREATE_SDP_ID(line, index) ( ((SDP_LAYER << 16) & 0xffff0000) | ((=
line << 8) & 0x0000ff00) | (index & 0xff) )
 #define GET_SDPINDEX(conID) ( (conID & 0xff) )
-#define GET_SDPLINE(conID)  ( ((conID & 0xff00) >> 8) )
=20
 /****************** TYPE DEFINITION SECTION ******************************=
***/
=20