From 8b0ec6c5cafe99595743725a20ad40ce4898de14 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 12 Apr 2010 13:42:35 +0000 Subject: Fix Bluetooth stack CONNECTION RESPONSE packets - for this command and this command only, the source/destination roles are switched. Reverse the Local/Remote channel ordering so that Windows mobile and other stacks which depend on valid channel values to connect. --- .../Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to '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 45fad7bd7..449d57fb2 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c @@ -141,6 +141,17 @@ static void Bluetooth_ProcessACLPackets(void) case BT_SIGNAL_INFORMATION_REQUEST: Bluetooth_Signal_InformationReq(&ACLPacketHeader, &DataHeader, &SignalCommandHeader); break; + case BT_SIGNAL_COMMAND_REJECT: + BT_ACL_DEBUG(1, "<< Command Reject", NULL); + + uint16_t RejectReason; + Pipe_Read_Stream_LE(&RejectReason, sizeof(RejectReason)); + Pipe_Discard_Stream(ACLPacketHeader.DataLength - sizeof(RejectReason)); + Pipe_ClearIN(); + Pipe_Freeze(); + + BT_ACL_DEBUG(2, "-- Reason: %d", RejectReason); + break; default: BT_ACL_DEBUG(1, "<< Unknown Signaling Command 0x%02X", SignalCommandHeader.Code); @@ -315,9 +326,10 @@ static inline void Bluetooth_Signal_ConnectionReq(BT_ACL_Header_t* ACLPac ResponsePacket.SignalCommandHeader.Code = BT_SIGNAL_CONNECTION_RESPONSE; ResponsePacket.SignalCommandHeader.Identifier = SignalCommandHeader->Identifier; ResponsePacket.SignalCommandHeader.Length = sizeof(ResponsePacket.ConnectionResponse); - ResponsePacket.ConnectionResponse.Result = (ChannelData == NULL) ? BT_CONNECTION_REFUSED_RESOURCES : BT_CONNECTION_SUCCESSFUL; - ResponsePacket.ConnectionResponse.DestinationChannel = ChannelData->RemoteNumber; - ResponsePacket.ConnectionResponse.SourceChannel = ChannelData->LocalNumber; + ResponsePacket.ConnectionResponse.DestinationChannel = ChannelData->LocalNumber; + ResponsePacket.ConnectionResponse.SourceChannel = ChannelData->RemoteNumber; + ResponsePacket.ConnectionResponse.Result = (ChannelData == NULL) ? BT_CONNECTION_REFUSED_RESOURCES : + BT_CONNECTION_SUCCESSFUL; ResponsePacket.ConnectionResponse.Status = 0x00; Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), NULL); -- cgit v1.2.3