Fixed incorrect signature for the ATMEGA32U2 in the DFU bootloader (thanks to Axel...

Partial fix to the Bluetooth SDP code - data should be encoded in big endian, not little endian.

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index becfb8d..3cf1526 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -68,16 +68,16 @@
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x97
                        #define AVR_SIGNATURE_3               0x82
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x97
                        #define AVR_SIGNATURE_3               0x82

-               #elif defined(__AVR_AT90USB647__)
-                       #define PRODUCT_ID_CODE               0x2FF9
-                       #define AVR_SIGNATURE_1               0x1E
-                       #define AVR_SIGNATURE_2               0x96
-                       #define AVR_SIGNATURE_3               0x82

                #elif defined(__AVR_AT90USB1286__)
                        #define PRODUCT_ID_CODE               0x2FFB
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x97
                        #define AVR_SIGNATURE_3               0x82
                #elif defined(__AVR_AT90USB1286__)
                        #define PRODUCT_ID_CODE               0x2FFB
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x97
                        #define AVR_SIGNATURE_3               0x82

+               #elif defined(__AVR_AT90USB647__)
+                       #define PRODUCT_ID_CODE               0x2FF9
+                       #define AVR_SIGNATURE_1               0x1E
+                       #define AVR_SIGNATURE_2               0x96
+                       #define AVR_SIGNATURE_3               0x82

                #elif defined(__AVR_AT90USB646__)
                        #define PRODUCT_ID_CODE               0x2FF9
                        #define AVR_SIGNATURE_1               0x1E
                #elif defined(__AVR_AT90USB646__)
                        #define PRODUCT_ID_CODE               0x2FF9
                        #define AVR_SIGNATURE_1               0x1E


@@ -93,16 +93,16 @@
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x95
                        #define AVR_SIGNATURE_3               0x87
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x95
                        #define AVR_SIGNATURE_3               0x87

+               #elif defined(__AVR_ATmega32U2__)
+                       #define PRODUCT_ID_CODE               0x2FF0
+                       #define AVR_SIGNATURE_1               0x1E
+                       #define AVR_SIGNATURE_2               0x95
+                       #define AVR_SIGNATURE_3               0x8A

                #elif defined(__AVR_ATmega16U4__)
                        #define PRODUCT_ID_CODE               0x2FF3
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x94
                        #define AVR_SIGNATURE_3               0x88
                #elif defined(__AVR_ATmega16U4__)
                        #define PRODUCT_ID_CODE               0x2FF3
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x94
                        #define AVR_SIGNATURE_3               0x88

-               #elif defined(__AVR_ATmega32U2__)
-                       #define PRODUCT_ID_CODE               0x2FF0
-                       #define AVR_SIGNATURE_1               0x1E
-                       #define AVR_SIGNATURE_2               0x94
-                       #define AVR_SIGNATURE_3               0x82

                #elif defined(__AVR_ATmega16U2__)
                        #define PRODUCT_ID_CODE               0x2FEF
                        #define AVR_SIGNATURE_1               0x1E
                #elif defined(__AVR_ATmega16U2__)
                        #define PRODUCT_ID_CODE               0x2FEF
                        #define AVR_SIGNATURE_1               0x1E

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
index e58a001..ba51701 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
@@ -192,7 +192,7 @@ static void Bluetooth_ProcessIncommingACLPackets(void)
                Pipe_Read_Stream_LE(PacketData, DataHeader.PayloadLength);
                Pipe_ClearIN();
                Pipe_Freeze();
                Pipe_Read_Stream_LE(PacketData, DataHeader.PayloadLength);
                Pipe_ClearIN();
                Pipe_Freeze();

-
+       

                Bluetooth_PacketReceived(PacketData, DataHeader.PayloadLength,
                                         Bluetooth_GetChannelData(DataHeader.DestinationChannel, CHANNEL_SEARCH_LOCALNUMBER));
        }
                Bluetooth_PacketReceived(PacketData, DataHeader.PayloadLength,
                                         Bluetooth_GetChannelData(DataHeader.DestinationChannel, CHANNEL_SEARCH_LOCALNUMBER));
        }

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
index accbee5..7c99613 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c
@@ -136,7 +136,78 @@ void SDP_ProcessPacket(void* Data, Bluetooth_Channel_t* Channel)
  */
 static void SDP_ProcessServiceSearch(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel)
 {
  */
 static void SDP_ProcessServiceSearch(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel)
 {

+       const void* CurrentParameter = ((void*)SDPHeader + sizeof(SDP_PDUHeader_t));
+

        BT_SDP_DEBUG(1, "<< Service Search");
        BT_SDP_DEBUG(1, "<< Service Search");

+
+       /* Retrieve the list of search UUIDs from the request */
+       uint8_t UUIDList[12][UUID_SIZE_BYTES];
+       uint8_t TotalUUIDs = SDP_GetUUIDList(UUIDList, &CurrentParameter);
+       BT_SDP_DEBUG(2, "-- Total UUIDs: %d", TotalUUIDs);
+       
+       /* Retrieve the maximum service record reponse count from the request */
+       uint16_t MaxServiceRecordCount = SwapEndian_16(*((uint16_t*)CurrentParameter));
+       CurrentParameter += sizeof(uint16_t);
+       BT_SDP_DEBUG(2, "-- Max Return Service Count: 0x%04X", MaxServiceRecordCount);
+       
+       struct
+       {
+               SDP_PDUHeader_t SDPHeader;
+               uint16_t        TotalServiceRecordCount;
+               uint16_t        CurrentServiceRecordCount;
+               uint8_t         ResponseData[100];
+       } ResponsePacket;
+
+       /* Create a pointer to the buffer to indicate the current location for response data to be added */
+       void* CurrResponsePos = ResponsePacket.ResponseData;
+       
+       uint8_t AddedServiceHandles = 0;
+
+       /* Search through the list of UUIDs one at a time looking for matching search Attributes */
+       for (uint8_t CurrUUIDItem = 0; CurrUUIDItem < TotalUUIDs; CurrUUIDItem++)
+       {
+               /* Retrieve the attribute table of the current search UUID from the global UUID table if it exists */
+               ServiceAttributeTable_t* AttributeTable = SDP_GetAttributeTable(UUIDList[CurrUUIDItem]);
+               
+               /* If the UUID does not exist in the global UUID table, continue on to the next search UUID */
+               if (AttributeTable == NULL)
+                 continue;
+                 
+               BT_SDP_DEBUG(2, " -- Found UUID %d in table", CurrUUIDItem);
+
+               /* Retrieve a PROGMEM pointer to the value of the service's record handle */
+               const void* AttributeValue = SDP_GetAttributeValue(AttributeTable, SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE);
+
+               /* Copy over the service record handle to the response list */
+               uint8_t AttrHeaderSize;
+               SDP_GetLocalAttributeContainerSize(AttributeValue, &AttrHeaderSize);
+               memcpy_P(CurrResponsePos, AttributeValue + AttrHeaderSize, sizeof(uint32_t));
+               CurrResponsePos += AttrHeaderSize + sizeof(uint32_t);
+               
+               /* Increment the total number of service records added to the list */
+               AddedServiceHandles++;
+       }
+
+       /* Continuation state - always zero */
+       *((uint8_t*)CurrResponsePos) = 0;
+
+       /* Fill out the service record count values in the returned packet */
+       ResponsePacket.TotalServiceRecordCount   = SwapEndian_16(AddedServiceHandles);
+       ResponsePacket.CurrentServiceRecordCount = ResponsePacket.TotalServiceRecordCount;
+
+       /* Fill in the response packet's header */
+       ResponsePacket.SDPHeader.PDU             = SDP_PDU_SERVICESEARCHRESPONSE;
+       ResponsePacket.SDPHeader.TransactionID   = SDPHeader->TransactionID;
+       ResponsePacket.SDPHeader.ParameterLength = SwapEndian_16((ResponsePacket.CurrentServiceRecordCount << 2) +
+                                                                sizeof(ResponsePacket.CurrentServiceRecordCount) +
+                                                                sizeof(ResponsePacket.TotalServiceRecordCount) +
+                                                                sizeof(uint8_t));
+
+       BT_SDP_DEBUG(1, ">> Service Search Response");
+
+       /* Send the completed response packet to the sender */
+       Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket.SDPHeader) + ResponsePacket.SDPHeader.ParameterLength),
+                            Channel);

 }
 
 /** Internal processing routine for SDP Service Attribute Requests.
 }
 
 /** Internal processing routine for SDP Service Attribute Requests.


@@ -166,7 +237,7 @@ static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHe
        BT_SDP_DEBUG(2, "-- Total UUIDs: %d", TotalUUIDs);
        
        /* Retrieve the maximum Attribute reponse size from the request */
        BT_SDP_DEBUG(2, "-- Total UUIDs: %d", TotalUUIDs);
        
        /* Retrieve the maximum Attribute reponse size from the request */

