diff options
Diffstat (limited to 'Demos/Host/Incomplete/BluetoothHost/Lib')
5 files changed, 126 insertions, 104 deletions
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c index 3292a53d7..e8daa0533 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c @@ -33,11 +33,10 @@ void Bluetooth_ProcessACLPackets(void)
{
- Bluetooth_ACL_Header_t ACLPacketHeader;
+ Bluetooth_ACL_Header_t ACLPacketHeader;
Bluetooth_DataPacket_Header_t DataHeader;
Pipe_SelectPipe(BLUETOOTH_DATA_IN_PIPE);
- Pipe_SetPipeToken(PIPE_TOKEN_IN);
Pipe_Unfreeze();
if (!(Pipe_IsReadWriteAllowed()))
@@ -49,11 +48,11 @@ void Bluetooth_ProcessACLPackets(void) Pipe_Read_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader));
Pipe_Read_Stream_LE(&DataHeader, sizeof(DataHeader));
- BT_DEBUG("(ACL) Packet Received", NULL);
- BT_DEBUG("(ACL) -- Connection Handle: 0x%04X", ACLPacketHeader.ConnectionHandle);
- BT_DEBUG("(ACL) -- Data Length: 0x%04X", ACLPacketHeader.DataLength);
- BT_DEBUG("(ACL) -- Destination Channel: 0x%04X", DataHeader.DestinationChannel);
- BT_DEBUG("(ACL) -- Payload Length: 0x%04X", DataHeader.PayloadLength);
+ BT_ACL_DEBUG("Packet Received", NULL);
+ BT_ACL_DEBUG("-- Connection Handle: 0x%04X", (ACLPacketHeader.ConnectionHandle & 0x0FFF));
+ BT_ACL_DEBUG("-- Data Length: 0x%04X", ACLPacketHeader.DataLength);
+ BT_ACL_DEBUG("-- Destination Channel: 0x%04X", DataHeader.DestinationChannel);
+ BT_ACL_DEBUG("-- Payload Length: 0x%04X", DataHeader.PayloadLength);
if (DataHeader.DestinationChannel == BLUETOOTH_CHANNEL_SIGNALING)
{
@@ -69,14 +68,14 @@ void Bluetooth_ProcessACLPackets(void) Bluetooth_ProcessSignalPacket_ConfigurationRequest(&ACLPacketHeader, &DataHeader, &SignalCommandHeader);
break;
case BLUETOOTH_SIGNAL_INFORMATION_REQUEST:
- BT_DEBUG("(ACL) -- Information Request, Discarded", NULL);
+ BT_ACL_DEBUG(">> Information Request, Discarded", NULL);
Pipe_Discard_Stream(ACLPacketHeader.DataLength);
Pipe_ClearIN();
Pipe_Freeze();
break;
default:
- BT_DEBUG("(ACL) >> Unknown Signaling Command 0x%02X", SignalCommandHeader.Code);
+ BT_ACL_DEBUG(">> Unknown Signaling Command 0x%02X", SignalCommandHeader.Code);
Pipe_Discard_Stream(ACLPacketHeader.DataLength);
Pipe_ClearIN();
@@ -90,10 +89,10 @@ void Bluetooth_ProcessACLPackets(void) Pipe_Read_Stream_LE(&DataPayload, sizeof(DataPayload));
DataHeader.PayloadLength = 0;
- BT_DEBUG("(ACL) -- Data Payload: ", NULL);
+ BT_ACL_DEBUG("-- Data Payload: ", NULL);
for (uint16_t B = 0; B < sizeof(DataPayload); B++)
printf("0x%02X ", DataPayload[B]);
- BT_DEBUG("", NULL);
+ printf("\r\n");
Pipe_Discard_Stream(ACLPacketHeader.DataLength);
Pipe_ClearIN();
@@ -109,14 +108,13 @@ static inline void Bluetooth_ProcessSignalPacket_ConnectionRequest(Bluetooth_ACL Pipe_Read_Stream_LE(&ConnectionRequest, sizeof(ConnectionRequest));
- BT_DEBUG("(ACL) >> L2CAP Connection Request", NULL);
- BT_DEBUG("(ACL) -- PSM: 0x%04X", ConnectionRequest.PSM);
- BT_DEBUG("(ACL) -- Source Channel: 0x%04X", ConnectionRequest.SourceChannel);
+ BT_ACL_DEBUG(">> L2CAP Connection Request", NULL);
+ BT_ACL_DEBUG("-- PSM: 0x%04X", ConnectionRequest.PSM);
+ BT_ACL_DEBUG("-- Source Channel: 0x%04X", ConnectionRequest.SourceChannel);
Pipe_ClearIN();
Pipe_Freeze();
Pipe_SelectPipe(BLUETOOTH_DATA_OUT_PIPE);
- Pipe_SetPipeToken(PIPE_TOKEN_OUT);
Pipe_Unfreeze();
Bluetooth_SignalCommand_ConnectionResponse_t ConnectionResponse;
@@ -143,14 +141,14 @@ static inline void Bluetooth_ProcessSignalPacket_ConnectionRequest(Bluetooth_ACL Pipe_ClearOUT();
Pipe_Freeze();
- BT_DEBUG("(ACL) Packet Sent", NULL);
- BT_DEBUG("(ACL) -- Connection Handle: 0x%04X", ACLPacketHeader->ConnectionHandle);
- BT_DEBUG("(ACL) -- Data Length: 0x%04X", ACLPacketHeader->DataLength);
- BT_DEBUG("(ACL) -- Destination Channel: 0x%04X", DataHeader->DestinationChannel);
- BT_DEBUG("(ACL) -- Payload Length: 0x%04X", DataHeader->PayloadLength);
- BT_DEBUG("(ACL) >> L2CAP Connection Response", NULL);
- BT_DEBUG("(ACL) -- Source Channel: 0x%04X", ConnectionResponse.SourceChannel);
- BT_DEBUG("(ACL) -- Destination Channel: 0x%04X", ConnectionResponse.DestinationChannel);
+ BT_ACL_DEBUG("Packet Sent", NULL);
+ BT_ACL_DEBUG("-- Connection Handle: 0x%04X", (ACLPacketHeader->ConnectionHandle & 0x0FFF));
+ BT_ACL_DEBUG("-- Data Length: 0x%04X", ACLPacketHeader->DataLength);
+ BT_ACL_DEBUG("-- Destination Channel: 0x%04X", DataHeader->DestinationChannel);
+ BT_ACL_DEBUG("-- Payload Length: 0x%04X", DataHeader->PayloadLength);
+ BT_ACL_DEBUG(">> L2CAP Connection Response", NULL);
+ BT_ACL_DEBUG("-- Source Channel: 0x%04X", ConnectionResponse.SourceChannel);
+ BT_ACL_DEBUG("-- Destination Channel: 0x%04X", ConnectionResponse.DestinationChannel);
}
static inline void Bluetooth_ProcessSignalPacket_ConfigurationRequest(Bluetooth_ACL_Header_t* ACLPacketHeader,
@@ -161,13 +159,12 @@ static inline void Bluetooth_ProcessSignalPacket_ConfigurationRequest(Bluetooth_ Pipe_Read_Stream_LE(&ConfigurationRequest, sizeof(ConfigurationRequest));
- BT_DEBUG("(ACL) >> L2CAP Configuration Request", NULL);
- BT_DEBUG("(ACL) -- Destination Channel: 0x%04X", ConfigurationRequest.DestinationChannel);
+ BT_ACL_DEBUG(">> L2CAP Configuration Request", NULL);
+ BT_ACL_DEBUG("-- Destination Channel: 0x%04X", ConfigurationRequest.DestinationChannel);
Pipe_ClearIN();
Pipe_Freeze();
Pipe_SelectPipe(BLUETOOTH_DATA_OUT_PIPE);
- Pipe_SetPipeToken(PIPE_TOKEN_OUT);
Pipe_Unfreeze();
Bluetooth_SignalCommand_ConfigurationResponse_t ConfigurationResponse;
@@ -183,7 +180,7 @@ static inline void Bluetooth_ProcessSignalPacket_ConfigurationRequest(Bluetooth_ if (ChannelData != NULL)
ChannelData->State = Channel_Open;
- // TODO: Add channel config data to the tail of ConfigurationResponse
+ // TODO: Add channel config data to the tail of ConfigurationResponse
ConfigurationResponse.SourceChannel = ChannelData->RemoteNumber;
ConfigurationResponse.Flags = 0x00;
@@ -197,10 +194,10 @@ static inline void Bluetooth_ProcessSignalPacket_ConfigurationRequest(Bluetooth_ Pipe_ClearOUT();
Pipe_Freeze();
- BT_DEBUG("(ACL) Packet Sent", NULL);
- BT_DEBUG("(ACL) -- Connection Handle: 0x%04X", ACLPacketHeader->ConnectionHandle);
- BT_DEBUG("(ACL) -- Data Length: 0x%04X", ACLPacketHeader->DataLength);
- BT_DEBUG("(ACL) -- Destination Channel: 0x%04X", DataHeader->DestinationChannel);
- BT_DEBUG("(ACL) -- Payload Length: 0x%04X", DataHeader->PayloadLength);
- BT_DEBUG("(ACL) >> L2CAP Configuration Response", NULL);
+ BT_ACL_DEBUG("Packet Sent", NULL);
+ BT_ACL_DEBUG("-- Connection Handle: 0x%04X", (ACLPacketHeader->ConnectionHandle & 0x0FFF));
+ BT_ACL_DEBUG("-- Data Length: 0x%04X", ACLPacketHeader->DataLength);
+ BT_ACL_DEBUG("-- Destination Channel: 0x%04X", DataHeader->DestinationChannel);
+ BT_ACL_DEBUG("-- Payload Length: 0x%04X", DataHeader->PayloadLength);
+ BT_ACL_DEBUG(">> L2CAP Configuration Response", NULL);
}
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h index 74924e0dc..c0fd1f620 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h @@ -41,6 +41,8 @@ #include "BluetoothStack.h"
/* Macros: */
+ #define BT_ACL_DEBUG(s, ...) printf_P(PSTR("(ACL) " s "\r\n"), __VA_ARGS__)
+
#define BLUETOOTH_CHANNEL_SIGNALING 0x0001
#define BLUETOOTH_CHANNEL_CONNECTIONLESS 0x0002
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c index 8fb7367e9..dd2a3e5cf 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c @@ -30,15 +30,15 @@ #include "BluetoothHCICommands.h"
-static Bluetooth_HCICommand_Header_t HCICommandHeader;
-static Bluetooth_HCIEvent_Header_t HCIEventHeader;
+static Bluetooth_HCICommand_Header_t HCICommandHeader;
- uint8_t Bluetooth_HCIProcessingState;
- uint8_t Bluetooth_HCINextState;
-static uint8_t Bluetooth_TempDeviceAddress[6];
+ uint8_t Bluetooth_HCIProcessingState;
+static uint8_t Bluetooth_HCINextState;
+static uint8_t Bluetooth_TempDeviceAddress[6];
-static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength)
+static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint16_t ParameterLength)
{
+ /* Need to reserve the amount of bytes given in the header for the complete payload */
uint8_t CommandBuffer[sizeof(HCICommandHeader) + HCICommandHeader.ParameterLength];
USB_ControlRequest = (USB_Request_Header_t)
@@ -49,21 +49,23 @@ static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength) .wIndex = 0,
.wLength = sizeof(CommandBuffer)
};
-
- memset(CommandBuffer, 0x00, sizeof(CommandBuffer));
+
+ /* Copy over the HCI command header to the allocated buffer */
memcpy(CommandBuffer, &HCICommandHeader, sizeof(HCICommandHeader));
- if (ParamLength)
- memcpy(&CommandBuffer[sizeof(HCICommandHeader)], Parameters, ParamLength);
+ /* Zero out the parameter section of the response to ensure that any padding bytes do not expose private RAM contents */
+ memset(&CommandBuffer[sizeof(HCICommandHeader)], 0x00, HCICommandHeader.ParameterLength);
+ /* Copy over the command parameters (if any) to the command buffer - note, the number of actual source parameter bytes
+ may differ to those in the header; any difference in length is filled with 0x00 padding bytes */
+ memcpy(&CommandBuffer[sizeof(HCICommandHeader)], Parameters, ParameterLength);
+
Pipe_SelectPipe(PIPE_CONTROLPIPE);
return USB_Host_SendControlRequest(CommandBuffer);
}
void Bluetooth_ProcessHCICommands(void)
{
- uint8_t ErrorCode;
-
switch (Bluetooth_HCIProcessingState)
{
case Bluetooth_ProcessEvents:
@@ -72,68 +74,87 @@ void Bluetooth_ProcessHCICommands(void) if (Pipe_IsReadWriteAllowed())
{
+ Bluetooth_HCIEvent_Header_t HCIEventHeader;
+
+ /* Read in the event header to fetch the event code and payload length */
Pipe_Read_Stream_LE(&HCIEventHeader, sizeof(HCIEventHeader));
+ /* Create a temporary buffer for the event parameters */
uint8_t EventParams[HCIEventHeader.ParameterLength];
+ /* Read in the event parameters into the temporary buffer */
Pipe_Read_Stream_LE(&EventParams, HCIEventHeader.ParameterLength);
Pipe_ClearIN();
- BT_DEBUG("(HCI) Event Code: 0x%02X", HCIEventHeader.EventCode);
+ BT_HCI_DEBUG("Event Code: 0x%02X", HCIEventHeader.EventCode);
switch (HCIEventHeader.EventCode)
{
case EVENT_COMMAND_COMPLETE:
Bluetooth_HCIProcessingState = Bluetooth_HCINextState;
- BT_DEBUG("(HCI) >> Command Complete (Opcode 0x%04x)",
+ BT_HCI_DEBUG(">> Command Complete (Opcode 0x%04x)",
((Bluetooth_HCIEvent_CommandComplete_t*)&EventParams)->Opcode);
break;
case EVENT_COMMAND_STATUS:
+ /* If the execution of a command failed, reset the stack */
if (((Bluetooth_HCIEvent_CommandStatus_t*)&EventParams)->Status)
Bluetooth_HCIProcessingState = Bluetooth_Init;
- BT_DEBUG("(HCI) >> Command Status: 0x%02X",
+ BT_HCI_DEBUG(">> Command Status: 0x%02X",
((Bluetooth_HCIEvent_CommandStatus_t*)&EventParams)->Status);
break;
case EVENT_CONNECTION_REQUEST:
+ /* Need to store the remote device's BT address in a temporary buffer for later use */
memcpy(Bluetooth_TempDeviceAddress,
&((Bluetooth_HCIEvent_ConnectionRequest_t*)&EventParams)->RemoteAddress,
sizeof(Bluetooth_TempDeviceAddress));
+ /* Only accept the connection if it is a ACL (data) connection */
Bluetooth_HCIProcessingState = (Bluetooth_Connection.IsConnected ||
(((Bluetooth_HCIEvent_ConnectionRequest_t*)&EventParams)->LinkType != 0x01)) ?
Bluetooth_Conn_RejectConnection : Bluetooth_Conn_AcceptConnection;
- BT_DEBUG("(HCI) >> Connection Request from Device %02X:%02X:%02X:%02X:%02X:%02X",
+ BT_HCI_DEBUG(">> Connection Request from Device %02X:%02X:%02X:%02X:%02X:%02X",
Bluetooth_TempDeviceAddress[5], Bluetooth_TempDeviceAddress[4], Bluetooth_TempDeviceAddress[3],
Bluetooth_TempDeviceAddress[2], Bluetooth_TempDeviceAddress[1], Bluetooth_TempDeviceAddress[0]);
break;
case EVENT_PIN_CODE_REQUEST:
+ /* Need to store the remote device's BT address in a temporary buffer for later use */
memcpy(Bluetooth_TempDeviceAddress,
&((Bluetooth_HCIEvent_PinCodeRequest_t*)&EventParams)->RemoteAddress,
sizeof(Bluetooth_TempDeviceAddress));
Bluetooth_HCIProcessingState = Bluetooth_Conn_SendPINCode;
- BT_DEBUG("(HCI) >> PIN Request from Device %02X:%02X:%02X:%02X:%02X:%02X",
+ BT_HCI_DEBUG(">> PIN Request from Device %02X:%02X:%02X:%02X:%02X:%02X",
Bluetooth_TempDeviceAddress[5], Bluetooth_TempDeviceAddress[4], Bluetooth_TempDeviceAddress[3],
Bluetooth_TempDeviceAddress[2], Bluetooth_TempDeviceAddress[1], Bluetooth_TempDeviceAddress[0]);
break;
case EVENT_CONNECTION_COMPLETE:
+ /* Need to store the remote device's BT address in a temporary buffer for later use */
memcpy(Bluetooth_Connection.RemoteAddress,
&((Bluetooth_HCIEvent_ConnectionComplete_t*)&EventParams)->RemoteAddress,
sizeof(Bluetooth_TempDeviceAddress));
+ /* Store the created connection handle and indicate that the connection has been established */
Bluetooth_Connection.ConnectionHandle = ((Bluetooth_HCIEvent_ConnectionComplete_t*)&EventParams)->ConnectionHandle;
Bluetooth_Connection.IsConnected = true;
- BT_DEBUG("(HCI) >> Connection Complete to Device %02X:%02X:%02X:%02X:%02X:%02X, Handle 0x%04x",
+ BT_HCI_DEBUG(">> Connection Complete to Device %02X:%02X:%02X:%02X:%02X:%02X, Handle 0x%04x",
Bluetooth_Connection.RemoteAddress[5], Bluetooth_Connection.RemoteAddress[4],
Bluetooth_Connection.RemoteAddress[3], Bluetooth_Connection.RemoteAddress[2],
Bluetooth_Connection.RemoteAddress[1], Bluetooth_Connection.RemoteAddress[0],
Bluetooth_Connection.ConnectionHandle);
break;
+ case EVENT_DISCONNECTION_COMPLETE:
+ BT_HCI_DEBUG(">> Disconnection Complete", NULL);
+
+ /* Device disconnected, indicate connection information no longer valid */
+ Bluetooth_Connection.IsConnected = false;
+
+ Bluetooth_HCIProcessingState = Bluetooth_Init;
+ break;
}
}
@@ -141,6 +162,7 @@ void Bluetooth_ProcessHCICommands(void) break;
case Bluetooth_Init:
+ /* Reset the connection information structure to destroy any previous connection state */
memset(&Bluetooth_Connection, 0x00, sizeof(Bluetooth_Connection));
Bluetooth_HCIProcessingState = Bluetooth_Init_Reset;
@@ -152,24 +174,11 @@ void Bluetooth_ProcessHCICommands(void) ParameterLength: 0,
};
- BT_DEBUG("(HCI) Enter State: Bluetooth_Init_Reset", NULL);
+ BT_HCI_DEBUG("Enter State: Bluetooth_Init_Reset", NULL);
- ErrorCode = Bluetooth_SendHCICommand(NULL, 0);
+ /* Send the command to reset the bluetooth dongle controller */
+ Bluetooth_SendHCICommand(NULL, 0);
- Bluetooth_HCINextState = Bluetooth_Init_ReadBufferSize;
- Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;
- break;
- case Bluetooth_Init_ReadBufferSize:
- HCICommandHeader = (Bluetooth_HCICommand_Header_t)
- {
- OpCode: {OGF: OGF_CTRLR_INFORMATIONAL, OCF: OGF_CTRLR_INFORMATIONAL_READBUFFERSIZE},
- ParameterLength: 0,
- };
-
- BT_DEBUG("(HCI) Enter State: Bluetooth_Init_ReadBufferSize", NULL);
-
- ErrorCode = Bluetooth_SendHCICommand(NULL, 0);
-
Bluetooth_HCINextState = Bluetooth_Init_SetLocalName;
Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;
break;
@@ -180,10 +189,11 @@ void Bluetooth_ProcessHCICommands(void) ParameterLength: 248,
};
- BT_DEBUG("(HCI) Enter State: Bluetooth_Init_SetLocalName", NULL);
- BT_DEBUG("(HCI) -- Name: %s", Bluetooth_DeviceConfiguration.Name);
+ BT_HCI_DEBUG("Enter State: Bluetooth_Init_SetLocalName", NULL);
+ BT_HCI_DEBUG("-- Name: %s", Bluetooth_DeviceConfiguration.Name);
- ErrorCode = Bluetooth_SendHCICommand(Bluetooth_DeviceConfiguration.Name, strlen(Bluetooth_DeviceConfiguration.Name));
+ /* Send the command to set the bluetooth dongle's name for other devices to see */
+ Bluetooth_SendHCICommand(Bluetooth_DeviceConfiguration.Name, strlen(Bluetooth_DeviceConfiguration.Name));
Bluetooth_HCINextState = Bluetooth_Init_SetDeviceClass;
Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;
@@ -195,9 +205,10 @@ void Bluetooth_ProcessHCICommands(void) ParameterLength: 3,
};
- BT_DEBUG("(HCI) Enter State: Bluetooth_Init_SetDeviceClass", NULL);
+ BT_HCI_DEBUG("Enter State: Bluetooth_Init_SetDeviceClass", NULL);
- ErrorCode = Bluetooth_SendHCICommand(&Bluetooth_DeviceConfiguration.Class, 3);
+ /* Send the command to set the class of the device for other devices to see */
+ Bluetooth_SendHCICommand(&Bluetooth_DeviceConfiguration.Class, 3);
Bluetooth_HCINextState = Bluetooth_Init_WriteScanEnable;
Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;
@@ -209,10 +220,12 @@ void Bluetooth_ProcessHCICommands(void) ParameterLength: 1,
};
- BT_DEBUG("(HCI) Enter State: Bluetooth_Init_WriteScanEnable", NULL);
+ BT_HCI_DEBUG("Enter State: Bluetooth_Init_WriteScanEnable", NULL);
- uint8_t Interval = InquiryAndPageScans;
- ErrorCode = Bluetooth_SendHCICommand(&Interval, 1);
+ uint8_t Interval = BT_SCANMODE_InquiryAndPageScans;
+
+ /* Send the command to set the remote device scanning mode */
+ Bluetooth_SendHCICommand(&Interval, 1);
Bluetooth_HCINextState = Bluetooth_ProcessEvents;
Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;
@@ -224,14 +237,17 @@ void Bluetooth_ProcessHCICommands(void) ParameterLength: sizeof(Bluetooth_HCICommand_AcceptConnectionRequest_t),
};
- BT_DEBUG("(HCI) Enter State: Bluetooth_Conn_AcceptConnection", NULL);
+ BT_HCI_DEBUG("Enter State: Bluetooth_Conn_AcceptConnection", NULL);
+ /* Copy over the temporary BT device address saved from the Connection Request event, indicate slave
+ connection role */
Bluetooth_HCICommand_AcceptConnectionRequest_t AcceptConnectionParams;
-
- memcpy(AcceptConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(Bluetooth_TempDeviceAddress));
+ memcpy(AcceptConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress,
+ sizeof(AcceptConnectionParams.RemoteAddress));
AcceptConnectionParams.SlaveRole = true;
- ErrorCode = Bluetooth_SendHCICommand(&AcceptConnectionParams, sizeof(AcceptConnectionParams));
+ /* Send the command to accept the remote connection request */
+ Bluetooth_SendHCICommand(&AcceptConnectionParams, sizeof(Bluetooth_HCICommand_AcceptConnectionRequest_t));
Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;
break;
@@ -242,14 +258,16 @@ void Bluetooth_ProcessHCICommands(void) ParameterLength: sizeof(Bluetooth_HCICommand_RejectConnectionRequest_t),
};
- BT_DEBUG("(HCI) Enter State: Bluetooth_Conn_RejectConnection", NULL);
+ BT_HCI_DEBUG("Enter State: Bluetooth_Conn_RejectConnection", NULL);
+ /* Copy over the temporary BT device address saved from the Connection Request event, indicate failure
+ to accept the connection due to limited device resources */
Bluetooth_HCICommand_RejectConnectionRequest_t RejectConnectionParams;
-
memcpy(RejectConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(RejectConnectionParams.RemoteAddress));
RejectConnectionParams.Reason = ERROR_LIMITED_RESOURCES;
- ErrorCode = Bluetooth_SendHCICommand(&RejectConnectionParams, sizeof(RejectConnectionParams));
+ /* Send the command to reject the remote connection request */
+ Bluetooth_SendHCICommand(&RejectConnectionParams, sizeof(Bluetooth_HCICommand_RejectConnectionRequest_t));
Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;
break;
@@ -260,16 +278,18 @@ void Bluetooth_ProcessHCICommands(void) ParameterLength: sizeof(Bluetooth_HCICommand_PinCodeResponse_t),
};
- BT_DEBUG("(HCI) Enter State: Bluetooth_Conn_SendPINCode", NULL);
- BT_DEBUG("(HCI) -- PIN: %s", Bluetooth_DeviceConfiguration.PINCode);
+ BT_HCI_DEBUG("Enter State: Bluetooth_Conn_SendPINCode", NULL);
+ BT_HCI_DEBUG("-- PIN: %s", Bluetooth_DeviceConfiguration.PINCode);
+ /* Copy over the temporary BT device address saved from the PIN Code Request event, copy over the
+ local PIN authentication code to the response */
Bluetooth_HCICommand_PinCodeResponse_t PINCodeRequestParams;
-
- memcpy(PINCodeRequestParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(Bluetooth_TempDeviceAddress));
+ memcpy(PINCodeRequestParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(PINCodeRequestParams.RemoteAddress));
PINCodeRequestParams.PINCodeLength = strlen(Bluetooth_DeviceConfiguration.PINCode);
memcpy(PINCodeRequestParams.PINCode, Bluetooth_DeviceConfiguration.PINCode, sizeof(PINCodeRequestParams.PINCode));
- ErrorCode = Bluetooth_SendHCICommand(&PINCodeRequestParams, sizeof(PINCodeRequestParams));
+ /* Send the command to transmit the device's local PIN number for authentication */
+ Bluetooth_SendHCICommand(&PINCodeRequestParams, sizeof(Bluetooth_HCICommand_PinCodeResponse_t));
Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;
break;
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h index 03a6505cb..4df5861cf 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h @@ -42,6 +42,8 @@ #include "BluetoothClassCodes.h"
/* Macros: */
+ #define BT_HCI_DEBUG(s, ...) printf_P(PSTR("(HCI) " s "\r\n"), __VA_ARGS__)
+
#define OGF_LINK_CONTROL 0x01
#define OGF_CTRLR_BASEBAND 0x03
#define OGF_CTRLR_INFORMATIONAL 0x04
@@ -164,24 +166,23 @@ /* Enums: */
enum Bluetooth_ScanEnable_Modes_t
{
- NoScansEnabled = 0,
- InquiryScanOnly = 1,
- PageScanOnly = 2,
- InquiryAndPageScans = 3,
+ BT_SCANMODE_NoScansEnabled = 0,
+ BT_SCANMODE_InquiryScanOnly = 1,
+ BT_SCANMODE_PageScanOnly = 2,
+ BT_SCANMODE_InquiryAndPageScans = 3,
};
enum BluetoothStack_States_t
{
- Bluetooth_ProcessEvents = 0,
- Bluetooth_Init = 1,
- Bluetooth_Init_Reset = 2,
- Bluetooth_Init_ReadBufferSize = 3,
- Bluetooth_Init_SetLocalName = 4,
- Bluetooth_Init_SetDeviceClass = 5,
- Bluetooth_Init_WriteScanEnable = 6,
- Bluetooth_Conn_AcceptConnection = 7,
- Bluetooth_Conn_RejectConnection = 8,
- Bluetooth_Conn_SendPINCode = 9,
+ Bluetooth_ProcessEvents = 0,
+ Bluetooth_Init = 1,
+ Bluetooth_Init_Reset = 2,
+ Bluetooth_Init_SetLocalName = 3,
+ Bluetooth_Init_SetDeviceClass = 4,
+ Bluetooth_Init_WriteScanEnable = 5,
+ Bluetooth_Conn_AcceptConnection = 6,
+ Bluetooth_Conn_RejectConnection = 7,
+ Bluetooth_Conn_SendPINCode = 8,
};
/* External Variables: */
@@ -192,7 +193,7 @@ void Bluetooth_ProcessHCIEvents(void);
#if defined(INCLUDE_FROM_BLUETOOTHHCICOMMANDS_C)
- static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength);
+ static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint16_t ParameterLength);
#endif
#endif
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h index 0fc2dd2c2..20bc95696 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h @@ -39,14 +39,16 @@ #include "BluetoothACLPackets.h"
/* Macros: */
+ #define BLUETOOTH_DATA_IN_PIPE 1
+ #define BLUETOOTH_DATA_OUT_PIPE 2
+ #define BLUETOOTH_EVENTS_PIPE 3
+
#define BLUETOOTH_MAX_OPEN_CHANNELS 2
#define BLUETOOTH_CHANNELNUMBER_BASEOFFSET 0x0040
#define CHANNEL_LOOKUP_BY_SOURCE true
#define CHANNEL_LOOKUP_BY_DESTINATION false
- #define BT_DEBUG(s, ...) printf_P(PSTR(s "\r\n"), __VA_ARGS__)
-
/* Enums: */
enum Bluetooth_Channel_State_t
{
|