Add Bluetooth signalling echo request/response handlers, disconnection request/respon...
[pub/lufa.git] / Demos / Host / Incomplete / BluetoothHost / Lib / BluetoothHCICommands.c
index a6e59d6..9d67b70 100644 (file)
@@ -86,23 +86,15 @@ void Bluetooth_ProcessHCICommands(void)
                                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
-\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
                                                if (((Bluetooth_HCIEvent_CommandStatus_t*)&EventParams)->Status)\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
@@ -115,12 +107,8 @@ void Bluetooth_ProcessHCICommands(void)
                                                /* 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
-                                                                                                           !(CALLBACK_Bluetooth_ConnectionRequest(Bluetooth_TempDeviceAddress))) ?\r
+                                                                                                           !(Bluetooth_ConnectionRequest(Bluetooth_TempDeviceAddress))) ?\r
                                                                                                           Bluetooth_Conn_RejectConnection : Bluetooth_Conn_AcceptConnection;\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
                                                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
@@ -129,10 +117,6 @@ void Bluetooth_ProcessHCICommands(void)
                                                       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
@@ -143,19 +127,15 @@ void Bluetooth_ProcessHCICommands(void)
                                                /* 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.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
-                                               BT_HCI_DEBUG(">> Disconnection Complete", NULL);\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
@@ -176,8 +156,6 @@ void Bluetooth_ProcessHCICommands(void)
                                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
@@ -192,9 +170,6 @@ void Bluetooth_ProcessHCICommands(void)
                                        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
@@ -208,8 +183,6 @@ void Bluetooth_ProcessHCICommands(void)
                                        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
@@ -222,8 +195,6 @@ void Bluetooth_ProcessHCICommands(void)
                                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
@@ -239,8 +210,6 @@ void Bluetooth_ProcessHCICommands(void)
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_ACCEPT_CONNECTION_REQUEST},\r
                                        ParameterLength: sizeof(Bluetooth_HCICommand_AcceptConnectionRequest_t),\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
@@ -260,8 +229,6 @@ void Bluetooth_ProcessHCICommands(void)
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_REJECT_CONNECTION_REQUEST},\r
                                        ParameterLength: sizeof(Bluetooth_HCICommand_RejectConnectionRequest_t),\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
                           to accept the connection due to limited device resources or incorrect device address */\r
@@ -280,9 +247,6 @@ void Bluetooth_ProcessHCICommands(void)
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_PIN_CODE_REQUEST_REPLY},\r
                                        ParameterLength: sizeof(Bluetooth_HCICommand_PinCodeResponse_t),\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