diff options
Diffstat (limited to 'Demos/Host')
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h | 4 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c | 15 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h | 4 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/SDP.c (renamed from Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c) | 2 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h (renamed from Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h) | 0 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h | 2 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/makefile | 2 |
7 files changed, 15 insertions, 14 deletions
diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h index b628f8b89..893b9466c 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h @@ -44,9 +44,9 @@ #include <avr/interrupt.h> #include <stdio.h> - #include "Lib/ServiceDiscoveryProtocol.h" - #include "Lib/RFCOMM.h" #include "Lib/BluetoothStack.h" + #include "Lib/SDP.h" + #include "Lib/RFCOMM.h" #include "DeviceDescriptor.h" #include "ConfigDescriptor.h" diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c index 8e533ac72..60cce8484 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c @@ -131,7 +131,7 @@ static void RFCOMM_ProcessSABM(const RFCOMM_Address_t* const FrameAddress, Bluet /* Find a free entry in the RFCOMM channel multiplexer state array */ for (uint8_t i = 0; i < RFCOMM_MAX_OPEN_CHANNELS; i++) { - RFCOMM_Channel_t* CurrRFCOMMChannel = RFCOMM_Channels[i]; + RFCOMM_Channel_t* CurrRFCOMMChannel = &RFCOMM_Channels[i]; /* If the channel's DLCI is zero, the channel state entry is free */ if (!(CurrRFCOMMChannel->DLCI)) @@ -166,16 +166,17 @@ static void RFCOMM_ProcessUIH(const RFCOMM_Address_t* const FrameAddress, const if (FrameAddress->DLCI == RFCOMM_CONTROL_DLCI) { - RFCOMM_ProcessControlCommand((const RFCOMM_Command_t*)FrameData, Channel); + RFCOMM_ProcessControlCommand(FrameData, Channel); return; } // TODO: Handle regular channel data here } -static void RFCOMM_ProcessControlCommand(const RFCOMM_Command_t* CommandHeader, Bluetooth_Channel_t* const Channel) +static void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const Channel) { - const uint8_t* CommandData = (const uint8_t*)Data + sizeof(RFCOMM_Command_t); + const RFCOMM_Command_t* CommandHeader = (const RFCOMM_Command_t*)Command; + const uint8_t* CommandData = (const uint8_t*)Command + sizeof(RFCOMM_Command_t); switch (CommandHeader->Command) { @@ -202,7 +203,7 @@ static void RFCOMM_ProcessControlCommand(const RFCOMM_Command_t* CommandHeader, // TODO - Set channel state // RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData( - RFCOMMChannel->Configured = true; +// RFCOMMChannel->Configured = true; // TODO - send ACK/NAK response break; @@ -297,11 +298,11 @@ static uint16_t RFCOMM_GetFrameDataLength(const uint8_t* const BufferPos) return (((uint16_t)SecondOctet << 7) | FirstOctet >> 1); } -RFCOMM_Channel_t RFCOMM_GetChannelData(const uint8_t DLCI) +RFCOMM_Channel_t* RFCOMM_GetChannelData(const uint8_t DLCI) { for (uint8_t i = 0; i < RFCOMM_MAX_OPEN_CHANNELS; i++) { - RFCOMM_Channel_t* CurrRFCOMMChannel = RFCOMM_Channels[i]; + RFCOMM_Channel_t* CurrRFCOMMChannel = &RFCOMM_Channels[i]; if (CurrRFCOMMChannel->DLCI == DLCI) return CurrRFCOMMChannel; diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h index 69cab4944..355331ae8 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h @@ -120,7 +120,7 @@ static void RFCOMM_ProcessUIH(const RFCOMM_Address_t* const FrameAddress, const uint16_t FrameLength, const uint8_t* FrameData, Bluetooth_Channel_t* const Channel); - static void RFCOMM_ProcessControlCommand(const RFCOMM_Command_t* CommandHeader, Bluetooth_Channel_t* const Channel); + static void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const Channel); static void RFCOMM_SendFrame(const uint8_t DLCI, const bool CommandResponse, const uint8_t Control, const uint16_t DataLen, const void* Data, Bluetooth_Channel_t* const Channel); @@ -128,7 +128,7 @@ static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, uint8_t Length); static uint16_t RFCOMM_GetFrameDataLength(const uint8_t* const BufferPos); - RFCOMM_Channel_t RFCOMM_GetChannelData(const uint8_t DLCI); + RFCOMM_Channel_t* RFCOMM_GetChannelData(const uint8_t DLCI); #endif #endif diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.c index 5223d29b1..0daf8e24e 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.c @@ -41,7 +41,7 @@ */ #define INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C -#include "ServiceDiscoveryProtocol.h" +#include "SDP.h" /** Service attribute table list, containing a pointer to each service attribute table the device contains */ const ServiceAttributeTable_t* SDP_Services_Table[] PROGMEM = diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h index 18592ec1c..18592ec1c 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/ServiceDiscoveryProtocol.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h index b0a78e686..cc3ae32ef 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h @@ -37,7 +37,7 @@ #define _SDPSERVICES_H_ /* Includes: */ - #include "ServiceDiscoveryProtocol.h" + #include "SDP.h" /* Macros: */ /** Size of a full 128 bit UUID, in bytes. */ diff --git a/Demos/Host/Incomplete/BluetoothHost/makefile b/Demos/Host/Incomplete/BluetoothHost/makefile index 8e3c55a7b..6f448fa64 100644 --- a/Demos/Host/Incomplete/BluetoothHost/makefile +++ b/Demos/Host/Incomplete/BluetoothHost/makefile @@ -135,7 +135,7 @@ SRC = $(TARGET).c \ Lib/BluetoothStack.c \ Lib/BluetoothHCICommands.c \ Lib/BluetoothACLPackets.c \ - Lib/ServiceDiscoveryProtocol.c \ + Lib/SDP.c \ Lib/SDPServices.c \ Lib/RFCOMM.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ |