Replace ring buffer library in Benito and USBtoSerial projects with the new lightweig...

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

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
index c90fccd..accbee5 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
@@ -31,52 +31,47 @@
 #define  INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C
 #include "ServiceDiscoveryProtocol.h"
 
 #define  INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C
 #include "ServiceDiscoveryProtocol.h"
 

-/** Service Discovery Protocol attribute, indicationg the service's name. */
-const struct
-{
-       uint8_t Header;
-       uint8_t Length;
-       uint8_t Data[];
-} PROGMEM SDP_Attribute_Name = {(SDP_DATATYPE_String | 5), sizeof("SDP"), "SDP"};
-
-/** Service Discovery Protocol attribute, indicationg the service's description. */
-const struct
-{
-       uint8_t Header;
-       uint8_t Length;
-       uint8_t Data[];
-} PROGMEM SDP_Attribute_Description = {(SDP_DATATYPE_String | 5), sizeof("BT Service Discovery"), "BT Service Discovery"};
-
-/** Service Discovery Protocol attribute, indicationg the service's availability. */
+/** Service Discovery Protocol attribute, indicating the service's availability. */

 const struct
 {
        uint8_t Header;
        uint8_t Data;
 const struct
 {
        uint8_t Header;
        uint8_t Data;

-} PROGMEM SDP_Attribute_Availability = {(SDP_DATATYPE_UnsignedInt | 0), 0xFF};
+} PROGMEM SDP_Attribute_Availability = {(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_8Bit), 0xFF};

 
 const struct
 {
        uint8_t  Header;
 
 const struct
 {
        uint8_t  Header;

-       uint16_t Data;
-} PROGMEM SDP_Attribute_LanguageOffset = {(SDP_DATATYPE_UnsignedInt | 1), SDP_ATTRIBUTE_LANGOFFSET};
+       uint32_t Data;
+} PROGMEM SDP_Attribute_ServiceHandle = {(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit), 0x00010000};

 
 const struct
 {
 
 const struct
 {

-       uint8_t  Header;
-       uint16_t Data;
-} PROGMEM SDP_Attribute_ServiceHandle = {(SDP_DATATYPE_UnsignedInt | 1), 0x0001};
+       uint8_t   Header;
+       uint8_t   Size;
+       Version_t VersionList[];
+} PROGMEM SDP_Attribute_Version =
+       {
+               .Header = (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
+               .Size   = (sizeof(Version_t) * 1),
+               .VersionList =
+                       {
+                               {.Header = (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), .Version = 0x0100}
+                       }
+       };

 
 const struct
 {
        uint8_t     Header;
 
 const struct
 {
        uint8_t     Header;

-       uint8_t     Size;
+       uint16_t    Size;

        ClassUUID_t UUIDList[];
 } PROGMEM SDP_Attribute_ServiceClassIDs =
        {
        ClassUUID_t UUIDList[];
 } PROGMEM SDP_Attribute_ServiceClassIDs =
        {

-               (SDP_DATATYPE_Sequence | 5), (sizeof(ClassUUID_t) * 1),
-               {
-                       {.Header = (SDP_DATATYPE_UUID | 5), .Size = UUID_SIZE_BYTES, .UUID = {BASE_96BIT_UUID, 0x01, 0x00, 0x00, 0x00}}
-               }
+               .Header = (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable16Bit),
+               .Size   = (sizeof(ClassUUID_t) * 1),
+               .UUIDList =
+                       {
+                               {.Header = (SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), .UUID = {BASE_96BIT_UUID, 0x01, 0x00, 0x00, 0x00}}
+                       }

        };
 
 /** Service Discovery Protocol attribute table, listing all supported attributes of the service. */
        };
 
 /** Service Discovery Protocol attribute table, listing all supported attributes of the service. */


@@ -84,9 +79,7 @@ const ServiceAttributeTable_t SDP_Attribute_Table[] PROGMEM =
        {
                {.AttributeID = SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE, .Data = &SDP_Attribute_ServiceHandle    },
                {.AttributeID = SDP_ATTRIBUTE_ID_SERVICECLASSIDS,     .Data = &SDP_Attribute_ServiceClassIDs  },
        {
                {.AttributeID = SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE, .Data = &SDP_Attribute_ServiceHandle    },
                {.AttributeID = SDP_ATTRIBUTE_ID_SERVICECLASSIDS,     .Data = &SDP_Attribute_ServiceClassIDs  },

-               {.AttributeID = SDP_ATTRIBUTE_ID_LANGIDOFFSET,        .Data = &SDP_Attribute_LanguageOffset   },
-               {.AttributeID = SDP_ATTRIBUTE_ID_NAME,                .Data = &SDP_Attribute_Name             },
-               {.AttributeID = SDP_ATTRIBUTE_ID_DESCRIPTION,         .Data = &SDP_Attribute_Description      },
+               {.AttributeID = SDP_ATTRIBUTE_ID_VERSION,             .Data = &SDP_Attribute_Version          },

 
                SERVICE_ATTRIBUTE_TABLE_TERMINATOR
        };
 
                SERVICE_ATTRIBUTE_TABLE_TERMINATOR
        };


@@ -97,15 +90,9 @@ const ServiceAttributeTable_t SDP_Attribute_Table[] PROGMEM =
 const ServiceTable_t SDP_Services_Table[] PROGMEM =
        {
                {   // 128-bit UUID for the SDP service
 const ServiceTable_t SDP_Services_Table[] PROGMEM =
        {
                {   // 128-bit UUID for the SDP service

-                       .UUID  = {BASE_96BIT_UUID, 0x01, 0x00, 0x00, 0x00},
+                       .UUID  = {BASE_96BIT_UUID, 0x00, 0x00, 0x00, 0x01},

                        .AttributeTable = SDP_Attribute_Table,
                },
                        .AttributeTable = SDP_Attribute_Table,
                },

-#if 0
-               {   // 128-bit UUID for the RFCOMM service
-                       .UUID  = {BASE_96BIT_UUID, 0x03, 0x00, 0x00, 0x00},
-                       .AttributeTable = RFCOMM_Attribute_Table,
-               },
-#endif

        };
 
 /** Base UUID value common to all standardized Bluetooth services */
        };
 
 /** Base UUID value common to all standardized Bluetooth services */


@@ -196,13 +183,13 @@ static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHe
        } ResponsePacket;
        
        /* Create a pointer to the buffer to indicate the current location for response data to be added */
        } ResponsePacket;
        
        /* Create a pointer to the buffer to indicate the current location for response data to be added */

