X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/70983caea5dc6d817c3a887d66a2f43fce535bbd..5faa79a7b55312f275435c5dacf8a89a6a3d26ae:/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c?ds=inline diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c index d4b951da5..939b2ae5f 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c @@ -38,7 +38,6 @@ /* 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 @@ -49,8 +48,8 @@ */ 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++) @@ -90,7 +89,7 @@ void Bluetooth_ACLTask(void) /* 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); @@ -109,11 +108,11 @@ void Bluetooth_ACLTask(void) } } -/** 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. */ -static void Bluetooth_ProcessIncommingACLPackets(void) +static void Bluetooth_ProcessIncomingACLPackets(void) { BT_ACL_Header_t ACLPacketHeader; BT_DataPacket_Header_t DataHeader; @@ -138,10 +137,10 @@ 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); - /* 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) { - /* 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; Pipe_Read_Stream_LE(&SignalCommandHeader, sizeof(SignalCommandHeader)); @@ -194,7 +193,7 @@ static void Bluetooth_ProcessIncommingACLPackets(void) } 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]; Pipe_Read_Stream_LE(PacketData, DataHeader.PayloadLength); Pipe_ClearIN(); @@ -205,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 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. * - * \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 */ -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; @@ -223,15 +265,15 @@ uint8_t Bluetooth_SendPacket(void* Data, const uint16_t DataLen, Bluetooth_Chann 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 != BT_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; - DataHeader.DestinationChannel = (Channel == NULL) ? BT_CHANNEL_SIGNALING : Channel->RemoteNumber; + DataHeader.DestinationChannel = (ACLChannel == NULL) ? BT_CHANNEL_SIGNALING : ACLChannel->RemoteNumber; Pipe_SelectPipe(BLUETOOTH_DATA_OUT_PIPE); @@ -303,7 +345,7 @@ 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; - PacketData.SignalCommandHeader.Identifier = ++Bluetooth_Connection.SignallingIdentifier; + PacketData.SignalCommandHeader.Identifier = ++Bluetooth_Connection.SignalingIdentifier; PacketData.SignalCommandHeader.Length = sizeof(PacketData.ConnectionRequest); /* Fill out the Connection Request in the response packet */ @@ -327,16 +369,16 @@ 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. * - * \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 */ - if ((Channel == NULL) || (Channel->State == BT_Channel_Closed)) + if ((ACLChannel == NULL) || (ACLChannel->State == BT_Channel_Closed)) return; /* Set the channel's state to the start of the teardown process */ - Channel->State = BT_Channel_WaitDisconnect; + ACLChannel->State = BT_Channel_WaitDisconnect; struct { @@ -346,12 +388,12 @@ void Bluetooth_CloseChannel(Bluetooth_Channel_t* const Channel) /* 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.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); @@ -585,7 +627,7 @@ static inline void Bluetooth_Signal_ConfigurationResp(const BT_Signal_Header_t* /* 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)