Add tag for the 120219 release.

[pub/USBasp.git] / Demos / Host / Incomplete / BluetoothHost / Lib / BluetoothACLPackets.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
index e58a001..15b9821 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -28,10 +28,16 @@
   this software.
 */
 
   this software.
 */
 

+/** \file
+ *
+ *  Bluetooth L2CAP layer management code. This module managed the creation,
+ *  configuration and teardown of L2CAP channels, and manages packet reception
+ *  and sending to and from other Bluetooth devices.
+ */
+

 /*
        TODO: Make SendPacket respect receiver's MTU
        TODO: Make ReceivePacket stitch together MTU fragments (?)
 /*
        TODO: Make SendPacket respect receiver's MTU
        TODO: Make ReceivePacket stitch together MTU fragments (?)

-       TODO: Add channel opened/closed callbacks

  */
 
 #define  INCLUDE_FROM_BLUETOOTH_ACLPACKETS_C
  */
 
 #define  INCLUDE_FROM_BLUETOOTH_ACLPACKETS_C


@@ -42,30 +48,30 @@
  */
 void Bluetooth_ACLTask(void)
 {
  */
 void Bluetooth_ACLTask(void)
 {

-       /* Process incomming ACL packets, if any */
-       Bluetooth_ProcessIncommingACLPackets();
-       
+       /* Process incoming ACL packets, if any */
+       Bluetooth_ProcessIncomingACLPackets();
+

        /* Check for any half-open channels, send configuration details to the remote device if found */
        for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
        {
                Bluetooth_Channel_t* ChannelData = &Bluetooth_Connection.Channels[i];
        /* Check for any half-open channels, send configuration details to the remote device if found */
        for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
        {
                Bluetooth_Channel_t* ChannelData = &Bluetooth_Connection.Channels[i];

-       
+

                bool MustSendConfigReq = true;
                bool MustSendConfigReq = true;

-       
+

                /* Check if we are in a channel state which requires a configuration request to be sent */
                switch (ChannelData->State)
                {
                /* Check if we are in a channel state which requires a configuration request to be sent */
                switch (ChannelData->State)
                {

-                       case Channel_Config_WaitConfig:
-                               ChannelData->State = Channel_Config_WaitReqResp;
+                       case BT_Channel_Config_WaitConfig:
+                               ChannelData->State = BT_Channel_Config_WaitReqResp;

                                break;
                                break;

-                       case Channel_Config_WaitSendConfig:
-                               ChannelData->State = Channel_Config_WaitResp;
+                       case BT_Channel_Config_WaitSendConfig:
+                               ChannelData->State = BT_Channel_Config_WaitResp;

                                break;
                        default:
                                MustSendConfigReq  = false;
                                break;
                }
                                break;
                        default:
                                MustSendConfigReq  = false;
                                break;
                }

-               
+

                /* Only send a configuration request if it the channel was in a state which required it */
                if (MustSendConfigReq)
                {
                /* Only send a configuration request if it the channel was in a state which required it */
                if (MustSendConfigReq)
                {


@@ -73,17 +79,17 @@ void Bluetooth_ACLTask(void)
                        {
                                BT_Signal_Header_t           SignalCommandHeader;
                                BT_Signal_ConfigurationReq_t ConfigurationRequest;
                        {
                                BT_Signal_Header_t           SignalCommandHeader;
                                BT_Signal_ConfigurationReq_t ConfigurationRequest;

-                               
+

                                struct
                                {
                                        BT_Config_Option_Header_t Header;
                                        uint16_t Value;
                                } Option_LocalMTU;
                        } PacketData;
                                struct
                                {
                                        BT_Config_Option_Header_t Header;
                                        uint16_t Value;
                                } Option_LocalMTU;
                        } PacketData;

-                       
+

                        /* Fill out the Signal Command header in the response packet */
                        PacketData.SignalCommandHeader.Code            = BT_SIGNAL_CONFIGURATION_REQUEST;
                        /* Fill out the Signal Command header in the response packet */
                        PacketData.SignalCommandHeader.Code            = BT_SIGNAL_CONFIGURATION_REQUEST;

-                       PacketData.SignalCommandHeader.Identifier      = ++Bluetooth_Connection.SignallingIdentifier;
+                       PacketData.SignalCommandHeader.Identifier      = ++Bluetooth_Connection.SignalingIdentifier;

                        PacketData.SignalCommandHeader.Length          = sizeof(PacketData.ConfigurationRequest) +
                                                                         sizeof(PacketData.Option_LocalMTU);
 
                        PacketData.SignalCommandHeader.Length          = sizeof(PacketData.ConfigurationRequest) +
                                                                         sizeof(PacketData.Option_LocalMTU);
 


@@ -95,34 +101,34 @@ void Bluetooth_ACLTask(void)
                        PacketData.Option_LocalMTU.Value               = ChannelData->LocalMTU;
 
                        Bluetooth_SendPacket(&PacketData, sizeof(PacketData), NULL);
                        PacketData.Option_LocalMTU.Value               = ChannelData->LocalMTU;
 
                        Bluetooth_SendPacket(&PacketData, sizeof(PacketData), NULL);

-                       
+

                        BT_ACL_DEBUG(1, ">> L2CAP Configuration Request");
                        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", PacketData.ConfigurationRequest.DestinationChannel);
                }
        }
 }
 
                        BT_ACL_DEBUG(1, ">> L2CAP Configuration Request");
                        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", PacketData.ConfigurationRequest.DestinationChannel);
                }
        }
 }
 

