Bluetooth demo can now create and maintain logical channels - need to determine why...

[pub/lufa.git] / Demos / Host / Incomplete / BluetoothHost / Lib / BluetoothHCICommands.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
index dd2a3e5..3d5b14a 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
@@ -28,43 +28,16 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+#define  INCLUDE_FROM_BLUETOOTHHCICOMMANDS_C\r

 #include "BluetoothHCICommands.h"\r
 \r
 #include "BluetoothHCICommands.h"\r
 \r

-static Bluetooth_HCICommand_Header_t HCICommandHeader;\r
+static BT_HCICommand_Header_t HCICommandHeader;\r

 \r
        uint8_t                       Bluetooth_HCIProcessingState;\r
 static uint8_t                       Bluetooth_HCINextState;\r
 static uint8_t                       Bluetooth_TempDeviceAddress[6];\r
 \r
 \r
        uint8_t                       Bluetooth_HCIProcessingState;\r
 static uint8_t                       Bluetooth_HCINextState;\r
 static uint8_t                       Bluetooth_TempDeviceAddress[6];\r
 \r

-static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint16_t ParameterLength)\r
-{\r
-       /* Need to reserve the amount of bytes given in the header for the complete payload */\r
-       uint8_t CommandBuffer[sizeof(HCICommandHeader) + HCICommandHeader.ParameterLength];\r
-\r
-       USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_DEVICE),\r
-                       .bRequest      = 0,\r
-                       .wValue        = 0,\r
-                       .wIndex        = 0,\r
-                       .wLength       = sizeof(CommandBuffer)\r
-               };\r
-\r
-       /* Copy over the HCI command header to the allocated buffer */\r
-       memcpy(CommandBuffer, &HCICommandHeader, sizeof(HCICommandHeader));\r
-       \r
-       /* Zero out the parameter section of the response to ensure that any padding bytes do not expose private RAM contents */\r
-       memset(&CommandBuffer[sizeof(HCICommandHeader)], 0x00, HCICommandHeader.ParameterLength);\r
-\r
-       /* Copy over the command parameters (if any) to the command buffer - note, the number of actual source parameter bytes\r
-          may differ to those in the header; any difference in length is filled with 0x00 padding bytes */\r
-       memcpy(&CommandBuffer[sizeof(HCICommandHeader)], Parameters, ParameterLength);\r
-       \r
-       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-       return USB_Host_SendControlRequest(CommandBuffer);\r
-}\r
-\r
-void Bluetooth_ProcessHCICommands(void)\r
+void Bluetooth_HCITask(void)\r

 {\r
        switch (Bluetooth_HCIProcessingState)\r
        {\r
 {\r
        switch (Bluetooth_HCIProcessingState)\r
        {\r


@@ -74,7 +47,7 @@ void Bluetooth_ProcessHCICommands(void)
                        \r
                        if (Pipe_IsReadWriteAllowed())\r
                        {\r
                        \r
                        if (Pipe_IsReadWriteAllowed())\r
                        {\r

-                               Bluetooth_HCIEvent_Header_t HCIEventHeader;\r
+                               BT_HCIEvent_Header_t HCIEventHeader;\r

 \r
                                /* Read in the event header to fetch the event code and payload length */\r
                                Pipe_Read_Stream_LE(&HCIEventHeader, sizeof(HCIEventHeader));\r
 \r
                                /* Read in the event header to fetch the event code and payload length */\r
                                Pipe_Read_Stream_LE(&HCIEventHeader, sizeof(HCIEventHeader));\r


@@ -86,73 +59,56 @@ void Bluetooth_ProcessHCICommands(void)
                                Pipe_Read_Stream_LE(&EventParams, HCIEventHeader.ParameterLength);\r
                                Pipe_ClearIN();\r
 \r
                                Pipe_Read_Stream_LE(&EventParams, HCIEventHeader.ParameterLength);\r
                                Pipe_ClearIN();\r
 \r

-                               BT_HCI_DEBUG("Event Code: 0x%02X", HCIEventHeader.EventCode);\r
-                               \r

                                switch (HCIEventHeader.EventCode)\r
                                {\r
                                        case EVENT_COMMAND_COMPLETE:\r
                                                Bluetooth_HCIProcessingState = Bluetooth_HCINextState;\r
                                switch (HCIEventHeader.EventCode)\r
                                {\r
                                        case EVENT_COMMAND_COMPLETE:\r
                                                Bluetooth_HCIProcessingState = Bluetooth_HCINextState;\r

-\r
-                                               BT_HCI_DEBUG(">> Command Complete (Opcode 0x%04x)", \r
-                                                        ((Bluetooth_HCIEvent_CommandComplete_t*)&EventParams)->Opcode);\r

                                                break;\r
                                        case EVENT_COMMAND_STATUS:\r
                                                /* If the execution of a command failed, reset the stack */\r
                                                break;\r
                                        case EVENT_COMMAND_STATUS:\r
                                                /* If the execution of a command failed, reset the stack */\r

-                                               if (((Bluetooth_HCIEvent_CommandStatus_t*)&EventParams)->Status)\r
+                                               if (((BT_HCIEvent_CommandStatus_t*)&EventParams)->Status)\r

                                                  Bluetooth_HCIProcessingState = Bluetooth_Init;\r
                                                  Bluetooth_HCIProcessingState = Bluetooth_Init;\r

-\r
-                                               BT_HCI_DEBUG(">> Command Status: 0x%02X",\r
-                                                        ((Bluetooth_HCIEvent_CommandStatus_t*)&EventParams)->Status);                                  \r

                                                break;\r
                                        case EVENT_CONNECTION_REQUEST:\r
                                                /* Need to store the remote device's BT address in a temporary buffer for later use */\r
                                                memcpy(Bluetooth_TempDeviceAddress,\r
                                                break;\r
                                        case EVENT_CONNECTION_REQUEST:\r
                                                /* Need to store the remote device's BT address in a temporary buffer for later use */\r
                                                memcpy(Bluetooth_TempDeviceAddress,\r

-                                                      &((Bluetooth_HCIEvent_ConnectionRequest_t*)&EventParams)->RemoteAddress,\r
+                                                      &((BT_HCIEvent_ConnectionRequest_t*)&EventParams)->RemoteAddress,\r

                                                       sizeof(Bluetooth_TempDeviceAddress));\r
                                                       sizeof(Bluetooth_TempDeviceAddress));\r

-                                       \r
-                                               /* Only accept the connection if it is a ACL (data) connection */\r
-                                               Bluetooth_HCIProcessingState = (Bluetooth_Connection.IsConnected ||\r
-                                                                              (((Bluetooth_HCIEvent_ConnectionRequest_t*)&EventParams)->LinkType != 0x01)) ?\r
-                                                                                                          Bluetooth_Conn_RejectConnection : Bluetooth_Conn_AcceptConnection;\r
+                                                          \r
+                                               bool IsACLConnection = (((BT_HCIEvent_ConnectionRequest_t*)&EventParams)->LinkType == 0x01);\r

 \r
 \r

-                                               BT_HCI_DEBUG(">> Connection Request from Device %02X:%02X:%02X:%02X:%02X:%02X",\r
-                                                                Bluetooth_TempDeviceAddress[5], Bluetooth_TempDeviceAddress[4], Bluetooth_TempDeviceAddress[3],\r
-                                                                Bluetooth_TempDeviceAddress[2], Bluetooth_TempDeviceAddress[1], Bluetooth_TempDeviceAddress[0]);\r
+                                               /* Only accept the connection if it is a ACL (data) connection, a device is not already connected\r
+                                                  and the user application has indicated that the connection should be allowed */\r
+                                               Bluetooth_HCIProcessingState = (Bluetooth_Connection.IsConnected || !(IsACLConnection) ||\r
+                                                                                                           !(Bluetooth_ConnectionRequest(Bluetooth_TempDeviceAddress))) ?\r
+                                                                                                          Bluetooth_Conn_RejectConnection : Bluetooth_Conn_AcceptConnection;\r

                                                break;\r
                                        case EVENT_PIN_CODE_REQUEST:\r
                                                /* Need to store the remote device's BT address in a temporary buffer for later use */\r
                                                memcpy(Bluetooth_TempDeviceAddress,\r
                                                break;\r
                                        case EVENT_PIN_CODE_REQUEST:\r
                                                /* Need to store the remote device's BT address in a temporary buffer for later use */\r
                                                memcpy(Bluetooth_TempDeviceAddress,\r

-                                                      &((Bluetooth_HCIEvent_PinCodeRequest_t*)&EventParams)->RemoteAddress,\r
+                                                      &((BT_HCIEvent_PinCodeReq_t*)&EventParams)->RemoteAddress,\r

                                                       sizeof(Bluetooth_TempDeviceAddress));\r
 \r
                                                Bluetooth_HCIProcessingState = Bluetooth_Conn_SendPINCode;\r
                                                       sizeof(Bluetooth_TempDeviceAddress));\r
 \r
                                                Bluetooth_HCIProcessingState = Bluetooth_Conn_SendPINCode;\r

-\r
-                                               BT_HCI_DEBUG(">> PIN Request from Device %02X:%02X:%02X:%02X:%02X:%02X", \r
-                                                                Bluetooth_TempDeviceAddress[5], Bluetooth_TempDeviceAddress[4], Bluetooth_TempDeviceAddress[3],\r
-                                                                Bluetooth_TempDeviceAddress[2], Bluetooth_TempDeviceAddress[1], Bluetooth_TempDeviceAddress[0]);\r

                                                break;\r
                                        case EVENT_CONNECTION_COMPLETE:\r
                                                /* Need to store the remote device's BT address in a temporary buffer for later use */\r
                                                memcpy(Bluetooth_Connection.RemoteAddress,\r
                                                break;\r
                                        case EVENT_CONNECTION_COMPLETE:\r
                                                /* Need to store the remote device's BT address in a temporary buffer for later use */\r
                                                memcpy(Bluetooth_Connection.RemoteAddress,\r

-                                                      &((Bluetooth_HCIEvent_ConnectionComplete_t*)&EventParams)->RemoteAddress,\r
+                                                      &((BT_HCIEvent_ConnectionComplete_t*)&EventParams)->RemoteAddress,\r

                                                       sizeof(Bluetooth_TempDeviceAddress));\r
 \r
                                                /* Store the created connection handle and indicate that the connection has been established */\r
                                                       sizeof(Bluetooth_TempDeviceAddress));\r
 \r
                                                /* Store the created connection handle and indicate that the connection has been established */\r

-                                               Bluetooth_Connection.ConnectionHandle = ((Bluetooth_HCIEvent_ConnectionComplete_t*)&EventParams)->ConnectionHandle;\r
+                                               Bluetooth_Connection.ConnectionHandle = ((BT_HCIEvent_ConnectionComplete_t*)&EventParams)->ConnectionHandle;\r

                                                Bluetooth_Connection.IsConnected      = true;\r
                                                Bluetooth_Connection.IsConnected      = true;\r

-\r
-                                               BT_HCI_DEBUG(">> Connection Complete to Device %02X:%02X:%02X:%02X:%02X:%02X, Handle 0x%04x", \r
-                                                                Bluetooth_Connection.RemoteAddress[5], Bluetooth_Connection.RemoteAddress[4],\r
-                                                                Bluetooth_Connection.RemoteAddress[3], Bluetooth_Connection.RemoteAddress[2],\r
-                                                                Bluetooth_Connection.RemoteAddress[1], Bluetooth_Connection.RemoteAddress[0],\r
-                                                                Bluetooth_Connection.ConnectionHandle);\r
+                                               \r
+                                               Bluetooth_ConnectionComplete();                                         \r

                                                break;\r
                                        case EVENT_DISCONNECTION_COMPLETE:\r
                                                break;\r
                                        case EVENT_DISCONNECTION_COMPLETE:\r

-                                               BT_HCI_DEBUG(">> Disconnection Complete", NULL);\r
-\r

                                                /* Device disconnected, indicate connection information no longer valid */\r
                                                Bluetooth_Connection.IsConnected = false;\r
                                                \r
                                                /* Device disconnected, indicate connection information no longer valid */\r
                                                Bluetooth_Connection.IsConnected = false;\r
                                                \r

+                                               Bluetooth_DisconnectionComplete();\r
+                                               \r

                                                Bluetooth_HCIProcessingState = Bluetooth_Init;\r
                                                break;                                  \r
                                }\r
                                                Bluetooth_HCIProcessingState = Bluetooth_Init;\r
                                                break;                                  \r
                                }\r


@@ -168,13 +124,11 @@ void Bluetooth_ProcessHCICommands(void)
                        Bluetooth_HCIProcessingState = Bluetooth_Init_Reset; \r
                        break;\r
                case Bluetooth_Init_Reset:\r
                        Bluetooth_HCIProcessingState = Bluetooth_Init_Reset; \r
                        break;\r
                case Bluetooth_Init_Reset:\r

-                       HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
+                       HCICommandHeader = (BT_HCICommand_Header_t)\r

                        {\r
                                OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_RESET},\r
                                ParameterLength: 0,\r
                        };\r
                        {\r
                                OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_RESET},\r
                                ParameterLength: 0,\r
                        };\r

-                       \r
-                       BT_HCI_DEBUG("Enter State: Bluetooth_Init_Reset", NULL);\r

 \r
                        /* Send the command to reset the bluetooth dongle controller */\r
                        Bluetooth_SendHCICommand(NULL, 0);\r
 \r
                        /* Send the command to reset the bluetooth dongle controller */\r
                        Bluetooth_SendHCICommand(NULL, 0);\r


@@ -183,15 +137,12 @@ void Bluetooth_ProcessHCICommands(void)
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_SetLocalName:\r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_SetLocalName:\r

-                       HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
+                       HCICommandHeader = (BT_HCICommand_Header_t)\r

                                {\r
                                        OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_WRITE_LOCAL_NAME},\r
                                        ParameterLength: 248,\r
                                };\r
 \r
                                {\r
                                        OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_WRITE_LOCAL_NAME},\r
                                        ParameterLength: 248,\r
                                };\r
 \r

-                       BT_HCI_DEBUG("Enter State: Bluetooth_Init_SetLocalName", NULL);\r
-                       BT_HCI_DEBUG("-- Name: %s", Bluetooth_DeviceConfiguration.Name);\r
-\r

                        /* Send the command to set the bluetooth dongle's name for other devices to see */\r
                        Bluetooth_SendHCICommand(Bluetooth_DeviceConfiguration.Name, strlen(Bluetooth_DeviceConfiguration.Name));\r
 \r
                        /* Send the command to set the bluetooth dongle's name for other devices to see */\r
                        Bluetooth_SendHCICommand(Bluetooth_DeviceConfiguration.Name, strlen(Bluetooth_DeviceConfiguration.Name));\r
 \r


@@ -199,14 +150,12 @@ void Bluetooth_ProcessHCICommands(void)
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_SetDeviceClass:\r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_SetDeviceClass:\r

-                       HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
+                       HCICommandHeader = (BT_HCICommand_Header_t)\r

                                {\r
                                        OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_WRITE_CLASS_OF_DEVICE},\r
                                        ParameterLength: 3,\r
                                };\r
 \r
                                {\r
                                        OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_WRITE_CLASS_OF_DEVICE},\r
                                        ParameterLength: 3,\r
                                };\r
 \r

