From 58a0ee67a396622922d873d0625c993d2d5f9e57 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 21 May 2010 08:01:41 +0000 Subject: [PATCH] Oops - when adding a sequence header to the SDP response, the size value needs to be cleared, not the buffer pointer. --- .../BluetoothHost/Lib/ServiceDiscoveryProtocol.c | 3 +++ .../BluetoothHost/Lib/ServiceDiscoveryProtocol.h | 5 ++--- LUFA/ManPages/SoftwareBootloaderJump.txt | 7 ++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c index 227f7583d6..3f16ad1d85 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c @@ -224,6 +224,9 @@ static void ServiceDiscovery_ProcessServiceSearchAttribute(SDP_PDUHeader_t* SDPH ResponsePacket.SDPHeader.TransactionID = SDPHeader->TransactionID; ResponsePacket.SDPHeader.ParameterLength = (ResponsePacket.AttributeListByteCount + sizeof(ResponsePacket.AttributeListByteCount)); + BT_SDP_DEBUG(1, ">> Service Search Attribute Response"); + BT_SDP_DEBUG(2, "-- Total Parameter Length: 0x%04X", ResponsePacket.SDPHeader.ParameterLength); + Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket.SDPHeader) + ResponsePacket.SDPHeader.ParameterLength), Channel); } diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h index 58f7d87660..50d15ad3a6 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h @@ -120,10 +120,9 @@ *BufferPos += 1; uint16_t* SizePos = (uint16_t*)*BufferPos; - *SizePos = 0; - - **BufferPos += 2; + *BufferPos += 2; + *SizePos = 0; return SizePos; } diff --git a/LUFA/ManPages/SoftwareBootloaderJump.txt b/LUFA/ManPages/SoftwareBootloaderJump.txt index 1b284e4cd2..ca8d8ee7c8 100644 --- a/LUFA/ManPages/SoftwareBootloaderJump.txt +++ b/LUFA/ManPages/SoftwareBootloaderJump.txt @@ -44,8 +44,13 @@ * * void Jump_To_Bootloader(void) * { - * // If USB is used, detatch from the bus and wait 2 seconds for the host to register it + * // If USB is used, detatch from the bus * USB_ShutDown(); + * + * // Disable all interrupts + * cli(); + * + * // Wait two seconds for the USB detatchment to register on the host * for (uint8_t i = 0; i < 128; i++) * _delay_ms(16); *