-/** Incomming ACL packet processing task. This task is called by the main ACL processing task to read in and process
- *  any incomming ACL packets to the device, handling signal requests as they are received or passing along channel
+/** Incoming ACL packet processing task. This task is called by the main ACL processing task to read in and process
+ *  any incoming ACL packets to the device, handling signal requests as they are received or passing along channel

  *  data to the user application.
  */
  *  data to the user application.
  */

-static void Bluetooth_ProcessIncommingACLPackets(void)
+static void Bluetooth_ProcessIncomingACLPackets(void)

 {
        BT_ACL_Header_t        ACLPacketHeader;
        BT_DataPacket_Header_t DataHeader;
 
        Pipe_SelectPipe(BLUETOOTH_DATA_IN_PIPE);
        Pipe_Unfreeze();
 {
        BT_ACL_Header_t        ACLPacketHeader;
        BT_DataPacket_Header_t DataHeader;
 
        Pipe_SelectPipe(BLUETOOTH_DATA_IN_PIPE);
        Pipe_Unfreeze();

-       
+

        if (!(Pipe_IsReadWriteAllowed()))
        {
                Pipe_Freeze();
                return;
        }
        if (!(Pipe_IsReadWriteAllowed()))
        {
                Pipe_Freeze();
                return;
        }

-         
+

        /* 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");


@@ -131,13 +137,13 @@ static void Bluetooth_ProcessIncommingACLPackets(void)
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DataHeader.DestinationChannel);
        BT_ACL_DEBUG(2, "-- Payload Length: 0x%04X", DataHeader.PayloadLength);
 
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DataHeader.DestinationChannel);
        BT_ACL_DEBUG(2, "-- Payload Length: 0x%04X", DataHeader.PayloadLength);
 

-       /* Check the packet's destination channel - signalling channel should be processed by the stack internally */
+       /* Check the packet's destination channel - signaling channel should be processed by the stack internally */

        if (DataHeader.DestinationChannel == BT_CHANNEL_SIGNALING)
        {
        if (DataHeader.DestinationChannel == BT_CHANNEL_SIGNALING)
        {

-               /* Read in the Signal Command header of the incomming packet */
+               /* Read in the Signal Command header of the incoming packet */

                BT_Signal_Header_t SignalCommandHeader;
                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)
                {


@@ -167,29 +173,29 @@ static void Bluetooth_ProcessIncommingACLPackets(void)
                                break;
                        case BT_SIGNAL_COMMAND_REJECT:
                                BT_ACL_DEBUG(1, "<< Command Reject");
                                break;
                        case BT_SIGNAL_COMMAND_REJECT:
                                BT_ACL_DEBUG(1, "<< Command Reject");

-                               
+

                                uint16_t RejectReason;
                                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_ClearIN();

-                               Pipe_Freeze();                          
-                       
+                               Pipe_Freeze();
+

                                BT_ACL_DEBUG(2, "-- Reason: %d", RejectReason);
                                break;
                        default:
                                BT_ACL_DEBUG(1, "<< Unknown Signaling Command 0x%02X", SignalCommandHeader.Code);
                                BT_ACL_DEBUG(2, "-- Reason: %d", RejectReason);
                                break;
                        default:
                                BT_ACL_DEBUG(1, "<< Unknown Signaling Command 0x%02X", SignalCommandHeader.Code);

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

                                Pipe_Freeze();
                                break;
                }
        }
        else
        {
                                Pipe_Freeze();
                                break;
                }
        }
        else
        {

-               /* Non-signalling packet received, read in the packet contents and pass to the user application */
+               /* Non-signaling packet received, read in the packet contents and pass to the user application */

                uint8_t PacketData[DataHeader.PayloadLength];
                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();
 


@@ -198,16 +204,59 @@ static void Bluetooth_ProcessIncommingACLPackets(void)
        }
 }
 
        }
 }
 

+/** Retrieves the channel information structure with the given local or remote channel number from the channel list.
+ *
+ *  \param[in] SearchValue  Value to search for in the channel structure list
+ *  \param[in] SearchKey    Key to search within the channel structure, a \c CHANNEL_SEARCH_* mask
+ *
+ *  \return Pointer to the matching channel information structure in the channel table if found, NULL otherwise
+ */
+Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue,
+                                              const uint8_t SearchKey)
+{
+       for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
+       {
+               Bluetooth_Channel_t* ChannelData = &Bluetooth_Connection.Channels[i];
+
+               /* Closed channels should be ignored as they are not considered valid data */
+               if (ChannelData->State == BT_Channel_Closed)
+                 continue;
+
+               bool FoundMatch = false;
+
+               /* Search the current channel for the search key to see if it matches */
+               switch (SearchKey)
+               {
+                       case CHANNEL_SEARCH_LOCALNUMBER:
+                               FoundMatch = (SearchValue == ChannelData->LocalNumber);
+                               break;
+                       case CHANNEL_SEARCH_REMOTENUMBER:
+                               FoundMatch = (SearchValue == ChannelData->RemoteNumber);
+                               break;
+                       case CHANNEL_SEARCH_PSM:
+                               FoundMatch = (SearchValue == ChannelData->PSM);
+                               break;
+               }
+
+               if (FoundMatch)
+                 return ChannelData;
+       }
+
+       return NULL;
+}
+

 /** Sends a packet to the remote device on the specified channel.
  *
 /** Sends a packet to the remote device on the specified channel.
  *

- * \param[in] Data     Pointer to a buffer where the data is to be sourced from
- * \param[in] DataLen  Length of the data to send
- * \param[in] Channel  Channel information structure containing the destination channel's information, NULL to send
- *                     to the remote device's signalling channel
+ * \param[in] Data        Pointer to a buffer where the data is to be sourced from
+ * \param[in] DataLen     Length of the data to send
+ * \param[in] ACLChannel  ACL channel information structure containing the destination channel's information, NULL
+ *                        to send to the remote device's signaling channel

  *
  * \return A value from the \ref BT_SendPacket_ErrorCodes_t enum
  */
  *
  * \return A value from the \ref BT_SendPacket_ErrorCodes_t enum
  */

