[src/trunk]: src/sys/netbt add in PSMs defined in later versions of specifica...

[plunky <plunky%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fefc6a194035
branches:  trunk
changeset: 341897:fefc6a194035
user:      plunky <plunky%NetBSD.org@localhost>
date:      Sat Nov 28 07:50:37 2015 +0000

description:
add in PSMs defined in later versions of specification

diffstat:

 sys/netbt/l2cap.h |  18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 65f9fea69316 -r fefc6a194035 sys/netbt/l2cap.h
--- a/sys/netbt/l2cap.h Sat Nov 28 07:47:30 2015 +0000
+++ b/sys/netbt/l2cap.h Sat Nov 28 07:50:37 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: l2cap.h,v 1.18 2014/08/05 07:55:31 rtr Exp $   */
+/*     $NetBSD: l2cap.h,v 1.19 2015/11/28 07:50:37 plunky Exp $        */
 
 /*-
  * Copyright (c) 2005 Iain Hibbert.
@@ -54,7 +54,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: l2cap.h,v 1.18 2014/08/05 07:55:31 rtr Exp $
+ * $Id: l2cap.h,v 1.19 2015/11/28 07:50:37 plunky Exp $
  * $FreeBSD: src/sys/netgraph/bluetooth/include/l2cap.h,v 1.4 2005/08/31 18:13:23 emax Exp $
  */
 
@@ -105,7 +105,7 @@
 #define L2CAP_REJ_INVALID_CID          0x0002
 /* 0x0003 - 0xffff - reserved for future use */
 
-/* Protocol/Service Multiplexor (PSM) values */
+/* Protocol/Service Multiplexer (PSM) values */
 #define L2CAP_PSM_ANY                  0x0000  /* Any/Invalid PSM */
 #define L2CAP_PSM_SDP                  0x0001  /* Service Discovery Protocol */
 #define L2CAP_PSM_RFCOMM               0x0003  /* RFCOMM protocol */
@@ -121,7 +121,13 @@
                                                /*      Transport Protocol */
 #define L2CAP_PSM_AVDTP                        0x0019  /* Audio/Visual Distribution */
                                                /*      Transport Protocol */
-/* 0x0019 - 0x1000 - reserved for future use */
+#define L2CAP_PSM_UDI_C_PLANE          0x001d  /* Unrestricted Digital */
+                                               /*      Information Profile */
+#define L2CAP_PSM_ATT                  0x001f  /* Attribute Protocol */
+#define L2CAP_PSM_3DSP                 0x0021  /* 3D Synchronization Profile */
+#define L2CAP_PSM_IPSP                 0x0023  /* Internet Protocol */
+                                               /*      Support Profile */
+/* 0x0025 - 0x1000 - reserved for future use */
 
 #define L2CAP_PSM_INVALID(psm)         (((psm) & 0x0101) != 0x0001)
 
@@ -220,7 +226,7 @@
 
 /* L2CAP ConnectionLess Traffic                (dcid == L2CAP_CLT_CID) */
 typedef struct {
-       uint16_t        psm; /* Protocol/Service Multiplexor */
+       uint16_t        psm; /* Protocol/Service Multiplexer */
 } __packed l2cap_clt_hdr_t;
 
 #define L2CAP_CLT_MTU_MAXIMUM \
@@ -243,7 +249,7 @@
 /* L2CAP Connection Request */
 #define L2CAP_CONNECT_REQ                      0x02
 typedef struct {
-       uint16_t        psm;  /* Protocol/Service Multiplexor (PSM) */
+       uint16_t        psm;  /* Protocol/Service Multiplexer */
        uint16_t        scid; /* source channel ID */
 } __packed l2cap_con_req_cp;