Fix byte ordering of UUIDs in the SDP server - host can now successfully pair to...

[pub/lufa.git] / Demos / Host / Incomplete / BluetoothHost / Lib / SDPServices.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c
index 511e0b0..908be0c 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c
@@ -34,7 +34,7 @@ const struct
 {\r
        uint8_t  Header;\r
        uint32_t Data;\r
-} PROGMEM RFCOMM_Attribute_ServiceHandle =\r
+} PROGMEM SerialPort_Attribute_ServiceHandle =\r
        {\r
                (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit),\r
                SWAPENDIAN_32(0x00010001),\r
@@ -45,7 +45,7 @@ const struct
        uint8_t    Header;\r
        uint16_t   Size;\r
        ItemUUID_t UUIDList[];\r
-} PROGMEM RFCOMM_Attribute_ServiceClassIDs =\r
+} PROGMEM SerialPort_Attribute_ServiceClassIDs =\r
        {\r
                (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable16Bit),\r
                SWAPENDIAN_16(sizeof(ItemUUID_t) * 1),\r
@@ -56,11 +56,11 @@ const struct
 \r
 const struct\r
 {\r
-       uint8_t        Header;\r
-       uint16_t       Size;\r
+       uint8_t  Header;\r
+       uint16_t Size;\r
 \r
        ItemProtocol_t ProtocolList[];\r
-} PROGMEM RFCOMM_Attribute_ProtocolDescriptor =\r
+} PROGMEM SerialPort_Attribute_ProtocolDescriptor =\r
        {\r
                (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable16Bit),\r
                SWAPENDIAN_16(sizeof(ItemProtocol_t) * 2),\r
@@ -87,7 +87,7 @@ const struct
        uint8_t    Header;\r
        uint16_t   Size;\r
        ItemUUID_t UUIDList[];\r
-} PROGMEM RFCOMM_Attribute_BrowseGroupList =\r
+} PROGMEM SerialPort_Attribute_BrowseGroupList =\r
        {\r
                (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable16Bit),\r
                SWAPENDIAN_16(sizeof(ItemUUID_t) * 1),\r
@@ -98,14 +98,14 @@ const struct
        \r
 const struct\r
 {\r
-       uint8_t      Header;\r
-       uint8_t      Size;\r
-       ItemLangID_t OffsetList[];\r
-} PROGMEM RFCOMM_Attribute_LanguageBaseIDOffset =\r
+       uint8_t            Header;\r
+       uint8_t            Size;\r
+       ItemLangEncoding_t LanguageEncodings[];\r
+} PROGMEM SerialPort_Attribute_LanguageBaseIDOffset =\r
        {\r
                .Header = (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),\r
-               .Size   = (sizeof(ItemLangID_t) * 1),\r
-               .OffsetList =\r
+               .Size   = (sizeof(ItemLangEncoding_t) * 1),\r
+               .LanguageEncodings =\r
                        {\r
                                {\r
                                        {(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), SWAPENDIAN_16(0x454E)},\r
@@ -120,11 +120,11 @@ const struct
        uint8_t Header;\r
        uint8_t Size;\r
        char    Text[];\r
-} PROGMEM RFCOMM_Attribute_ServiceName =\r
+} PROGMEM SerialPort_Attribute_ServiceName =\r
        {\r
                (SDP_DATATYPE_String | SDP_DATASIZE_Variable8Bit),\r
-               sizeof("Serial Port") - 1,\r
-               "Serial Port",\r
+               sizeof("Wireless Serial Port") - 1,\r
+               "Wireless Serial Port",\r
        };\r
 \r
 const struct\r
@@ -132,22 +132,22 @@ const struct
        uint8_t Header;\r
        uint8_t Size;\r
        char    Text[];\r
-} PROGMEM RFCOMM_Attribute_ServiceDescription =\r
+} PROGMEM SerialPort_Attribute_ServiceDescription =\r
        {\r
                (SDP_DATATYPE_String | SDP_DATASIZE_Variable8Bit),\r
                sizeof("Wireless Serial Port Service") - 1,\r
                "Wireless Serial Port Service",\r
        };\r
 \r
-const ServiceAttributeTable_t PROGMEM RFCOMM_Attribute_Table[] =\r
+const ServiceAttributeTable_t PROGMEM SerialPort_Attribute_Table[] =\r
        {\r
-               {.AttributeID = SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE,    .Data = &RFCOMM_Attribute_ServiceHandle       },\r
-               {.AttributeID = SDP_ATTRIBUTE_ID_SERVICECLASSIDS,        .Data = &RFCOMM_Attribute_ServiceClassIDs     },\r
-               {.AttributeID = SDP_ATTRIBUTE_ID_PROTOCOLDESCRIPTORLIST, .Data = &RFCOMM_Attribute_ProtocolDescriptor  },\r
-               {.AttributeID = SDP_ATTRIBUTE_ID_BROWSEGROUPLIST,        .Data = &RFCOMM_Attribute_BrowseGroupList     },\r
-               {.AttributeID = SDP_ATTRIBUTE_ID_LANGUAGEBASEATTROFFSET, .Data = &RFCOMM_Attribute_LanguageBaseIDOffset},\r
-               {.AttributeID = SDP_ATTRIBUTE_ID_SERVICENAME,            .Data = &RFCOMM_Attribute_ServiceName         },\r
-               {.AttributeID = SDP_ATTRIBUTE_ID_SERVICEDESCRIPTION,     .Data = &RFCOMM_Attribute_ServiceDescription  },\r
+               {.AttributeID = SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE,    .Data = &SerialPort_Attribute_ServiceHandle       },\r
+               {.AttributeID = SDP_ATTRIBUTE_ID_SERVICECLASSIDS,        .Data = &SerialPort_Attribute_ServiceClassIDs     },\r
+               {.AttributeID = SDP_ATTRIBUTE_ID_PROTOCOLDESCRIPTORLIST, .Data = &SerialPort_Attribute_ProtocolDescriptor  },\r
+               {.AttributeID = SDP_ATTRIBUTE_ID_BROWSEGROUPLIST,        .Data = &SerialPort_Attribute_BrowseGroupList     },\r
+               {.AttributeID = SDP_ATTRIBUTE_ID_LANGUAGEBASEATTROFFSET, .Data = &SerialPort_Attribute_LanguageBaseIDOffset},\r
+               {.AttributeID = SDP_ATTRIBUTE_ID_SERVICENAME,            .Data = &SerialPort_Attribute_ServiceName         },\r
+               {.AttributeID = SDP_ATTRIBUTE_ID_SERVICEDESCRIPTION,     .Data = &SerialPort_Attribute_ServiceDescription  },\r
 \r
                SERVICE_ATTRIBUTE_TABLE_TERMINATOR\r
        };\r