-uint8_t Bluetooth_SendPacket(void* Data, const uint16_t DataLen, Bluetooth_Channel_t* const Channel)
+uint8_t Bluetooth_SendPacket(void* Data,
+                             const uint16_t DataLen,
+                             Bluetooth_Channel_t* const ACLChannel)

 {
        BT_ACL_Header_t        ACLPacketHeader;
        BT_DataPacket_Header_t DataHeader;
 {
        BT_ACL_Header_t        ACLPacketHeader;
        BT_DataPacket_Header_t DataHeader;


@@ -216,27 +265,29 @@ uint8_t Bluetooth_SendPacket(void* Data, const uint16_t DataLen, Bluetooth_Chann
        if (!(Bluetooth_Connection.IsConnected))
          return BT_SENDPACKET_NotConnected;
 
        if (!(Bluetooth_Connection.IsConnected))
          return BT_SENDPACKET_NotConnected;
 

-       /* If the destination channel is not the signalling channel and it is not currently fully open, abort */
-       if ((Channel != NULL) && (Channel->State != Channel_Open))
+       /* If the destination channel is not the signaling channel and it is not currently fully open, abort */
+       if ((ACLChannel != NULL) && (ACLChannel->State != BT_Channel_Open))

          return BT_SENDPACKET_ChannelNotOpen;
 
        /* Fill out the packet's header from the remote device connection information structure */
        ACLPacketHeader.ConnectionHandle      = (Bluetooth_Connection.ConnectionHandle | BT_ACL_FIRST_AUTOFLUSH);
        ACLPacketHeader.DataLength            = sizeof(DataHeader) + DataLen;
        DataHeader.PayloadLength              = DataLen;
          return BT_SENDPACKET_ChannelNotOpen;
 
        /* Fill out the packet's header from the remote device connection information structure */
        ACLPacketHeader.ConnectionHandle      = (Bluetooth_Connection.ConnectionHandle | BT_ACL_FIRST_AUTOFLUSH);
        ACLPacketHeader.DataLength            = sizeof(DataHeader) + DataLen;
        DataHeader.PayloadLength              = DataLen;

-       DataHeader.DestinationChannel         = (Channel == NULL) ? BT_CHANNEL_SIGNALING : Channel->RemoteNumber;
+       DataHeader.DestinationChannel         = (ACLChannel == NULL) ? BT_CHANNEL_SIGNALING : ACLChannel->RemoteNumber;

 
        Pipe_SelectPipe(BLUETOOTH_DATA_OUT_PIPE);
 
        Pipe_SelectPipe(BLUETOOTH_DATA_OUT_PIPE);

+
+       Pipe_WaitUntilReady();

        Pipe_Unfreeze();
        Pipe_Unfreeze();

-       
+

        /* Write the packet contents to the pipe so that it can be sent to the remote device */
        /* 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_ClearOUT();

-       
+

        Pipe_Freeze();
        Pipe_Freeze();

-       
+

        BT_ACL_DEBUG(2, "");
        BT_ACL_DEBUG(2, "Packet Sent");
        BT_ACL_DEBUG(2, "-- Connection Handle: 0x%04X", (ACLPacketHeader.ConnectionHandle & 0x0FFF));
        BT_ACL_DEBUG(2, "");
        BT_ACL_DEBUG(2, "Packet Sent");
        BT_ACL_DEBUG(2, "-- Connection Handle: 0x%04X", (ACLPacketHeader.ConnectionHandle & 0x0FFF));


@@ -247,7 +298,7 @@ uint8_t Bluetooth_SendPacket(void* Data, const uint16_t DataLen, Bluetooth_Chann
        return BT_SENDPACKET_NoError;
 }
 
        return BT_SENDPACKET_NoError;
 }
 

-/** Opens a bluetooth channel to the currently connected remote device, so that data can be exchanged.
+/** Opens a Bluetooth channel to the currently connected remote device, so that data can be exchanged.

  *
  *  \note The channel is not immediately opened when this function returns - it must undergo a two way
  *        connection and configuration process first as the main Bluetooth stack processing task is
  *
  *  \note The channel is not immediately opened when this function returns - it must undergo a two way
  *        connection and configuration process first as the main Bluetooth stack processing task is


@@ -265,10 +316,10 @@ Bluetooth_Channel_t* Bluetooth_OpenChannel(const uint16_t PSM)
        /* Search through the channel information list for a free channel item */
        for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
        {
        /* Search through the channel information list for a free channel item */
        for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
        {

-               if (Bluetooth_Connection.Channels[i].State == Channel_Closed)
+               if (Bluetooth_Connection.Channels[i].State == BT_Channel_Closed)

                {
                        ChannelData = &Bluetooth_Connection.Channels[i];
                {
                        ChannelData = &Bluetooth_Connection.Channels[i];

-                       
+

                        /* Set the new channel structure's local channel number to a unique value within the connection orientated
                           channel address space */
                        ChannelData->LocalNumber = (BT_CHANNELNUMBER_BASEOFFSET + i);
                        /* Set the new channel structure's local channel number to a unique value within the connection orientated
                           channel address space */
                        ChannelData->LocalNumber = (BT_CHANNELNUMBER_BASEOFFSET + i);


@@ -284,8 +335,8 @@ Bluetooth_Channel_t* Bluetooth_OpenChannel(const uint16_t PSM)
        ChannelData->RemoteNumber = 0;
        ChannelData->PSM          = PSM;
        ChannelData->LocalMTU     = MAXIMUM_CHANNEL_MTU;
        ChannelData->RemoteNumber = 0;
        ChannelData->PSM          = PSM;
        ChannelData->LocalMTU     = MAXIMUM_CHANNEL_MTU;

-       ChannelData->State        = Channel_WaitConnectRsp;
-         
+       ChannelData->State        = BT_Channel_WaitConnectRsp;
+

        struct
        {
                BT_Signal_Header_t        SignalCommandHeader;
        struct
        {
                BT_Signal_Header_t        SignalCommandHeader;


@@ -294,13 +345,13 @@ Bluetooth_Channel_t* Bluetooth_OpenChannel(const uint16_t PSM)
 
        /* Fill out the Signal Command header in the response packet */
        PacketData.SignalCommandHeader.Code              = BT_SIGNAL_CONNECTION_REQUEST;
 
        /* Fill out the Signal Command header in the response packet */
        PacketData.SignalCommandHeader.Code              = BT_SIGNAL_CONNECTION_REQUEST;

-       PacketData.SignalCommandHeader.Identifier        = ++Bluetooth_Connection.SignallingIdentifier;
+       PacketData.SignalCommandHeader.Identifier        = ++Bluetooth_Connection.SignalingIdentifier;

        PacketData.SignalCommandHeader.Length            = sizeof(PacketData.ConnectionRequest);
        PacketData.SignalCommandHeader.Length            = sizeof(PacketData.ConnectionRequest);

-       
+

        /* Fill out the Connection Request in the response packet */
        PacketData.ConnectionRequest.PSM                 = PSM;
        PacketData.ConnectionRequest.SourceChannel       = ChannelData->LocalNumber;
        /* Fill out the Connection Request in the response packet */
        PacketData.ConnectionRequest.PSM                 = PSM;
        PacketData.ConnectionRequest.SourceChannel       = ChannelData->LocalNumber;

-       
+

        Bluetooth_SendPacket(&PacketData, sizeof(PacketData), NULL);
 
        BT_ACL_DEBUG(1, ">> L2CAP Connection Request");
        Bluetooth_SendPacket(&PacketData, sizeof(PacketData), NULL);
 
        BT_ACL_DEBUG(1, ">> L2CAP Connection Request");


@@ -310,7 +361,7 @@ Bluetooth_Channel_t* Bluetooth_OpenChannel(const uint16_t PSM)
        return ChannelData;
 }
 
        return ChannelData;
 }
 

-/** Closes a bluetooth channel that is open to the currently connected remote device, so that no further data
+/** Closes a Bluetooth channel that is open to the currently connected remote device, so that no further data

  *  can be exchanged.
  *
  *  \note The channel is not immediately closed when this function returns - it must undergo an asynchronous
  *  can be exchanged.
  *
  *  \note The channel is not immediately closed when this function returns - it must undergo an asynchronous


@@ -318,37 +369,37 @@ Bluetooth_Channel_t* Bluetooth_OpenChannel(const uint16_t PSM)
  *        returned channel is unusable by the user application upon return however the channel is not completely
  *        closed until its State element has progressed to the Closed state.
  *
  *        returned channel is unusable by the user application upon return however the channel is not completely
  *        closed until its State element has progressed to the Closed state.
  *

- * \param[in,out] Channel  Channel information structure of the channel to close
+ * \param[in,out] ACLChannel  ACL channel information structure of the channel to close

  */
  */

-void Bluetooth_CloseChannel(Bluetooth_Channel_t* const Channel)
+void Bluetooth_CloseChannel(Bluetooth_Channel_t* const ACLChannel)

 {
        /* Don't try to close a non-existing or already closed channel */
 {
        /* Don't try to close a non-existing or already closed channel */

-       if ((Channel == NULL) || (Channel->State == Channel_Closed))
+       if ((ACLChannel == NULL) || (ACLChannel->State == BT_Channel_Closed))

          return;
 
        /* Set the channel's state to the start of the teardown process */
          return;
 
        /* Set the channel's state to the start of the teardown process */

-       Channel->State = Channel_WaitDisconnect;
+       ACLChannel->State = BT_Channel_WaitDisconnect;

 
        struct
        {
                BT_Signal_Header_t           SignalCommandHeader;
                BT_Signal_DisconnectionReq_t DisconnectionRequest;
        } PacketData;
 
        struct
        {
                BT_Signal_Header_t           SignalCommandHeader;
                BT_Signal_DisconnectionReq_t DisconnectionRequest;
        } PacketData;

-       
+

        /* Fill out the Signal Command header in the response packet */
        PacketData.SignalCommandHeader.Code            = BT_SIGNAL_DISCONNECTION_REQUEST;
        /* Fill out the Signal Command header in the response packet */
        PacketData.SignalCommandHeader.Code            = BT_SIGNAL_DISCONNECTION_REQUEST;

-       PacketData.SignalCommandHeader.Identifier      = ++Bluetooth_Connection.SignallingIdentifier;
+       PacketData.SignalCommandHeader.Identifier      = ++Bluetooth_Connection.SignalingIdentifier;

        PacketData.SignalCommandHeader.Length          = sizeof(PacketData.DisconnectionRequest);
 
        /* Fill out the Disconnection Request in the response packet */
        PacketData.SignalCommandHeader.Length          = sizeof(PacketData.DisconnectionRequest);
 
        /* Fill out the Disconnection Request in the response packet */

-       PacketData.DisconnectionRequest.DestinationChannel = Channel->RemoteNumber;
-       PacketData.DisconnectionRequest.SourceChannel = Channel->LocalNumber;
+       PacketData.DisconnectionRequest.DestinationChannel = ACLChannel->RemoteNumber;
+       PacketData.DisconnectionRequest.SourceChannel      = ACLChannel->LocalNumber;

 
        Bluetooth_SendPacket(&PacketData, sizeof(PacketData), NULL);
 
        Bluetooth_SendPacket(&PacketData, sizeof(PacketData), NULL);

-       
+

        BT_ACL_DEBUG(1, ">> L2CAP Disconnection Request");
        BT_ACL_DEBUG(1, ">> L2CAP Disconnection Request");

-       BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", PacketData.DisconnectionRequest.DestinationChannel);  
-       BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", PacketData.DisconnectionRequest.SourceChannel);    
+       BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", PacketData.DisconnectionRequest.DestinationChannel);
+       BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", PacketData.DisconnectionRequest.SourceChannel);

 }
 
 /** Internal Bluetooth stack Signal Command processing routine for a Connection Request command.
 }
 
 /** Internal Bluetooth stack Signal Command processing routine for a Connection Request command.


@@ -358,8 +409,8 @@ void Bluetooth_CloseChannel(Bluetooth_Channel_t* const Channel)
 static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_Signal_ConnectionReq_t ConnectionRequest;
 static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        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();


@@ -367,7 +418,7 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
        BT_ACL_DEBUG(1, "<< L2CAP Connection Request");
        BT_ACL_DEBUG(2, "-- PSM: 0x%04X", ConnectionRequest.PSM);
        BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", ConnectionRequest.SourceChannel);
        BT_ACL_DEBUG(1, "<< L2CAP Connection Request");
        BT_ACL_DEBUG(2, "-- PSM: 0x%04X", ConnectionRequest.PSM);
        BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", ConnectionRequest.SourceChannel);

-       
+

        /* Try to retrieve the existing channel's information structure if it exists */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(ConnectionRequest.SourceChannel, CHANNEL_SEARCH_REMOTENUMBER);
 
        /* Try to retrieve the existing channel's information structure if it exists */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(ConnectionRequest.SourceChannel, CHANNEL_SEARCH_REMOTENUMBER);
 


@@ -377,7 +428,7 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
                /* Look through the channel information list for a free entry */
                for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
                {
                /* Look through the channel information list for a free entry */
                for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
                {

-                       if (Bluetooth_Connection.Channels[i].State == Channel_Closed)
+                       if (Bluetooth_Connection.Channels[i].State == BT_Channel_Closed)

                        {
                                ChannelData = &Bluetooth_Connection.Channels[i];
 
                        {
                                ChannelData = &Bluetooth_Connection.Channels[i];
 


@@ -388,7 +439,7 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
                        }
                }
        }
                        }
                }
        }

-       
+

        uint8_t ChannelStatus = BT_CONNECTION_REFUSED_RESOURCES;
 
        /* Reset the channel item contents only if a channel entry was found for it */
        uint8_t ChannelStatus = BT_CONNECTION_REFUSED_RESOURCES;
 
        /* Reset the channel item contents only if a channel entry was found for it */


@@ -400,16 +451,16 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
                        ChannelData->RemoteNumber = ConnectionRequest.SourceChannel;
                        ChannelData->PSM          = ConnectionRequest.PSM;
                        ChannelData->LocalMTU     = MAXIMUM_CHANNEL_MTU;
                        ChannelData->RemoteNumber = ConnectionRequest.SourceChannel;
                        ChannelData->PSM          = ConnectionRequest.PSM;
                        ChannelData->LocalMTU     = MAXIMUM_CHANNEL_MTU;

-                       ChannelData->State        = Channel_Config_WaitConfig;
-                       
+                       ChannelData->State        = BT_Channel_Config_WaitConfig;
+

                        ChannelStatus = BT_CONNECTION_SUCCESSFUL;
                }
                else
                {
                        ChannelStatus = BT_CONNECTION_SUCCESSFUL;
                }
                else
                {

-                       ChannelStatus = BT_CONNECTION_REFUSED_PSM;              
+                       ChannelStatus = BT_CONNECTION_REFUSED_PSM;

                }
        }
                }
        }

-       
+

        struct
        {
                BT_Signal_Header_t         SignalCommandHeader;
        struct
        {
                BT_Signal_Header_t         SignalCommandHeader;


@@ -426,7 +477,7 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
        ResponsePacket.ConnectionResponse.SourceChannel      = ChannelData->RemoteNumber;
        ResponsePacket.ConnectionResponse.Result             = ChannelStatus;
        ResponsePacket.ConnectionResponse.Status             = 0x00;
        ResponsePacket.ConnectionResponse.SourceChannel      = ChannelData->RemoteNumber;
        ResponsePacket.ConnectionResponse.Result             = ChannelStatus;
        ResponsePacket.ConnectionResponse.Status             = 0x00;

-       
+

        Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), NULL);
 
        BT_ACL_DEBUG(1, ">> L2CAP Connection Response");
        Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), NULL);
 
        BT_ACL_DEBUG(1, ">> L2CAP Connection Response");