-                       BT_HCI_DEBUG("Enter State: Bluetooth_Init_SetDeviceClass", NULL);\r
-\r

                        /* Send the command to set the class of the device for other devices to see */\r
                        Bluetooth_SendHCICommand(&Bluetooth_DeviceConfiguration.Class, 3);\r
 \r
                        /* Send the command to set the class of the device for other devices to see */\r
                        Bluetooth_SendHCICommand(&Bluetooth_DeviceConfiguration.Class, 3);\r
 \r


@@ -214,13 +163,11 @@ void Bluetooth_ProcessHCICommands(void)
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_WriteScanEnable:\r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_WriteScanEnable:\r

-                       HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
+                       HCICommandHeader = (BT_HCICommand_Header_t)\r

                        {\r
                                OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_WRITE_SCAN_ENABLE},\r
                                ParameterLength: 1,\r
                        };\r
                        {\r
                                OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_WRITE_SCAN_ENABLE},\r
                                ParameterLength: 1,\r
                        };\r

-                       \r
-                       BT_HCI_DEBUG("Enter State: Bluetooth_Init_WriteScanEnable", NULL);\r

 \r
                        uint8_t Interval = BT_SCANMODE_InquiryAndPageScans;\r
                        \r
 \r
                        uint8_t Interval = BT_SCANMODE_InquiryAndPageScans;\r
                        \r