-       uint16_t MaxAttributeSize = *((uint16_t*)CurrentParameter);
+       uint16_t MaxAttributeSize = SwapEndian_16(*((uint16_t*)CurrentParameter));

        CurrentParameter += sizeof(uint16_t);
        BT_SDP_DEBUG(2, "-- Max Return Attribute Bytes: 0x%04X", MaxAttributeSize);
        
        CurrentParameter += sizeof(uint16_t);
        BT_SDP_DEBUG(2, "-- Max Return Attribute Bytes: 0x%04X", MaxAttributeSize);
        


@@ -231,21 +302,28 @@ static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHe
                        /* 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;
                }

+
+               /* Flip the endianness of the container's size */
+               *CurrentUUIDResponseSize = SwapEndian_16(*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 and continuation state */
        }
        
        /* 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 and continuation state */

-       ResponsePacket.AttributeListByteCount    = 4 + *TotalResponseSize;
+       ResponsePacket.AttributeListByteCount    = SwapEndian_16(3 + *TotalResponseSize);

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

-       ResponsePacket.SDPHeader.ParameterLength = (ResponsePacket.AttributeListByteCount + sizeof(ResponsePacket.AttributeListByteCount));
+       ResponsePacket.SDPHeader.ParameterLength = SwapEndian_16(sizeof(ResponsePacket.AttributeListByteCount) + 
+                                                                (3 + *TotalResponseSize) +
+                                                                sizeof(uint8_t));
+
+       /* Flip the endianness of the container's size */
+       *TotalResponseSize = SwapEndian_16(*TotalResponseSize);

 
        BT_SDP_DEBUG(1, ">> Service Search Attribute Response");
 
        BT_SDP_DEBUG(1, ">> Service Search Attribute Response");

