Fix corner case in the HID report descriptor Mouse/Joystick tempates at the 8/16...

[pub/USBasp.git] / Demos / Host / Incomplete / BluetoothHost / Lib / SDPServices.h

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h
index b0a78e6..35d536a 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -35,22 +35,22 @@
 
 #ifndef _SDPSERVICES_H_
 #define _SDPSERVICES_H_
 
 #ifndef _SDPSERVICES_H_
 #define _SDPSERVICES_H_

-       
+

        /* Includes: */
        /* Includes: */

-               #include "ServiceDiscoveryProtocol.h"
+               #include "SDP.h"

 
        /* Macros: */
                /** Size of a full 128 bit UUID, in bytes. */
                #define UUID_SIZE_BYTES                         16
 
        /* Macros: */
                /** Size of a full 128 bit UUID, in bytes. */
                #define UUID_SIZE_BYTES                         16

-               
+

                /** First 80 bits common to all standardized Bluetooth services. */
                #define BASE_80BIT_UUID                         0x0000, 0x0010, 0x0080, {0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB}
                /** First 80 bits common to all standardized Bluetooth services. */
                #define BASE_80BIT_UUID                         0x0000, 0x0010, 0x0080, {0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB}

-               
+

                #define RFCOMM_UUID                             {SWAPENDIAN_32(0x00000003), BASE_80BIT_UUID}
                #define L2CAP_UUID                              {SWAPENDIAN_32(0x00000100), BASE_80BIT_UUID}
                #define SP_CLASS_UUID                           {SWAPENDIAN_32(0x00001101), BASE_80BIT_UUID}
                #define PUBLICBROWSEGROUP_CLASS_UUID            {SWAPENDIAN_32(0x00001002), BASE_80BIT_UUID}
                #define RFCOMM_UUID                             {SWAPENDIAN_32(0x00000003), BASE_80BIT_UUID}
                #define L2CAP_UUID                              {SWAPENDIAN_32(0x00000100), BASE_80BIT_UUID}
                #define SP_CLASS_UUID                           {SWAPENDIAN_32(0x00001101), BASE_80BIT_UUID}
                #define PUBLICBROWSEGROUP_CLASS_UUID            {SWAPENDIAN_32(0x00001002), BASE_80BIT_UUID}

-               
+

                #define SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE    0x0000
                #define SDP_ATTRIBUTE_ID_SERVICECLASSIDS        0x0001
                #define SDP_ATTRIBUTE_ID_PROTOCOLDESCRIPTORLIST 0x0004
                #define SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE    0x0000
                #define SDP_ATTRIBUTE_ID_SERVICECLASSIDS        0x0001
                #define SDP_ATTRIBUTE_ID_PROTOCOLDESCRIPTORLIST 0x0004


@@ -58,29 +58,10 @@
                #define SDP_ATTRIBUTE_ID_LANGUAGEBASEATTROFFSET 0x0006
                #define SDP_ATTRIBUTE_ID_SERVICENAME            0x0100
                #define SDP_ATTRIBUTE_ID_SERVICEDESCRIPTION     0x0101
                #define SDP_ATTRIBUTE_ID_LANGUAGEBASEATTROFFSET 0x0006
                #define SDP_ATTRIBUTE_ID_SERVICENAME            0x0100
                #define SDP_ATTRIBUTE_ID_SERVICEDESCRIPTION     0x0101

-               
-               /** Swaps the byte ordering of a 16-bit value at compile time. Do not use this macro for swapping byte orderings
-                *  of dynamic values computed at runtime -- use SwapEndian_16() instead.
-                *
-                *  \param[in]  x  16-bit value whose byte ordering is to be swapped
-                *
-                *  \return Input value with the byte ordering reversed
-                */
-               #define SWAPENDIAN_16(x)                        ((((x) & 0xFF00) >> 8) | (((x) & 0x00FF) << 8))

 
 

-               /** Swaps the byte ordering of a 32-bit value at compile time. Do not use this macro for swapping byte orderings
-                *  of dynamic values computed at runtime -- use SwapEndian_32() instead.
-                *
-                *  \param[in]  x  32-bit value whose byte ordering is to be swapped
-                *
-                *  \return Input value with the byte ordering reversed
-                */
-               #define SWAPENDIAN_32(x)                        ((((x) & 0xFF000000UL) >> 24UL) | (((x) & 0x00FF0000UL) >> 8UL) | \
-                                                                (((x) & 0x0000FF00UL) << 8UL) | (((x) & 0x000000FFUL) << 24UL))
-               

                /** Terminator for a service attribute table of type \ref ServiceAttributeTable_t. */
                #define SERVICE_ATTRIBUTE_TABLE_TERMINATOR      {.Data = NULL}
                /** Terminator for a service attribute table of type \ref ServiceAttributeTable_t. */
                #define SERVICE_ATTRIBUTE_TABLE_TERMINATOR      {.Data = NULL}