@@ -231,67 +178,88 @@ void Bluetooth_ProcessHCICommands(void)
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_AcceptConnection:\r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_AcceptConnection:\r

-                       HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
+                       HCICommandHeader = (BT_HCICommand_Header_t)\r

                                {\r
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_ACCEPT_CONNECTION_REQUEST},\r
                                {\r
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_ACCEPT_CONNECTION_REQUEST},\r

-                                       ParameterLength: sizeof(Bluetooth_HCICommand_AcceptConnectionRequest_t),\r
+                                       ParameterLength: sizeof(BT_HCICommand_AcceptConnectionReq_t),\r

                                };\r
                                };\r

-                       \r
-                       BT_HCI_DEBUG("Enter State: Bluetooth_Conn_AcceptConnection", NULL);\r

 \r
                        /* Copy over the temporary BT device address saved from the Connection Request event, indicate slave\r
                           connection role */\r
 \r
                        /* Copy over the temporary BT device address saved from the Connection Request event, indicate slave\r
                           connection role */\r

-                       Bluetooth_HCICommand_AcceptConnectionRequest_t AcceptConnectionParams;\r
+                       BT_HCICommand_AcceptConnectionReq_t AcceptConnectionParams;\r

                        memcpy(AcceptConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress,\r
                               sizeof(AcceptConnectionParams.RemoteAddress));\r
                        AcceptConnectionParams.SlaveRole = true;\r
 \r
                        /* Send the command to accept the remote connection request */\r
                        memcpy(AcceptConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress,\r
                               sizeof(AcceptConnectionParams.RemoteAddress));\r
                        AcceptConnectionParams.SlaveRole = true;\r
 \r
                        /* Send the command to accept the remote connection request */\r

-                       Bluetooth_SendHCICommand(&AcceptConnectionParams, sizeof(Bluetooth_HCICommand_AcceptConnectionRequest_t));\r
+                       Bluetooth_SendHCICommand(&AcceptConnectionParams, sizeof(BT_HCICommand_AcceptConnectionReq_t));\r

                        \r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_RejectConnection:\r
                        \r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_RejectConnection:\r

-                       HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
+                       HCICommandHeader = (BT_HCICommand_Header_t)\r

                                {\r
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_REJECT_CONNECTION_REQUEST},\r
                                {\r
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_REJECT_CONNECTION_REQUEST},\r

-                                       ParameterLength: sizeof(Bluetooth_HCICommand_RejectConnectionRequest_t),\r
+                                       ParameterLength: sizeof(BT_HCICommand_RejectConnectionReq_t),\r

                                };\r
                                };\r

-                       \r
-                       BT_HCI_DEBUG("Enter State: Bluetooth_Conn_RejectConnection", NULL);\r

 \r
                        /* Copy over the temporary BT device address saved from the Connection Request event, indicate failure\r
 \r
                        /* Copy over the temporary BT device address saved from the Connection Request event, indicate failure\r

-                          to accept the connection due to limited device resources */\r
-                       Bluetooth_HCICommand_RejectConnectionRequest_t RejectConnectionParams;\r
+                          to accept the connection due to limited device resources or incorrect device address */\r
+                       BT_HCICommand_RejectConnectionReq_t RejectConnectionParams;\r

                        memcpy(RejectConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(RejectConnectionParams.RemoteAddress));\r
                        memcpy(RejectConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(RejectConnectionParams.RemoteAddress));\r