-       uint8_t* CurrResponsePos = ResponsePacket.ResponseData;
+       void* CurrResponsePos = ResponsePacket.ResponseData;

 
        /* Clamp the maximum attribute size to the size of the allocated buffer */
        if (MaxAttributeSize > sizeof(ResponsePacket.ResponseData))
          MaxAttributeSize = sizeof(ResponsePacket.ResponseData);
 
 
        /* Clamp the maximum attribute size to the size of the allocated buffer */
        if (MaxAttributeSize > sizeof(ResponsePacket.ResponseData))
          MaxAttributeSize = sizeof(ResponsePacket.ResponseData);
 

-       /* Add the outer Data Element Sequence header for the retrieved Attributes */
+       /* Add the outer Data Element Sequence header for all of the retrieved Attributes */

        uint16_t* TotalResponseSize = SDP_AddDataElementHeader16(&CurrResponsePos, SDP_DATATYPE_Sequence);
        
        /* Search through the list of UUIDs one at a time looking for matching search Attributes */
        uint16_t* TotalResponseSize = SDP_AddDataElementHeader16(&CurrResponsePos, SDP_DATATYPE_Sequence);
        
        /* Search through the list of UUIDs one at a time looking for matching search Attributes */


@@ -215,6 +202,8 @@ static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHe
                if (AttributeTable == NULL)
                  continue;
                  
                if (AttributeTable == NULL)
                  continue;
                  