-               
+

        /* Type Defines: */
                /** Type define for a UUID value structure. This struct can be used to hold full 128-bit UUIDs. */
                typedef struct
        /* Type Defines: */
                /** Type define for a UUID value structure. This struct can be used to hold full 128-bit UUIDs. */
                typedef struct


@@ -91,7 +72,7 @@
                        uint16_t D; /**< Bits 64-79 of the UUID. */
                        uint8_t  E[6]; /**< Bits 80-128 of the UUID. */
                } UUID_t;
                        uint16_t D; /**< Bits 64-79 of the UUID. */
                        uint8_t  E[6]; /**< Bits 80-128 of the UUID. */
                } UUID_t;

-       
+

                /** Structure for the association of attribute ID values to an attribute value in FLASH. A table of these
                 *  structures can then be built up for each supported UUID service within the device.
                 *
                /** Structure for the association of attribute ID values to an attribute value in FLASH. A table of these
                 *  structures can then be built up for each supported UUID service within the device.
                 *


@@ -130,7 +111,7 @@
                        uint8_t Header; /**< Data Element header, should be (SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit) */
                        UUID_t  UUID; /**< UUID to store in the list Data Element */
                } ItemUUID_t;
                        uint8_t Header; /**< Data Element header, should be (SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit) */
                        UUID_t  UUID; /**< UUID to store in the list Data Element */
                } ItemUUID_t;

-               
+

                /** Structure for a list of Data Elements Sequences containing UUID Data Elements, for service attributes requiring
                 *  protocol lists.
                 */
                /** Structure for a list of Data Elements Sequences containing UUID Data Elements, for service attributes requiring
                 *  protocol lists.
                 */


@@ -138,28 +119,43 @@
                {
                        uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */
                        uint8_t        Size; /**< Size of the inner Data Element sequence */
                {
                        uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */
                        uint8_t        Size; /**< Size of the inner Data Element sequence */

-                       
+

                        struct
                        {
                                ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */
                        } Protocol;
                } ItemProtocol_t;
 
                        struct
                        {
                                ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */
                        } Protocol;
                } ItemProtocol_t;
 

-               /** Structure for a list of Data Elements Sequences containing UUID Data Elements and 8-bit channel values, for service
-                *  attributes requiring extended protocol lists.
+               /** Structure for a list of Data Elements Sequences containing UUID Data Elements and an 8-bit param value, for service
+                *  attributes requiring extended protocol lists containing an 8-bit value.

                 */
                typedef struct
                {
                        uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */
                        uint8_t        Size; /**< Size of the inner Data Element sequence */
                 */
                typedef struct
                {
                        uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */
                        uint8_t        Size; /**< Size of the inner Data Element sequence */

-                       
+

                        struct
                        {
                                ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */
                        struct
                        {
                                ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */

-                               Item8Bit_t Channel; /**< Channel that is to be used to access the service */
+                               Item8Bit_t Param; /**< 8-Bit Parameter associated with the service */

                        } Protocol;
                        } Protocol;

-               } ItemProtocolChannel_t;
-               
+               } ItemProtocol_8BitParam_t;
+
+               /** Structure for a list of Data Elements Sequences containing UUID Data Elements and an 16-bit param value, for service
+                *  attributes requiring extended protocol lists containing an 16-bit value.
+                */
+               typedef struct
+               {
+                       uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */
+                       uint8_t        Size; /**< Size of the inner Data Element sequence */
+
+                       struct
+                       {
+                               ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */
+                               Item16Bit_t Channel; /**< 8-Bit Parameter associated with the service */
+                       } Protocol;
+               } ItemProtocol_16BitParam_t;
+

                /** Structure for a list of Data Elements containing language encodings, including the language ID, Encoding ID and
                 *  Attribute base offset.
                 */
                /** Structure for a list of Data Elements containing language encodings, including the language ID, Encoding ID and
                 *  Attribute base offset.
                 */


@@ -169,9 +165,10 @@
                        Item16Bit_t EncodingID; /**< Encoding used for the current language */
                        Item16Bit_t OffsetID; /**< Attribute offset added to all strings using this language within the service */
                } ItemLangEncoding_t;
                        Item16Bit_t EncodingID; /**< Encoding used for the current language */
                        Item16Bit_t OffsetID; /**< Attribute offset added to all strings using this language within the service */
                } ItemLangEncoding_t;

-               
+

        /* External Variables: */
                extern const ServiceAttributeTable_t SerialPort_Attribute_Table[];
                extern const ServiceAttributeTable_t PnP_Attribute_Table[];
        /* External Variables: */
                extern const ServiceAttributeTable_t SerialPort_Attribute_Table[];
                extern const ServiceAttributeTable_t PnP_Attribute_Table[];

-               
+

 #endif
 #endif

+