@@ -442,16 +493,16 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
 static inline void Bluetooth_Signal_ConnectionResp(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_Signal_ConnectionResp_t ConnectionResponse;
 static inline void Bluetooth_Signal_ConnectionResp(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_Signal_ConnectionResp_t ConnectionResponse;

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

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        BT_ACL_DEBUG(1, "<< L2CAP Connection Response");
 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        BT_ACL_DEBUG(1, "<< L2CAP Connection Response");

-       BT_ACL_DEBUG(2, "-- Result: 0x%02X", ConnectionResponse.Result);        
-       BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", ConnectionResponse.SourceChannel); 
-       BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", ConnectionResponse.DestinationChannel);       
+       BT_ACL_DEBUG(2, "-- Result: 0x%02X", ConnectionResponse.Result);
+       BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", ConnectionResponse.SourceChannel);
+       BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", ConnectionResponse.DestinationChannel);

 
        /* Search for the referenced channel in the channel information list */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(ConnectionResponse.SourceChannel, CHANNEL_SEARCH_LOCALNUMBER);
 
        /* Search for the referenced channel in the channel information list */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(ConnectionResponse.SourceChannel, CHANNEL_SEARCH_LOCALNUMBER);


@@ -462,7 +513,7 @@ static inline void Bluetooth_Signal_ConnectionResp(const BT_Signal_Header_t* con
                /* Set the channel structure's remote channel number to the channel allocated on the remote device */
                ChannelData->RemoteNumber = ConnectionResponse.SourceChannel;
                ChannelData->State        = (ConnectionResponse.Result == BT_CONNECTION_SUCCESSFUL) ?
                /* Set the channel structure's remote channel number to the channel allocated on the remote device */
                ChannelData->RemoteNumber = ConnectionResponse.SourceChannel;
                ChannelData->State        = (ConnectionResponse.Result == BT_CONNECTION_SUCCESSFUL) ?

-                                            Channel_Config_WaitConfig : Channel_Closed;
+                                            BT_Channel_Config_WaitConfig : BT_Channel_Closed;

        }
 }
 
        }
 }
 