+               BT_SDP_DEBUG(2, " -- Found UUID %d in table", CurrUUIDItem);
+

                /* Add an inner Data Element Sequence header for the current UUID's found Attributes */
                uint16_t* CurrentUUIDResponseSize = SDP_AddDataElementHeader16(&CurrResponsePos, SDP_DATATYPE_Sequence);
                
                /* Add an inner Data Element Sequence header for the current UUID's found Attributes */
                uint16_t* CurrentUUIDResponseSize = SDP_AddDataElementHeader16(&CurrResponsePos, SDP_DATATYPE_Sequence);
                


@@ -232,34 +221,23 @@ static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHe
                                /* If the Attribute does not exist in the current UUID's Attribute table, continue to the next Attribute ID */
                                if (AttributeValue == NULL)
                                  continue;
                                /* If the Attribute does not exist in the current UUID's Attribute table, continue to the next Attribute ID */
                                if (AttributeValue == NULL)
                                  continue;

-
-                               /* Retrieve the size of the attribute value from its container header */
-                               uint32_t AttributeValueLength = SDP_GetLocalAttributeContainerSize(AttributeValue);                             
+                               

                                BT_SDP_DEBUG(2, " -- Add Attribute 0x%04X", CurrAttributeID);
 
                                BT_SDP_DEBUG(2, " -- Add Attribute 0x%04X", CurrAttributeID);
 

-                               /* Add a Data Element header to the response for the Attribute ID */
-                               *((uint8_t*)CurrResponsePos) = (1 | SDP_DATATYPE_UnsignedInt);
-                               CurrResponsePos += sizeof(uint8_t);
-                               
-                               /* Add the Attribute ID to the created Data Element */
-                               *((uint16_t*)CurrResponsePos) = CurrAttributeID;
-                               CurrResponsePos += sizeof(uint16_t);
-                               
-                               /* Copy over the Attribute value Data Element container to the response */
-                               memcpy_P(CurrResponsePos, AttributeValue, AttributeValueLength);
-                               CurrResponsePos += AttributeValueLength;
-                               

                                /* Increment the current UUID's returned Attribute container size by the number of added bytes */
                                /* Increment the current UUID's returned Attribute container size by the number of added bytes */

-                               *CurrentUUIDResponseSize += sizeof(uint8_t) + sizeof(uint16_t) + AttributeValueLength;
+                               *CurrentUUIDResponseSize += SDP_AddAttributeToResponse(CurrAttributeID, AttributeValue, &CurrResponsePos);

                        }
 
                        /* Increment the outer container size by the number of added bytes */
                        *TotalResponseSize += 3 + *CurrentUUIDResponseSize;
                }
        }
                        }
 
                        /* Increment the outer container size by the number of added bytes */
                        *TotalResponseSize += 3 + *CurrentUUIDResponseSize;
                }
        }

+       
+       /* Continuation state - always zero */
+       *((uint8_t*)CurrResponsePos) = 0;

 
 

-       /* Set the total response list size to the size of the outer container plus its header size */
-       ResponsePacket.AttributeListByteCount    = 3 + *TotalResponseSize;
+       /* Set the total response list size to the size of the outer container plus its header size and continuation state */
+       ResponsePacket.AttributeListByteCount    = 4 + *TotalResponseSize;

 
        /* Fill in the response packet's header */
        ResponsePacket.SDPHeader.PDU             = SDP_PDU_SERVICESEARCHATTRIBUTERESPONSE;
 
        /* Fill in the response packet's header */
        ResponsePacket.SDPHeader.PDU             = SDP_PDU_SERVICESEARCHATTRIBUTERESPONSE;


@@ -274,6 +252,35 @@ static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHe
                             Channel);
 }
 
                             Channel);
 }
 

