Add missing clean_doxygen phony targets to the project makefiles.

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

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h
index 18592ec..548f3d5 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h
@@ -60,14 +60,6 @@
                #define SDP_PDU_SERVICEATTRIBUTERESPONSE        0x05
                #define SDP_PDU_SERVICESEARCHATTRIBUTEREQUEST   0x06
                #define SDP_PDU_SERVICESEARCHATTRIBUTERESPONSE  0x07
                #define SDP_PDU_SERVICEATTRIBUTERESPONSE        0x05
                #define SDP_PDU_SERVICESEARCHATTRIBUTEREQUEST   0x06
                #define SDP_PDU_SERVICESEARCHATTRIBUTERESPONSE  0x07

-               
-               /** Convenience macro - read a pointer out of PROGMEM space.
-                *
-                *  \param[in] x  Address of the pointer to read
-                *
-                *  \return  Pointer retrieved from PROGMEM space
-                */
-               #define pgm_read_ptr(x)                         (void*)pgm_read_word(x)

 
        /* Enums: */
                /** Data sizes for SDP Data Element headers, to indicate the size of the data contained in the element. When creating
 
        /* Enums: */
                /** Data sizes for SDP Data Element headers, to indicate the size of the data contained in the element. When creating


@@ -146,7 +138,7 @@
                        *BufferPos += sizeof(uint32_t);
                }
 
                        *BufferPos += sizeof(uint32_t);
                }
 

-               /** Reads 8 bits of raw data frpm the given buffer, incrementing the buffer position afterwards.
+               /** Reads 8 bits of raw data from the given buffer, incrementing the buffer position afterwards.

                 *
                 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be read from
                 *
                 *
                 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be read from
                 *


@@ -154,13 +146,13 @@
                 */
                static inline uint8_t SDP_ReadData8(const void** BufferPos)
                {
                 */
                static inline uint8_t SDP_ReadData8(const void** BufferPos)
                {

-                       uint8_t Data = *((uint8_t*)*BufferPos);
+                       uint8_t Data = *((const uint8_t*)*BufferPos);

                        *BufferPos += sizeof(uint8_t);
                        
                        return Data;
                }
 
                        *BufferPos += sizeof(uint8_t);
                        
                        return Data;
                }
 

-               /** Reads 16 bits of raw data frpm the given buffer, incrementing the buffer position afterwards.
+               /** Reads 16 bits of raw data from the given buffer, incrementing the buffer position afterwards.

                 *
                 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be read from
                 *
                 *
                 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be read from
                 *


@@ -168,13 +160,13 @@
                 */
                static inline uint16_t SDP_ReadData16(const void** BufferPos)
                {
                 */
                static inline uint16_t SDP_ReadData16(const void** BufferPos)
                {

-                       uint16_t Data = SwapEndian_16(*((uint16_t*)*BufferPos));
+                       uint16_t Data = SwapEndian_16(*((const uint16_t*)*BufferPos));

                        *BufferPos += sizeof(uint16_t);
                        
                        return Data;
                }
 
                        *BufferPos += sizeof(uint16_t);
                        
                        return Data;
                }
 

-               /** Reads 32 bits of raw data frpm the given buffer, incrementing the buffer position afterwards.
+               /** Reads 32 bits of raw data from the given buffer, incrementing the buffer position afterwards.

                 *
                 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be read from
                 *
                 *
                 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be read from
                 *


@@ -182,7 +174,7 @@
                 */
                static inline uint32_t SDP_ReadData32(const void** BufferPos)
                {
                 */
                static inline uint32_t SDP_ReadData32(const void** BufferPos)
                {

-                       uint32_t Data = SwapEndian_32(*((uint32_t*)*BufferPos));
+                       uint32_t Data = SwapEndian_32(*((const uint32_t*)*BufferPos));

                        *BufferPos += sizeof(uint32_t);
                        
                        return Data;
                        *BufferPos += sizeof(uint32_t);
                        
                        return Data;


@@ -198,7 +190,7 @@
                 *
                 *  \param[in, out] BufferPos  Pointer to a buffer where the container header is to be placed
                 *
                 *
                 *  \param[in, out] BufferPos  Pointer to a buffer where the container header is to be placed
                 *

-                *  \return Pointer to the 16-bit size value of the contaner header, which has been pre-zeroed
+                *  \return Pointer to the 16-bit size value of the container header, which has been pre-zeroed

                 */
                static inline uint16_t* SDP_AddSequence16(void** BufferPos)
                {
                 */
                static inline uint16_t* SDP_AddSequence16(void** BufferPos)
                {


@@ -211,7 +203,6 @@
                }
                
        /* Function Prototypes: */
                }
                
        /* Function Prototypes: */

-               void SDP_Initialize(void);

                void SDP_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel);
 
                #if defined(INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C)
                void SDP_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel);
 
                #if defined(INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C)


@@ -226,8 +217,8 @@
 
                        static bool     SDP_SearchServiceTable(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs,
                                                               const ServiceAttributeTable_t* CurrAttributeTable);
 
                        static bool     SDP_SearchServiceTable(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs,
                                                               const ServiceAttributeTable_t* CurrAttributeTable);

-                       static void     SDP_CheckUUIDMatch(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs, bool UUIDMatch[],
-                                                          const void* CurrAttribute);
+                       static void     SDP_CheckUUIDMatch(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs,
+                                                          uint16_t* const UUIDMatchFlags, const void* CurrAttribute);

 
                        static uint8_t  SDP_GetAttributeList(uint16_t AttributeList[][2], const void** const CurrentParameter);
                        static uint8_t  SDP_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], const void** const CurrentParameter);
 
                        static uint8_t  SDP_GetAttributeList(uint16_t AttributeList[][2], const void** const CurrentParameter);
                        static uint8_t  SDP_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], const void** const CurrentParameter);