@@ -473,13 +524,13 @@ static inline void Bluetooth_Signal_ConnectionResp(const BT_Signal_Header_t* con
 static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_Signal_ConfigurationReq_t ConfigurationRequest;
 static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_Signal_ConfigurationReq_t ConfigurationRequest;

-       
+

        /* Allocate a buffer large enough to hold the variable number of configuration options in the request */
        uint8_t OptionsLen = (SignalCommandHeader->Length - sizeof(ConfigurationRequest));
        uint8_t Options[OptionsLen];
 
        /* Allocate a buffer large enough to hold the variable number of configuration options in the request */
        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();


@@ -503,7 +554,7 @@ static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* c
 
                        BT_ACL_DEBUG(2, "-- Option Type: 0x%04X", OptionHeader->Type);
                        BT_ACL_DEBUG(2, "-- Option Length: 0x%04X", (sizeof(BT_Config_Option_Header_t) + OptionHeader->Length));
 
                        BT_ACL_DEBUG(2, "-- Option Type: 0x%04X", OptionHeader->Type);
                        BT_ACL_DEBUG(2, "-- Option Length: 0x%04X", (sizeof(BT_Config_Option_Header_t) + OptionHeader->Length));

-                       
+

                        /* Store the remote MTU option's value if present */
                        if (OptionHeader->Type == BT_CONFIG_OPTION_MTU)
                          ChannelData->RemoteMTU = *((uint16_t*)OptionData);
                        /* Store the remote MTU option's value if present */
                        if (OptionHeader->Type == BT_CONFIG_OPTION_MTU)
                          ChannelData->RemoteMTU = *((uint16_t*)OptionData);


@@ -512,7 +563,7 @@ static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* c
                        OptionPos += (sizeof(BT_Config_Option_Header_t) + OptionHeader->Length);
                }
        }
                        OptionPos += (sizeof(BT_Config_Option_Header_t) + OptionHeader->Length);
                }
        }