+/** Adds the given attribute ID and value to the reponse buffer, and advances the response buffer pointer past the added data.
+ *
+ *  \param[in] AttributeID          Attribute ID to add to the response buffer
+ *  \param[in] AttributeValue       Pointer to the start of the Attribute's value, located in PROGMEM
+ *  \param[in, out] ResponseBuffer  Pointer to a buffer where the Attribute and Attribute Value is to be added
+ *
+ *  \return Number of bytes added to the response buffer
+ */
+static uint16_t SDP_AddAttributeToResponse(const uint16_t AttributeID, const void* AttributeValue, void** ResponseBuffer)
+{
+       /* Retrieve the size of the attribute value from its container header */
+       uint8_t  AttributeHeaderLength;
+       uint32_t AttributeValueLength = SDP_GetLocalAttributeContainerSize(AttributeValue, &AttributeHeaderLength);
+
+       /* Add a Data Element header to the response for the Attribute ID */
+       *((uint8_t*)*ResponseBuffer) = (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit);
+       *ResponseBuffer += sizeof(uint8_t);
+       
+       /* Add the Attribute ID to the created Data Element */
+       *((uint16_t*)*ResponseBuffer) = AttributeID;
+       *ResponseBuffer += sizeof(uint16_t);
+       
+       /* Copy over the Attribute value Data Element container to the response */
+       memcpy_P(*ResponseBuffer, AttributeValue, AttributeHeaderLength + AttributeValueLength);
+       *ResponseBuffer += AttributeHeaderLength + AttributeValueLength;
+       
+       return (sizeof(uint8_t) + sizeof(uint16_t) + AttributeHeaderLength + AttributeValueLength);
+}
+

 /** Retrieves a pointer to the value of the given Attribute ID from the given Attribute table.
  *
  *  \param[in] AttributeTable  Pointer to the Attribute table to search in
 /** Retrieves a pointer to the value of the given Attribute ID from the given Attribute table.
  *
  *  \param[in] AttributeTable  Pointer to the Attribute table to search in


@@ -309,9 +316,35 @@ static ServiceAttributeTable_t* SDP_GetAttributeTable(const uint8_t* const UUID)
        /* Search through the global UUID list an item at a time */
        for (uint8_t CurrTableItem = 0; CurrTableItem < (sizeof(SDP_Services_Table) / sizeof(ServiceTable_t)); CurrTableItem++)
        {
        /* Search through the global UUID list an item at a time */
        for (uint8_t CurrTableItem = 0; CurrTableItem < (sizeof(SDP_Services_Table) / sizeof(ServiceTable_t)); CurrTableItem++)
        {

+               /* Read in a pointer to the current UUID table entry's Attribute table */
+               ServiceAttributeTable_t* CurrAttributeTable = (ServiceAttributeTable_t*)pgm_read_word(&SDP_Services_Table[CurrTableItem].AttributeTable);
+       

                /* If the current table item's UUID matches the search UUID, return a pointer the table item's Attribute table */
                if (!(memcmp_P(UUID, SDP_Services_Table[CurrTableItem].UUID, UUID_SIZE_BYTES)))
                /* If the current table item's UUID matches the search UUID, return a pointer the table item's Attribute table */
                if (!(memcmp_P(UUID, SDP_Services_Table[CurrTableItem].UUID, UUID_SIZE_BYTES)))

-                 return (ServiceAttributeTable_t*)pgm_read_word(&SDP_Services_Table[CurrTableItem].AttributeTable);
+                 return CurrAttributeTable;
+               
+               /* Retrieve the list of the service's Class UUIDs from its Attribute table */
+               void* ClassUUIDs = SDP_GetAttributeValue(CurrAttributeTable, SDP_ATTRIBUTE_ID_SERVICECLASSIDS);
+               
+               /* Go to the next UUID in the table if the current item does not have a list of Class UUIDs */
+               if (ClassUUIDs == NULL)
+                 continue;
+                 
+               /* Retrieve the size of the Class UUID list and skip past the header to the first Class UUID in the list */ 
+               uint8_t  ClassUUIDListHeaderSize;
+               uint32_t ClassUUIDListSize = SDP_GetLocalAttributeContainerSize(ClassUUIDs, &ClassUUIDListHeaderSize);
+               ClassUUIDs += ClassUUIDListHeaderSize;
+               
+               /* Check each class UUID in turn for a match */
+               while (ClassUUIDListSize)
+               {
+                       /* Current Service UUID's Class UUID list has a matching entry, return the Attribute table */
+                       if (!(memcmp_P(UUID, &((ClassUUID_t*)ClassUUIDs)->UUID, UUID_SIZE_BYTES)))
+                         return CurrAttributeTable;
+               
+                       ClassUUIDListSize -= sizeof(ClassUUID_t);
+                       ClassUUIDs        += sizeof(ClassUUID_t);
+               }       

        }
        
        return NULL;
        }
        
        return NULL;