-                       RejectConnectionParams.Reason = ERROR_LIMITED_RESOURCES;\r
+                       RejectConnectionParams.Reason = Bluetooth_Connection.IsConnected ? ERROR_LIMITED_RESOURCES : ERROR_UNACCEPTABLE_BDADDR;\r

 \r
                        /* Send the command to reject the remote connection request */\r
 \r
                        /* Send the command to reject the remote connection request */\r

-                       Bluetooth_SendHCICommand(&RejectConnectionParams, sizeof(Bluetooth_HCICommand_RejectConnectionRequest_t));\r
+                       Bluetooth_SendHCICommand(&RejectConnectionParams, sizeof(BT_HCICommand_RejectConnectionReq_t));\r

                \r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_SendPINCode:\r
                \r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_SendPINCode:\r

-                       HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
+                       HCICommandHeader = (BT_HCICommand_Header_t)\r

                                {\r
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_PIN_CODE_REQUEST_REPLY},\r
                                {\r
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_PIN_CODE_REQUEST_REPLY},\r

-                                       ParameterLength: sizeof(Bluetooth_HCICommand_PinCodeResponse_t),\r
+                                       ParameterLength: sizeof(BT_HCICommand_PinCodeResp_t),\r

                                };\r
                                };\r

-                       \r
-                       BT_HCI_DEBUG("Enter State: Bluetooth_Conn_SendPINCode", NULL);\r
-                       BT_HCI_DEBUG("-- PIN: %s", Bluetooth_DeviceConfiguration.PINCode);\r

 \r
                        /* Copy over the temporary BT device address saved from the PIN Code Request event, copy over the\r
                           local PIN authentication code to the response */\r
 \r
                        /* Copy over the temporary BT device address saved from the PIN Code Request event, copy over the\r
                           local PIN authentication code to the response */\r