-       
+

        struct
        {
                BT_Signal_Header_t            SignalCommandHeader;
        struct
        {
                BT_Signal_Header_t            SignalCommandHeader;


@@ -535,14 +586,15 @@ static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* c
        {
                switch (ChannelData->State)
                {
        {
                switch (ChannelData->State)
                {

-                       case Channel_Config_WaitConfig:
-                               ChannelData->State = Channel_Config_WaitSendConfig;
+                       case BT_Channel_Config_WaitConfig:
+                               ChannelData->State = BT_Channel_Config_WaitSendConfig;

                                break;
                                break;

-                       case Channel_Config_WaitReqResp:
-                               ChannelData->State = Channel_Config_WaitResp;
+                       case BT_Channel_Config_WaitReqResp:
+                               ChannelData->State = BT_Channel_Config_WaitResp;

                                break;
                                break;

-                       case Channel_Config_WaitReq:
-                               ChannelData->State = Channel_Open;
+                       case BT_Channel_Config_WaitReq:
+                               ChannelData->State = BT_Channel_Open;
+                               Bluetooth_ChannelOpened(ChannelData);

                                break;
                }
        }
                                break;
                }
        }


@@ -560,38 +612,39 @@ 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();

-       
+

        BT_ACL_DEBUG(1, "<< L2CAP Configuration Response");
        BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", ConfigurationResponse.SourceChannel);
        BT_ACL_DEBUG(2, "-- Result: 0x%02X", ConfigurationResponse.Result);
 
        /* Search for the referenced channel in the channel information list */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(ConfigurationResponse.SourceChannel, CHANNEL_SEARCH_REMOTENUMBER);
        BT_ACL_DEBUG(1, "<< L2CAP Configuration Response");
        BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", ConfigurationResponse.SourceChannel);
        BT_ACL_DEBUG(2, "-- Result: 0x%02X", ConfigurationResponse.Result);
 
        /* Search for the referenced channel in the channel information list */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(ConfigurationResponse.SourceChannel, CHANNEL_SEARCH_REMOTENUMBER);

-       
+

        /* Only update the channel's state if it was found in the channel list */
        if (ChannelData != NULL)
        {
        /* Only update the channel's state if it was found in the channel list */
        if (ChannelData != NULL)
        {

-               /* Check if the channel configuration completed successfuly */
+               /* Check if the channel configuration completed successfully */

                if (ConfigurationResponse.Result == BT_CONFIGURATION_SUCCESSFUL)
                {
                        switch (ChannelData->State)
                        {
                if (ConfigurationResponse.Result == BT_CONFIGURATION_SUCCESSFUL)
                {
                        switch (ChannelData->State)
                        {

-                               case Channel_Config_WaitReqResp:
-                                       ChannelData->State = Channel_Config_WaitReq;
+                               case BT_Channel_Config_WaitReqResp:
+                                       ChannelData->State = BT_Channel_Config_WaitReq;

                                        break;
                                        break;

-                               case Channel_Config_WaitResp:
-                                       ChannelData->State = Channel_Open;
+                               case BT_Channel_Config_WaitResp:
+                                       ChannelData->State = BT_Channel_Open;
+                                       Bluetooth_ChannelOpened(ChannelData);

                                        break;
                                        break;

-                       }       
+                       }

                }
                else
                {
                        /* Configuration failed - close the channel */
                }
                else
                {
                        /* Configuration failed - close the channel */

-                       ChannelData->State = Channel_Closed;
+                       ChannelData->State = BT_Channel_Closed;

                }
        }
 }
                }
        }
 }


