X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/f13bc35a199f3840aaaabecf5f8616f20da7c262..141d94fa980b6056c1922cbfeb9f5535227331c5:/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 f91ec9840..4eb262103 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c @@ -31,28 +31,39 @@ #define INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C #include "ServiceDiscoveryProtocol.h" +/** Service Discovery Protocol attribute, indicationg the service's name. */ SERVICE_ATTRIBUTE_TEXT(SDP_Attribute_Name, "SDP"); +/** Service Discovery Protocol attribute, indicationg the service's description. */ SERVICE_ATTRIBUTE_TEXT(SDP_Attribute_Description, "BT Service Discovery"); -SERVICE_ATTRIBUTE_LEN8(SDP_Attribute_Availability, SDP_DATATYPE_UNSIGNED_INT, 1, {0xFF}); +/** Service Discovery Protocol attribute, indicationg the service's availability. */ +SERVICE_ATTRIBUTE_LEN8(SDP_Attribute_Availability, SDP_DATATYPE_UnsignedInt, 1, {0xFF}); +/** Service Discovery Protocol attribute table, listing all supported attributes of the service. */ const ServiceAttributeTable_t SDP_Attribute_Table[] PROGMEM = { - {.ID = SDP_ATTRIBUTE_NAME , .Data = &SDP_Attribute_Name}, - {.ID = SDP_ATTRIBUTE_DESCRIPTION , .Data = &SDP_Attribute_Description}, - {.ID = SDP_ATTRIBUTE_AVAILABILITY, .Data = &SDP_Attribute_Availability}, + {.AttributeID = SDP_ATTRIBUTE_NAME , .Data = &SDP_Attribute_Name}, + {.AttributeID = SDP_ATTRIBUTE_DESCRIPTION , .Data = &SDP_Attribute_Description}, + {.AttributeID = SDP_ATTRIBUTE_AVAILABILITY, .Data = &SDP_Attribute_Availability}, SERVICE_ATTRIBUTE_TABLE_TERMINATOR }; +/** RFCOMM Service attribute, indicationg the service's name. */ SERVICE_ATTRIBUTE_TEXT(RFCOMM_Attribute_Name, "RFCOMM"); +/** RFCOMM Service attribute, indicationg the service's description. */ SERVICE_ATTRIBUTE_TEXT(RFCOMM_Attribute_Description, "Virtual Serial"); -SERVICE_ATTRIBUTE_LEN8(RFCOMM_Attribute_Availability, SDP_DATATYPE_UNSIGNED_INT, 1, {0xFF}); +/** RFCOMM Service attribute, indicationg the service's availability. */ +SERVICE_ATTRIBUTE_LEN8(RFCOMM_Attribute_Availability, SDP_DATATYPE_UnsignedInt, 1, {0xFF}); +/** RFCOMM Service attribute table, listing all supported attributes of the service. */ const ServiceAttributeTable_t RFCOMM_Attribute_Table[] PROGMEM = { - {.ID = SDP_ATTRIBUTE_NAME , .Data = &RFCOMM_Attribute_Name}, - {.ID = SDP_ATTRIBUTE_DESCRIPTION , .Data = &RFCOMM_Attribute_Description}, - {.ID = SDP_ATTRIBUTE_AVAILABILITY, .Data = &RFCOMM_Attribute_Availability}, + {.AttributeID = SDP_ATTRIBUTE_NAME , .Data = &RFCOMM_Attribute_Name}, + {.AttributeID = SDP_ATTRIBUTE_DESCRIPTION , .Data = &RFCOMM_Attribute_Description}, + {.AttributeID = SDP_ATTRIBUTE_AVAILABILITY, .Data = &RFCOMM_Attribute_Availability}, SERVICE_ATTRIBUTE_TABLE_TERMINATOR }; +/** Master service table, listing all supported services (and their attribute tables) of the device, including + * each service's UUID. + */ const ServiceTable_t SDP_Services_Table[] = { { // 128-bit UUID for the SDP service @@ -65,6 +76,7 @@ const ServiceTable_t SDP_Services_Table[] = }, }; +/* Base UUID value common to all standardized Bluetooth services */ const uint8_t BaseUUID[] = {BASE_96BIT_UUID, 0x00, 0x00, 0x00, 0x00}; @@ -107,7 +119,7 @@ static void ServiceDiscovery_ProcessServiceSearchAttribute(SDP_PDUHeader_t* SDPH BT_SDP_DEBUG(1, "<< Service Search Attribute"); - uint8_t UUIDList[12][16]; + uint8_t UUIDList[12][UUID_SIZE_BYTES]; uint8_t TotalUUIDs = ServiceDiscovery_GetUUIDList(UUIDList, &CurrentParameter); BT_SDP_DEBUG(2, "-- Total UUIDs: %d", TotalUUIDs); @@ -117,28 +129,29 @@ static void ServiceDiscovery_ProcessServiceSearchAttribute(SDP_PDUHeader_t* SDPH struct { SDP_PDUHeader_t SDPHeader; + uint16_t AttributeListByteCount; uint8_t ResponseData[100]; } ResponsePacket; - ResponsePacket.SDPHeader.PDU = SDP_PDU_SERVICESEARCHATTRIBUTERESPONSE; - ResponsePacket.SDPHeader.TransactionID = SDPHeader->TransactionID; - if (MaxAttributeSize > sizeof(ResponsePacket.ResponseData)) MaxAttributeSize = sizeof(ResponsePacket.ResponseData); - ResponsePacket.SDPHeader.ParameterLength = ServiceDiscovery_ProcessAttributes(UUIDList, TotalUUIDs, + ResponsePacket.AttributeListByteCount = ServiceDiscovery_ProcessAttributes(UUIDList, TotalUUIDs, ResponsePacket.ResponseData, MaxAttributeSize, &CurrentParameter); + ResponsePacket.SDPHeader.PDU = SDP_PDU_SERVICESEARCHATTRIBUTERESPONSE; + ResponsePacket.SDPHeader.TransactionID = SDPHeader->TransactionID; + ResponsePacket.SDPHeader.ParameterLength = (ResponsePacket.AttributeListByteCount + sizeof(ResponsePacket.AttributeListByteCount)); Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket.SDPHeader) + ResponsePacket.SDPHeader.ParameterLength), Channel); } -static uint8_t ServiceDiscovery_ProcessAttributes(uint8_t UUIDList[12][16], const uint8_t TotalUUIDs, uint8_t* ResponseBuffer, +static uint8_t ServiceDiscovery_ProcessAttributes(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs, uint8_t* ResponseBuffer, uint8_t MaxResponseSize, const void** CurrentParameter) { - uint8_t ElementHeaderSize; - uint8_t TotalResponseSize = 0; + uint16_t* AttributeResponseSize = ServiceDiscovery_AddDataElementHeader(&ResponseBuffer, SDP_DATATYPE_UnsignedInt); + uint8_t ElementHeaderSize; uint16_t AttributeIDListLength = ServiceDiscovery_GetDataElementSize(CurrentParameter, &ElementHeaderSize); BT_SDP_DEBUG(2, "-- Total Attribute Length: 0x%04X", AttributeIDListLength); @@ -147,34 +160,32 @@ static uint8_t ServiceDiscovery_ProcessAttributes(uint8_t UUIDList[12][16], cons uint8_t AttributeLength = ServiceDiscovery_GetDataElementSize(CurrentParameter, &ElementHeaderSize); uint32_t Attribute = 0; - memcpy(&Attribute, CurrentParameter, AttributeLength); - + memcpy(&((char*)&Attribute)[sizeof(uint32_t) - AttributeLength], *CurrentParameter, AttributeLength); + BT_SDP_DEBUG(2, "-- Attribute(%d): 0x%08lX", AttributeLength, Attribute); - uint8_t TotalBytesAdded = ServiceDiscovery_GetAttribute(UUIDList, TotalUUIDs, Attribute, &ResponseBuffer, - MaxResponseSize); - TotalResponseSize += TotalBytesAdded; - MaxResponseSize -= TotalBytesAdded; + *AttributeResponseSize += ServiceDiscovery_GetAttribute(UUIDList, TotalUUIDs, Attribute, &ResponseBuffer, + (MaxResponseSize - *AttributeResponseSize)); AttributeIDListLength -= (AttributeLength + ElementHeaderSize); - CurrentParameter += AttributeLength; + *CurrentParameter += AttributeLength; } - return TotalResponseSize; + return *AttributeResponseSize; } -static uint8_t ServiceDiscovery_GetAttribute(uint8_t UUIDList[12][16], const uint8_t TotalUUIDs, const uint32_t Attribute, +static uint8_t ServiceDiscovery_GetAttribute(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs, const uint32_t Attribute, uint8_t** DataBuffer, uint8_t BufferLen) { for (uint8_t CurrTableItem = 0; CurrTableItem < (sizeof(SDP_Services_Table) / sizeof(ServiceTable_t)); CurrTableItem++) { for (uint8_t CurrUUIDIndex = 0; CurrUUIDIndex < TotalUUIDs; CurrUUIDIndex++) { - if (!(memcmp(SDP_Services_Table[CurrTableItem].UUID, UUIDList[CurrUUIDIndex], sizeof(BaseUUID)))) + if (!(memcmp(SDP_Services_Table[CurrTableItem].UUID, UUIDList[CurrUUIDIndex], UUID_SIZE_BYTES))) { const ServiceAttributeTable_t* AttributeTable = SDP_Services_Table[CurrTableItem].AttributeTable; - // Process attribute table + // TODO: Process attribute table BT_SDP_DEBUG(2, "FOUND UUID IN TABLE"); break; @@ -185,7 +196,7 @@ static uint8_t ServiceDiscovery_GetAttribute(uint8_t UUIDList[12][16], const uin return 0; } -static uint8_t ServiceDiscovery_GetUUIDList(uint8_t UUIDList[12][16], const void** CurrentParameter) +static uint8_t ServiceDiscovery_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], const void** CurrentParameter) { uint8_t ElementHeaderSize; uint8_t TotalUUIDs = 0; @@ -195,7 +206,7 @@ static uint8_t ServiceDiscovery_GetUUIDList(uint8_t UUIDList[12][16], const void while (ServicePatternLength) { uint8_t* CurrentUUID = UUIDList[TotalUUIDs++]; - uint8_t UUIDLength = ServiceDiscovery_GetDataElementSize(CurrentParameter, &ElementHeaderSize); + uint8_t UUIDLength = ServiceDiscovery_GetDataElementSize(CurrentParameter, &ElementHeaderSize); memcpy(CurrentUUID, BaseUUID, sizeof(BaseUUID)); memcpy(&CurrentUUID[(UUIDLength <= 32) ? (sizeof(BaseUUID) - 32) : 0], *CurrentParameter, UUIDLength);