-                       Bluetooth_HCICommand_PinCodeResponse_t PINCodeRequestParams;\r
+                       BT_HCICommand_PinCodeResp_t PINCodeRequestParams;\r

                        memcpy(PINCodeRequestParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(PINCodeRequestParams.RemoteAddress));\r
                        PINCodeRequestParams.PINCodeLength = strlen(Bluetooth_DeviceConfiguration.PINCode);\r
                        memcpy(PINCodeRequestParams.PINCode, Bluetooth_DeviceConfiguration.PINCode, sizeof(PINCodeRequestParams.PINCode));\r
                        \r
                        /* Send the command to transmit the device's local PIN number for authentication */\r
                        memcpy(PINCodeRequestParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(PINCodeRequestParams.RemoteAddress));\r
                        PINCodeRequestParams.PINCodeLength = strlen(Bluetooth_DeviceConfiguration.PINCode);\r
                        memcpy(PINCodeRequestParams.PINCode, Bluetooth_DeviceConfiguration.PINCode, sizeof(PINCodeRequestParams.PINCode));\r
                        \r
                        /* Send the command to transmit the device's local PIN number for authentication */\r

-                       Bluetooth_SendHCICommand(&PINCodeRequestParams, sizeof(Bluetooth_HCICommand_PinCodeResponse_t));\r
+                       Bluetooth_SendHCICommand(&PINCodeRequestParams, sizeof(BT_HCICommand_PinCodeResp_t));\r

 \r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
        }\r
 }\r
 \r
                        Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
        }\r
 }\r

+\r
+static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint16_t ParameterLength)\r
+{\r
+       /* Need to reserve the amount of bytes given in the header for the complete payload */\r
+       uint8_t CommandBuffer[sizeof(HCICommandHeader) + HCICommandHeader.ParameterLength];\r
+\r
+       USB_ControlRequest = (USB_Request_Header_t)\r
+               {\r
+                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_DEVICE),\r
+                       .bRequest      = 0,\r
+                       .wValue        = 0,\r
+                       .wIndex        = 0,\r
+                       .wLength       = sizeof(CommandBuffer)\r
+               };\r
+\r
+       /* Copy over the HCI command header to the allocated buffer */\r
+       memcpy(CommandBuffer, &HCICommandHeader, sizeof(HCICommandHeader));\r
+       \r
+       /* Zero out the parameter section of the response to ensure that any padding bytes do not expose private RAM contents */\r
+       memset(&CommandBuffer[sizeof(HCICommandHeader)], 0x00, HCICommandHeader.ParameterLength);\r
+\r
+       /* Copy over the command parameters (if any) to the command buffer - note, the number of actual source parameter bytes\r
+          may differ to those in the header; any difference in length is filled with 0x00 padding bytes */\r
+       memcpy(&CommandBuffer[sizeof(HCICommandHeader)], Parameters, ParameterLength);\r
+       \r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+       return USB_Host_SendControlRequest(CommandBuffer);\r
+}\r