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