@@ -603,16 +656,16 @@ static inline void Bluetooth_Signal_ConfigurationResp(const BT_Signal_Header_t*
 static inline void Bluetooth_Signal_DisconnectionReq(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_Signal_DisconnectionReq_t DisconnectionRequest;
 static inline void Bluetooth_Signal_DisconnectionReq(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        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(2, "-- Source Channel: 0x%04X", DisconnectionRequest.SourceChannel);
 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Request");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionRequest.DestinationChannel);
        BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", DisconnectionRequest.SourceChannel);

-       
+

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

-       
+

        /* Search for the referenced channel in the channel information list */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(DisconnectionRequest.SourceChannel, CHANNEL_SEARCH_REMOTENUMBER);
 
        /* Search for the referenced channel in the channel information list */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(DisconnectionRequest.SourceChannel, CHANNEL_SEARCH_REMOTENUMBER);
 


@@ -635,7 +688,7 @@ static inline void Bluetooth_Signal_DisconnectionReq(const BT_Signal_Header_t* c
 
        /* If the channel was found in the channel list, close it */
        if (ChannelData != NULL)
 
        /* If the channel was found in the channel list, close it */
        if (ChannelData != NULL)

-         ChannelData->State = Channel_Closed;
+         ChannelData->State = BT_Channel_Closed;

 
        BT_ACL_DEBUG(1, ">> L2CAP Disconnection Response");
        BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", ResponsePacket.DisconnectionResponse.SourceChannel);
 
        BT_ACL_DEBUG(1, ">> L2CAP Disconnection Response");
        BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", ResponsePacket.DisconnectionResponse.SourceChannel);


@@ -649,22 +702,22 @@ static inline void Bluetooth_Signal_DisconnectionReq(const BT_Signal_Header_t* c
 static inline void Bluetooth_Signal_DisconnectionResp(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_Signal_DisconnectionResp_t DisconnectionResponse;
 static inline void Bluetooth_Signal_DisconnectionResp(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        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(2, "-- Source Channel: 0x%04X", DisconnectionResponse.SourceChannel);
 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Response");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionResponse.DestinationChannel);
        BT_ACL_DEBUG(2, "-- Source Channel: 0x%04X", DisconnectionResponse.SourceChannel);

-       
+

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

-       
+

        /* Search for the referenced channel in the channel information list */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(DisconnectionResponse.SourceChannel, CHANNEL_SEARCH_REMOTENUMBER);
        /* Search for the referenced channel in the channel information list */
        Bluetooth_Channel_t* ChannelData = Bluetooth_GetChannelData(DisconnectionResponse.SourceChannel, CHANNEL_SEARCH_REMOTENUMBER);

-       
-       /* If the channel was found in the channel list, close it */    
+
+       /* If the channel was found in the channel list, close it */

        if (ChannelData != NULL)
        if (ChannelData != NULL)

-         ChannelData->State = Channel_Closed;
+         ChannelData->State = BT_Channel_Closed;

 }
 
 /** Internal Bluetooth stack Signal Command processing routine for an Echo Request command.
 }
 
 /** Internal Bluetooth stack Signal Command processing routine for an Echo Request command.


@@ -674,10 +727,10 @@ static inline void Bluetooth_Signal_DisconnectionResp(const BT_Signal_Header_t*
 static inline void Bluetooth_Signal_EchoReq(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_ACL_DEBUG(1, "<< L2CAP Echo Request");
 static inline void Bluetooth_Signal_EchoReq(const BT_Signal_Header_t* const SignalCommandHeader)
 {
        BT_ACL_DEBUG(1, "<< L2CAP Echo Request");

-       
+

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

-       
+

        struct
        {
                BT_Signal_Header_t SignalCommandHeader;
        struct
        {
                BT_Signal_Header_t SignalCommandHeader;


@@ -687,7 +740,7 @@ static inline void Bluetooth_Signal_EchoReq(const BT_Signal_Header_t* const Sign
        ResponsePacket.SignalCommandHeader.Code                 = BT_SIGNAL_ECHO_RESPONSE;
        ResponsePacket.SignalCommandHeader.Identifier           = SignalCommandHeader->Identifier;
        ResponsePacket.SignalCommandHeader.Length               = 0;
        ResponsePacket.SignalCommandHeader.Code                 = BT_SIGNAL_ECHO_RESPONSE;
        ResponsePacket.SignalCommandHeader.Identifier           = SignalCommandHeader->Identifier;
        ResponsePacket.SignalCommandHeader.Length               = 0;

-       
+

        Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), NULL);
 
        BT_ACL_DEBUG(1, ">> L2CAP Echo Response");
        Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), NULL);
 
        BT_ACL_DEBUG(1, ">> L2CAP Echo Response");


@@ -701,11 +754,11 @@ 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);

-       
+

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


@@ -713,25 +766,25 @@ static inline void Bluetooth_Signal_InformationReq(const BT_Signal_Header_t* con
        {
                BT_Signal_Header_t          SignalCommandHeader;
                BT_Signal_InformationResp_t InformationResponse;
        {
                BT_Signal_Header_t          SignalCommandHeader;
                BT_Signal_InformationResp_t InformationResponse;

-               
+

                uint8_t Data[4];
        } ResponsePacket;
                uint8_t Data[4];
        } ResponsePacket;

-       
+

        uint8_t DataLen = 0;
        uint8_t DataLen = 0;

-       
+

        /* Retrieve the requested information and store it in the outgoing packet, if found */
        switch (InformationRequest.InfoType)
        {
        /* Retrieve the requested information and store it in the outgoing packet, if found */
        switch (InformationRequest.InfoType)
        {

-               case BT_INFOREQ_MTU:            
+               case BT_INFOREQ_MTU:

                        ResponsePacket.InformationResponse.Result = BT_INFORMATION_SUCCESSFUL;
                        DataLen = 2;
                        ResponsePacket.InformationResponse.Result = BT_INFORMATION_SUCCESSFUL;
                        DataLen = 2;

-                       
+

                        *((uint16_t*)&ResponsePacket.Data) = MAXIMUM_CHANNEL_MTU;
                        break;
                case BT_INFOREQ_EXTENDEDFEATURES:
                        ResponsePacket.InformationResponse.Result = BT_INFORMATION_SUCCESSFUL;
                        DataLen = 4;
                        *((uint16_t*)&ResponsePacket.Data) = MAXIMUM_CHANNEL_MTU;
                        break;
                case BT_INFOREQ_EXTENDEDFEATURES:
                        ResponsePacket.InformationResponse.Result = BT_INFORMATION_SUCCESSFUL;
                        DataLen = 4;

-                       
+

                        *((uint32_t*)&ResponsePacket.Data) = 0;
                        break;
                default:
                        *((uint32_t*)&ResponsePacket.Data) = 0;
                        break;
                default:


@@ -739,7 +792,7 @@ static inline void Bluetooth_Signal_InformationReq(const BT_Signal_Header_t* con
                        DataLen = 0;
                        break;
        }
                        DataLen = 0;
                        break;
        }

-       
+

        /* Fill out the Signal Command header in the response packet */
        ResponsePacket.SignalCommandHeader.Code                 = BT_SIGNAL_INFORMATION_RESPONSE;
        ResponsePacket.SignalCommandHeader.Identifier           = SignalCommandHeader->Identifier;
        /* Fill out the Signal Command header in the response packet */
        ResponsePacket.SignalCommandHeader.Code                 = BT_SIGNAL_INFORMATION_RESPONSE;
        ResponsePacket.SignalCommandHeader.Identifier           = SignalCommandHeader->Identifier;


@@ -747,9 +800,10 @@ static inline void Bluetooth_Signal_InformationReq(const BT_Signal_Header_t* con
 
        /* Fill out the Information Response in the response packet */
        ResponsePacket.InformationResponse.InfoType = InformationRequest.InfoType;
 
        /* Fill out the Information Response in the response packet */
        ResponsePacket.InformationResponse.InfoType = InformationRequest.InfoType;

-       
+

        Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket) - sizeof(ResponsePacket.Data) + DataLen), NULL);
 
        Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket) - sizeof(ResponsePacket.Data) + DataLen), NULL);
 

-       BT_ACL_DEBUG(1, ">> L2CAP Information Response");       
+       BT_ACL_DEBUG(1, ">> L2CAP Information Response");

        BT_ACL_DEBUG(2, "-- Result: 0x%02X", ResponsePacket.InformationResponse.Result);
 }
        BT_ACL_DEBUG(2, "-- Result: 0x%02X", ResponsePacket.InformationResponse.Result);
 }

+