-       BT_SDP_DEBUG(2, "-- Total Parameter Length: 0x%04X", ResponsePacket.SDPHeader.ParameterLength);

 
        /* Send the completed response packet to the sender */
        Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket.SDPHeader) + ResponsePacket.SDPHeader.ParameterLength),
 
        /* Send the completed response packet to the sender */
        Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket.SDPHeader) + ResponsePacket.SDPHeader.ParameterLength),


@@ -271,11 +349,12 @@ static uint16_t SDP_AddAttributeToResponse(const uint16_t AttributeID, const voi
        *ResponseBuffer += sizeof(uint8_t);
        
        /* Add the Attribute ID to the created Data Element */
        *ResponseBuffer += sizeof(uint8_t);
        
        /* Add the Attribute ID to the created Data Element */

-       *((uint16_t*)*ResponseBuffer) = AttributeID;
+       *((uint16_t*)*ResponseBuffer) = SwapEndian_16(AttributeID);

        *ResponseBuffer += sizeof(uint16_t);
        
        /* Copy over the Attribute value Data Element container to the response */
        memcpy_P(*ResponseBuffer, AttributeValue, AttributeHeaderLength + AttributeValueLength);
        *ResponseBuffer += sizeof(uint16_t);
        
        /* Copy over the Attribute value Data Element container to the response */
        memcpy_P(*ResponseBuffer, AttributeValue, AttributeHeaderLength + AttributeValueLength);

+       SwapEndian_n(*ResponseBuffer, AttributeHeaderLength);

        *ResponseBuffer += AttributeHeaderLength + AttributeValueLength;
        
        return (sizeof(uint8_t) + sizeof(uint16_t) + AttributeHeaderLength + AttributeValueLength);
        *ResponseBuffer += AttributeHeaderLength + AttributeValueLength;
        
        return (sizeof(uint8_t) + sizeof(uint16_t) + AttributeHeaderLength + AttributeValueLength);


@@ -377,7 +456,11 @@ static uint8_t SDP_GetAttributeList(uint16_t AttributeList[][2], const void** co
                
                /* If the element is not an Attribute Range, copy over the starting ID to the ending ID to make a range of 1 */
                if (AttributeLength == 2)
                
                /* If the element is not an Attribute Range, copy over the starting ID to the ending ID to make a range of 1 */
                if (AttributeLength == 2)

-                 memcpy(&CurrentAttributeRange[1], *CurrentParameter, 2);
+                 CurrentAttributeRange[1] = CurrentAttributeRange[0];
+
+               /* Swap the endianness of the attribute range values */
+               CurrentAttributeRange[0] = SwapEndian_16(CurrentAttributeRange[0]);
+               CurrentAttributeRange[1] = SwapEndian_16(CurrentAttributeRange[1]);

 
                BT_SDP_DEBUG(2, "-- Attribute: 0x%04X-0x%04X", CurrentAttributeRange[0], CurrentAttributeRange[1]);
                
 
                BT_SDP_DEBUG(2, "-- Attribute: 0x%04X-0x%04X", CurrentAttributeRange[0], CurrentAttributeRange[1]);
                


@@ -476,31 +559,31 @@ static uint32_t SDP_GetDataElementSize(const void** const DataElementHeader, uin
        uint8_t SizeIndex = (*((uint8_t*)*DataElementHeader) & 0x07);
        *DataElementHeader += sizeof(uint8_t);
        
        uint8_t SizeIndex = (*((uint8_t*)*DataElementHeader) & 0x07);
        *DataElementHeader += sizeof(uint8_t);
        

-       uint32_t ElementValue;
+       uint32_t ElementValueSize;

 
        /* Convert the Data Element size index into a size in bytes */
        switch (SizeIndex)
        {
                case SDP_DATASIZE_Variable8Bit:
 
        /* Convert the Data Element size index into a size in bytes */
        switch (SizeIndex)
        {
                case SDP_DATASIZE_Variable8Bit:

-                       ElementValue = *((uint8_t*)*DataElementHeader);
+                       ElementValueSize    = *((uint8_t*)*DataElementHeader);

                        *DataElementHeader += sizeof(uint8_t);
                        *ElementHeaderSize  = (1 + sizeof(uint8_t));
                        break;
                case SDP_DATASIZE_Variable16Bit:
                        *DataElementHeader += sizeof(uint8_t);
                        *ElementHeaderSize  = (1 + sizeof(uint8_t));
                        break;
                case SDP_DATASIZE_Variable16Bit:

-                       ElementValue = *((uint16_t*)*DataElementHeader);
+                       ElementValueSize    = SwapEndian_16(*((uint16_t*)*DataElementHeader));

                        *DataElementHeader += sizeof(uint16_t);
                        *ElementHeaderSize  = (1 + sizeof(uint16_t));
                        break;
                case SDP_DATASIZE_Variable32Bit:
                        *DataElementHeader += sizeof(uint16_t);
                        *ElementHeaderSize  = (1 + sizeof(uint16_t));
                        break;
                case SDP_DATASIZE_Variable32Bit:

-                       ElementValue = *((uint32_t*)*DataElementHeader);
+                       ElementValueSize    = SwapEndian_32(*((uint32_t*)*DataElementHeader));

                        *DataElementHeader += sizeof(uint32_t);
                        *ElementHeaderSize  = (1 + sizeof(uint32_t));
                        break;
                default:
                        *DataElementHeader += sizeof(uint32_t);
                        *ElementHeaderSize  = (1 + sizeof(uint32_t));
                        break;
                default:

-                       ElementValue = (1 << SizeIndex);
-                       *ElementHeaderSize = 1;
+                       ElementValueSize    = (1 << SizeIndex);
+                       *ElementHeaderSize  = 1;

                        break;
        }
        
                        break;
        }
        

-       return ElementValue;
+       return ElementValueSize;

 }
 }

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 86b84cc..febc216 100644 (file)
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -169,7 +169,7 @@
                        {
                                uint8_t* CurrDataPos = (uint8_t*)Data;
                        
                        {
                                uint8_t* CurrDataPos = (uint8_t*)Data;
                        

-                               while (Bytes)
+                               while (Bytes > 1)

                                {
                                        uint8_t Temp = *CurrDataPos;
                                        *CurrDataPos = *(CurrDataPos + Bytes - 1);
                                {
                                        uint8_t Temp = *CurrDataPos;
                                        *CurrDataPos = *(CurrDataPos + Bytes - 1);

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 638d8a1..97a49c2 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -29,6 +29,7 @@
   *  - Fixed RNDISEthernet demos crashing when calculating checksums for Ethernet/TCP packets of more than ~500 bytes due to
   *    an overflow in the checksum calculation loop (thanks to Kevin Malec)
   *  - Fixed XPLAINBridge project not correctly reading the XMEGA's supply voltage when reporting back to the host
   *  - Fixed RNDISEthernet demos crashing when calculating checksums for Ethernet/TCP packets of more than ~500 bytes due to
   *    an overflow in the checksum calculation loop (thanks to Kevin Malec)
   *  - Fixed XPLAINBridge project not correctly reading the XMEGA's supply voltage when reporting back to the host

+  *  - Fixed incorrect signature for the ATMEGA32U2 in the DFU bootloader (thanks to Axel Rohde)

   *
   *  \section Sec_ChangeLog100513 Version 100513
   *  <b>New:</b>
   *
   *  \section Sec_ChangeLog100513 Version 100513
   *  <b>New:</b>