diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-11 07:38:18 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-11 07:38:18 +0000 |
commit | 00fa6aa2db9caed0e2f09b7009b343a0fdae8178 (patch) | |
tree | ce5d9676e283d6011381156549844174770bb587 /Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c | |
parent | 6276d5f82a600c9047df4a8894a257181abad5e7 (diff) | |
download | lufa-00fa6aa2db9caed0e2f09b7009b343a0fdae8178.tar.gz lufa-00fa6aa2db9caed0e2f09b7009b343a0fdae8178.tar.bz2 lufa-00fa6aa2db9caed0e2f09b7009b343a0fdae8178.zip |
Oops - ACL layer Bluetooth_SendPacket() function should check and allow NULL channels, since that indicates a control channel request.
Fix up Doxgen documentation for the Bluetooth stack code.
Diffstat (limited to 'Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c')
-rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c index b8686893a..989eba07c 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c @@ -246,10 +246,10 @@ Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue, const /** 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 signalling channel * * \return A value from the \ref BT_SendPacket_ErrorCodes_t enum */ @@ -263,7 +263,7 @@ uint8_t Bluetooth_SendPacket(void* Data, const uint16_t DataLen, Bluetooth_Chann return BT_SENDPACKET_NotConnected; /* If the destination channel is not the signalling channel and it is not currently fully open, abort */ - if ((ACLChannel == NULL) || (ACLChannel->State != BT_Channel_Open)) + 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 */ @@ -366,7 +366,7 @@ 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 ACLChannel) { |