Fixed compile errors in the incomplete BluetoothHost demo application (thanks to...

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
index 81806e4..ed5db00 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
@@ -127,8 +127,8 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
        }
 
        /* Read in the received ACL packet headers when it has been discovered that a packet has been received */
        }
 
        /* Read in the received ACL packet headers when it has been discovered that a packet has been received */

-       Pipe_Read_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader));
-       Pipe_Read_Stream_LE(&DataHeader, sizeof(DataHeader));
+       Pipe_Read_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader), NULL);
+       Pipe_Read_Stream_LE(&DataHeader, sizeof(DataHeader), NULL);

 
        BT_ACL_DEBUG(2, "");
        BT_ACL_DEBUG(2, "Packet Received");
 
        BT_ACL_DEBUG(2, "");
        BT_ACL_DEBUG(2, "Packet Received");


@@ -142,7 +142,7 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
        {
                /* Read in the Signal Command header of the incoming packet */
                BT_Signal_Header_t SignalCommandHeader;
        {
                /* Read in the Signal Command header of the incoming packet */
                BT_Signal_Header_t SignalCommandHeader;

-               Pipe_Read_Stream_LE(&SignalCommandHeader, sizeof(SignalCommandHeader));
+               Pipe_Read_Stream_LE(&SignalCommandHeader, sizeof(SignalCommandHeader), NULL);

 
                /* Dispatch to the appropriate handler function based on the Signal message code */
                switch (SignalCommandHeader.Code)
 
                /* Dispatch to the appropriate handler function based on the Signal message code */
                switch (SignalCommandHeader.Code)


@@ -175,8 +175,8 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
                                BT_ACL_DEBUG(1, "<< Command Reject");
 
                                uint16_t RejectReason;
                                BT_ACL_DEBUG(1, "<< Command Reject");
 
                                uint16_t RejectReason;

-                               Pipe_Read_Stream_LE(&RejectReason, sizeof(RejectReason));
-                               Pipe_Discard_Stream(ACLPacketHeader.DataLength - sizeof(RejectReason));
+                               Pipe_Read_Stream_LE(&RejectReason, sizeof(RejectReason), NULL);
+                               Pipe_Discard_Stream(ACLPacketHeader.DataLength - sizeof(RejectReason), NULL);

                                Pipe_ClearIN();
                                Pipe_Freeze();
 
                                Pipe_ClearIN();
                                Pipe_Freeze();
 


@@ -185,7 +185,7 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
                        default:
                                BT_ACL_DEBUG(1, "<< Unknown Signaling Command 0x%02X", SignalCommandHeader.Code);
 
                        default:
                                BT_ACL_DEBUG(1, "<< Unknown Signaling Command 0x%02X", SignalCommandHeader.Code);
 

-                               Pipe_Discard_Stream(ACLPacketHeader.DataLength);
+                               Pipe_Discard_Stream(ACLPacketHeader.DataLength, NULL);

                                Pipe_ClearIN();
                                Pipe_Freeze();
                                break;
                                Pipe_ClearIN();
                                Pipe_Freeze();
                                break;


@@ -195,7 +195,7 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
        {
                /* Non-signaling packet received, read in the packet contents and pass to the user application */
                uint8_t PacketData[DataHeader.PayloadLength];
        {
                /* Non-signaling packet received, read in the packet contents and pass to the user application */
                uint8_t PacketData[DataHeader.PayloadLength];

-               Pipe_Read_Stream_LE(PacketData, DataHeader.PayloadLength);
+               Pipe_Read_Stream_LE(PacketData, DataHeader.PayloadLength, NULL);

                Pipe_ClearIN();
                Pipe_Freeze();
 
                Pipe_ClearIN();
                Pipe_Freeze();
 


@@ -281,9 +281,9 @@ uint8_t Bluetooth_SendPacket(void* Data,
        Pipe_Unfreeze();
 
        /* Write the packet contents to the pipe so that it can be sent to the remote device */
        Pipe_Unfreeze();
 
        /* Write the packet contents to the pipe so that it can be sent to the remote device */

-       Pipe_Write_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader));
-       Pipe_Write_Stream_LE(&DataHeader, sizeof(DataHeader));
-       Pipe_Write_Stream_LE(Data, DataLen);
+       Pipe_Write_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader), NULL);
+       Pipe_Write_Stream_LE(&DataHeader, sizeof(DataHeader), NULL);
+       Pipe_Write_Stream_LE(Data, DataLen, NULL);

        Pipe_ClearOUT();
 
        Pipe_Freeze();
        Pipe_ClearOUT();
 
        Pipe_Freeze();


@@ -410,7 +410,7 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
 {
        BT_Signal_ConnectionReq_t ConnectionRequest;
 
 {
        BT_Signal_ConnectionReq_t ConnectionRequest;
 

-       Pipe_Read_Stream_LE(&ConnectionRequest, sizeof(ConnectionRequest));
+       Pipe_Read_Stream_LE(&ConnectionRequest, sizeof(ConnectionRequest), NULL);

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        Pipe_ClearIN();
        Pipe_Freeze();


@@ -494,7 +494,7 @@ static inline void Bluetooth_Signal_ConnectionResp(const BT_Signal_Header_t* con
 {
        BT_Signal_ConnectionResp_t ConnectionResponse;
 
 {
        BT_Signal_ConnectionResp_t ConnectionResponse;
 

-       Pipe_Read_Stream_LE(&ConnectionResponse, sizeof(ConnectionResponse));
+       Pipe_Read_Stream_LE(&ConnectionResponse, sizeof(ConnectionResponse), NULL);

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        Pipe_ClearIN();
        Pipe_Freeze();


@@ -529,8 +529,8 @@ static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* c
        uint8_t OptionsLen = (SignalCommandHeader->Length - sizeof(ConfigurationRequest));
        uint8_t Options[OptionsLen];
 
        uint8_t OptionsLen = (SignalCommandHeader->Length - sizeof(ConfigurationRequest));
        uint8_t Options[OptionsLen];
 

-       Pipe_Read_Stream_LE(&ConfigurationRequest, sizeof(ConfigurationRequest));
-       Pipe_Read_Stream_LE(&Options, sizeof(Options));
+       Pipe_Read_Stream_LE(&ConfigurationRequest, sizeof(ConfigurationRequest), NULL);
+       Pipe_Read_Stream_LE(&Options, sizeof(Options), NULL);

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        Pipe_ClearIN();
        Pipe_Freeze();


@@ -612,7 +612,7 @@ static inline void Bluetooth_Signal_ConfigurationResp(const BT_Signal_Header_t*
 {
        BT_Signal_ConfigurationResp_t ConfigurationResponse;
 
 {
        BT_Signal_ConfigurationResp_t ConfigurationResponse;
 

-       Pipe_Read_Stream_LE(&ConfigurationResponse, sizeof(ConfigurationResponse));
+       Pipe_Read_Stream_LE(&ConfigurationResponse, sizeof(ConfigurationResponse), NULL);

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        Pipe_ClearIN();
        Pipe_Freeze();


@@ -657,7 +657,7 @@ static inline void Bluetooth_Signal_DisconnectionReq(const BT_Signal_Header_t* c
 {
        BT_Signal_DisconnectionReq_t DisconnectionRequest;
 
 {
        BT_Signal_DisconnectionReq_t DisconnectionRequest;
 

-       Pipe_Read_Stream_LE(&DisconnectionRequest, sizeof(DisconnectionRequest));
+       Pipe_Read_Stream_LE(&DisconnectionRequest, sizeof(DisconnectionRequest), NULL);

 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Request");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionRequest.DestinationChannel);
 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Request");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionRequest.DestinationChannel);


@@ -703,7 +703,7 @@ static inline void Bluetooth_Signal_DisconnectionResp(const BT_Signal_Header_t*
 {
        BT_Signal_DisconnectionResp_t DisconnectionResponse;
 
 {
        BT_Signal_DisconnectionResp_t DisconnectionResponse;
 

-       Pipe_Read_Stream_LE(&DisconnectionResponse, sizeof(DisconnectionResponse));
+       Pipe_Read_Stream_LE(&DisconnectionResponse, sizeof(DisconnectionResponse), NULL);

 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Response");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionResponse.DestinationChannel);
 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Response");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionResponse.DestinationChannel);


@@ -754,7 +754,7 @@ static inline void Bluetooth_Signal_InformationReq(const BT_Signal_Header_t* con
 {
        BT_Signal_InformationReq_t InformationRequest;
 
 {
        BT_Signal_InformationReq_t InformationRequest;
 

-       Pipe_Read_Stream_LE(&InformationRequest, sizeof(InformationRequest));
+       Pipe_Read_Stream_LE(&InformationRequest, sizeof(InformationRequest), NULL);

 
        BT_ACL_DEBUG(1, "<< L2CAP Information Request");
        BT_ACL_DEBUG(2, "-- Info Type: 0x%04X", InformationRequest.InfoType);
 
        BT_ACL_DEBUG(1, "<< L2CAP Information Request");
        BT_ACL_DEBUG(2, "-- Info Type: 0x%04X", InformationRequest.InfoType);

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
index 818acac..35bfcdd 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
@@ -65,13 +65,13 @@ void Bluetooth_HCITask(void)
                                BT_HCIEvent_Header_t HCIEventHeader;
 
                                /* Read in the event header to fetch the event code and payload length */
                                BT_HCIEvent_Header_t HCIEventHeader;
 
                                /* Read in the event header to fetch the event code and payload length */

-                               Pipe_Read_Stream_LE(&HCIEventHeader, sizeof(HCIEventHeader));
+                               Pipe_Read_Stream_LE(&HCIEventHeader, sizeof(HCIEventHeader), NULL);

 
                                /* Create a temporary buffer for the event parameters */
                                uint8_t EventParams[HCIEventHeader.ParameterLength];
 
                                /* Read in the event parameters into the temporary buffer */
 
                                /* Create a temporary buffer for the event parameters */
                                uint8_t EventParams[HCIEventHeader.ParameterLength];
 
                                /* Read in the event parameters into the temporary buffer */

-                               Pipe_Read_Stream_LE(&EventParams, HCIEventHeader.ParameterLength);
+                               Pipe_Read_Stream_LE(&EventParams, HCIEventHeader.ParameterLength, NULL);

                                Pipe_ClearIN();
 
                                BT_HCI_DEBUG(1, "Event Received (0x%02X)", HCIEventHeader.EventCode);
                                Pipe_ClearIN();
 
                                BT_HCI_DEBUG(1, "Event Received (0x%02X)", HCIEventHeader.EventCode);

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index b4618a7..93ccce1 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -37,6 +37,7 @@
   *  - Library Applications:
   *   - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2
   *   - Fixed KeyboardHost and KeyboardHostWithParser demos displaying incorrect values when numerical keys were pressed
   *  - Library Applications:
   *   - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2
   *   - Fixed KeyboardHost and KeyboardHostWithParser demos displaying incorrect values when numerical keys were pressed

+  *   - Fixed compile errors in the incomplete BluetoothHost demo application (thanks to Timo Lindfors)

   *
   *  \section Sec_ChangeLog110528 Version 110528
   *  <b>New:</b>
   *
   *  \section Sec_ChangeLog110528 Version 110528
   *  <b>New:</b>

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index 86bf228..a9b8ae5 100644 (file)
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -17,6 +17,9 @@
  *      \c TotalDiscreteSampleRates. Existing applications will need to add an array of \ref USB_Audio_SampleFreq_t elements
  *      immediately following any \ref USB_Audio_Descriptor_Format_t descriptors, and insert the appropriate sampling rates
  *      supported by the device, as well as rename the descriptor elements to match the updated element names.
  *      \c TotalDiscreteSampleRates. Existing applications will need to add an array of \ref USB_Audio_SampleFreq_t elements
  *      immediately following any \ref USB_Audio_Descriptor_Format_t descriptors, and insert the appropriate sampling rates
  *      supported by the device, as well as rename the descriptor elements to match the updated element names.

+ *    - The device mode Audio class driver now requires a new user application callback, \ref CALLBACK_Audio_GetSetEndpointProperty().
+ *      Existing applications must implement this new callback, however if multiple sample rates or pitch control is not used,
+ *      this function may be hard-coded to always return false for previous behaviour to be retained.

  *
  *  \section Sec_Migration110528 Migrating from 101122 to 110528
  *  <b>Non-USB Library Components</b>
  *
  *  \section Sec_Migration110528 Migrating from 101122 to 110528
  *  <b>Non-USB Library Components</b>