@@ -404,7 +437,7 @@ static uint8_t SDP_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], const void**
  *
  *  \return Size in bytes of the entire attribute container, including the header
  */
  *
  *  \return Size in bytes of the entire attribute container, including the header
  */

-static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeData)
+static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeData, uint8_t* const HeaderSize)

 {
        /* Fetch the size of the Data Element structure from the header */
        uint8_t SizeIndex = (pgm_read_byte(AttributeData) & 0x07);
 {
        /* Fetch the size of the Data Element structure from the header */
        uint8_t SizeIndex = (pgm_read_byte(AttributeData) & 0x07);


@@ -412,14 +445,18 @@ static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeDa
        /* Convert the Data Element size index into a size in bytes */
        switch (SizeIndex)
        {
        /* Convert the Data Element size index into a size in bytes */
        switch (SizeIndex)
        {

-               case 5:
-                       return (1 + sizeof(uint8_t)) + pgm_read_byte(AttributeData + 1);
-               case 6:
-                       return (1 + sizeof(uint16_t)) + pgm_read_word(AttributeData + 1);
-               case 7:
-                       return (1 + sizeof(uint32_t)) + pgm_read_dword(AttributeData + 1);
+               case SDP_DATASIZE_Variable8Bit:
+                       *HeaderSize = (1 + sizeof(uint8_t));
+                       return pgm_read_byte(AttributeData + 1);
+               case SDP_DATASIZE_Variable16Bit:
+                       *HeaderSize = (1 + sizeof(uint16_t));
+                       return pgm_read_word(AttributeData + 1);
+               case SDP_DATASIZE_Variable32Bit:
+                       *HeaderSize = (1 + sizeof(uint32_t));
+                       return pgm_read_dword(AttributeData + 1);

                default:
                default:

-                       return (1 + (1 << SizeIndex));
+                       *HeaderSize = 1;
+                       return (1 << SizeIndex);

        }
 
        return 0;
        }
 
        return 0;


@@ -444,17 +481,17 @@ static uint32_t SDP_GetDataElementSize(const void** const DataElementHeader, uin
        /* Convert the Data Element size index into a size in bytes */
        switch (SizeIndex)
        {
        /* Convert the Data Element size index into a size in bytes */
        switch (SizeIndex)
        {

-               case 5:
+               case SDP_DATASIZE_Variable8Bit:

                        ElementValue = *((uint8_t*)*DataElementHeader);
                        *DataElementHeader += sizeof(uint8_t);
                        *ElementHeaderSize  = (1 + sizeof(uint8_t));
                        break;
                        ElementValue = *((uint8_t*)*DataElementHeader);
                        *DataElementHeader += sizeof(uint8_t);
                        *ElementHeaderSize  = (1 + sizeof(uint8_t));
                        break;

-               case 6:
+               case SDP_DATASIZE_Variable16Bit:

                        ElementValue = *((uint16_t*)*DataElementHeader);
                        *DataElementHeader += sizeof(uint16_t);
                        *ElementHeaderSize  = (1 + sizeof(uint16_t));
                        break;
                        ElementValue = *((uint16_t*)*DataElementHeader);
                        *DataElementHeader += sizeof(uint16_t);
                        *ElementHeaderSize  = (1 + sizeof(uint16_t));
                        break;

-               case 7:
+               case SDP_DATASIZE_Variable32Bit:

                        ElementValue = *((uint32_t*)*DataElementHeader);
                        *DataElementHeader += sizeof(uint32_t);
                        *ElementHeaderSize  = (1 + sizeof(uint32_t));
                        ElementValue = *((uint32_t*)*DataElementHeader);
                        *DataElementHeader += sizeof(uint32_t);
                        *ElementHeaderSize  = (1 + sizeof(uint32_t));