Fixed incorrect comparison in the descriptor callback routine of the TeensyHID bootlo...

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

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h
index b17cc2b..fc0abae 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h
@@ -43,7 +43,7 @@
                #include "BluetoothStack.h"\r
                \r
        /* Macros: */\r
-               #define BT_SDP_DEBUG(l, s, ...)                 do { if (SDP_DEBUG_LEVEL >= l) printf_P(PSTR("(SDP) " s "\r\n"), __VA_ARGS__); } while (0)\r
+               #define BT_SDP_DEBUG(l, s, ...)                 do { if (SDP_DEBUG_LEVEL >= l) printf_P(PSTR("(SDP) " s "\r\n"), ##__VA_ARGS__); } while (0)\r
                #define SDP_DEBUG_LEVEL                         2\r
                \r
                #define SDP_PDU_ERRORRESPONSE                   0x01\r
@@ -54,6 +54,32 @@
                #define SDP_PDU_SERVICESEARCHATTRIBUTEREQUEST   0x06\r
                #define SDP_PDU_SERVICESEARCHATTRIBUTERESPONSE  0x07\r
                \r
+               #define SDP_ATTRIBUTE_NAME                      0x0000\r
+               #define SDP_ATTRIBUTE_DESCRIPTION               0x0001\r
+               #define SDP_ATTRIBUTE_PROVIDER                  0x0002\r
+               #define SDP_ATTRIBUTE_AVAILABILITY              0x0008\r
+               \r
+               #define SDP_DATATYPE_NIL                        (0x00 << 3)\r
+               #define SDP_DATATYPE_UNSIGNED_INT               (0x01 << 3)\r
+               #define SDP_DATATYPE_SIGNED_INT                 (0x02 << 3)\r
+               #define SDP_DATATYPE_UUID                       (0x03 << 3)\r
+               #define SDP_DATATYPE_TEXT                       (0x04 << 3)\r
+               #define SDP_DATATYPE_BOOLEAN                    (0x05 << 3)\r
+               #define SDP_DATATYPE_ELEMENT_SEQUENCE           (0x06 << 3)\r
+               #define SDP_DATATYPE_ELEMENT_ALTERNATIVE        (0x07 << 3)\r
+               #define SDP_DATATYPE_URL                        (0x08 << 3)\r
+               \r
+               #define BASE_96BIT_UUID                         0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00\r
+               \r
+               #define SERVICE_ATTRIBUTE_TEXT(name, string)    SERVICE_ATTRIBUTE_8BIT_LEN(name, SDP_DATATYPE_TEXT, sizeof(string), string)\r
+               #define SERVICE_ATTRIBUTE_8BIT_LEN(name, type, size, ...)  const ServiceAttributeData8Bit_t  name PROGMEM = \\r
+                                                               {.Header = (type | 5), .Size = size, .Data = __VA_ARGS__}\r
+               #define SERVICE_ATTRIBUTE_16BIT_LEN(name, type, size, ...) const ServiceAttributeData16Bit_t name PROGMEM = \\r
+                                                               {.Header = (type | 5), .Size = size, .Data = __VA_ARGS__}\r
+               #define SERVICE_ATTRIBUTE_32BIT_LEN(name, type, size, ...) const ServiceAttributeData32Bit_t name PROGMEM = \\r
+                                                               {.Header = (type | 5), .Size = size, .Data = __VA_ARGS__}\r
+               #define SERVICE_ATTRIBUTE_TABLE_TERMINATOR      {.AttributeData = NULL}\r
+\r
        /* Type Defines: */\r
                typedef struct\r
                {\r
@@ -62,6 +88,45 @@
                        uint16_t ParameterLength;\r
                } SDP_PDUHeader_t;\r
                \r
+               typedef struct\r
+               {\r
+                       uint16_t    AttributeID;\r
+                       const void* AttributeData;\r
+               } ServiceAttributeTable_t;\r
+\r
+               typedef struct\r
+               {\r
+                       uint8_t UUID[16];\r
+                       const void* AttributeTable;\r
+               } ServiceTable_t;\r
+\r
+               typedef struct\r
+               {\r
+                       uint8_t  Header;\r
+                       uint32_t Size;\r
+                       uint8_t  Data[];\r
+               } ServiceAttributeData32Bit_t;\r
+\r
+               typedef struct\r
+               {\r
+                       uint8_t  Header;\r
+                       uint16_t Size;\r
+                       uint8_t  Data[];\r
+               } ServiceAttributeData16Bit_t;\r
+\r
+               typedef struct\r
+               {\r
+                       uint8_t Header;\r
+                       uint8_t Size;\r
+                       uint8_t Data[];\r
+               } ServiceAttributeData8Bit_t;\r
+\r
+               typedef struct\r
+               {\r
+                       uint8_t Header;\r
+                       uint8_t Data[];\r
+               } ServiceAttributeData_t;\r
+               \r
        /* Function Prototypes: */\r
                void ServiceDiscovery_ProcessPacket(void* Data, Bluetooth_Channel_t* Channel);\r
 \r
@@ -70,12 +135,14 @@
                        static void ServiceDiscovery_ProcessServiceAttribute(SDP_PDUHeader_t* SDPHeader);\r
                        static void ServiceDiscovery_ProcessServiceSearchAttribute(SDP_PDUHeader_t* SDPHeader);\r
                        \r
-                       static inline uint16_t ServiceDiscovery_Read16BitParameter(void* AttributeHeader)\r
+                       static inline uint16_t ServiceDiscovery_Read16BitParameter(void** AttributeHeader)\r
                        {\r
-                               return *((uint16_t*)AttributeHeader++);\r
+                               uint16_t ParamValue = *((uint16_t*)*AttributeHeader);\r
+                               *AttributeHeader += sizeof(uint16_t);\r
+                               return ParamValue;\r
                        }\r
 \r
-                       static uint32_t ServiceDiscovery_GetDataElementSize(void* AttributeHeader);\r
+                       static uint32_t ServiceDiscovery_GetDataElementSize(void** AttributeHeader, uint8_t* ElementHeaderSize);\r
                #endif\r
 \r
 #endif\r