Massive cleanups to the incomplete BluetoothHost demo, to make the HCL layer code...

diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
index c996af6..e492815 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
+++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
@@ -179,6 +179,9 @@ void Bluetooth_Management_Task(void)
                        }\r
 \r
                        puts_P(PSTR("Bluetooth Dongle Enumerated.\r\n"));\r
+                       \r
+                       /* Initialize the Bluetooth stack */\r
+                       Bluetooth_State_Init();\r
 \r
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
index 4870fff..8fb7367 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
@@ -34,6 +34,7 @@ static   Bluetooth_HCICommand_Header_t HCICommandHeader;
 static   Bluetooth_HCIEvent_Header_t   HCIEventHeader;\r
 \r
          uint8_t                       Bluetooth_HCIProcessingState;\r
+                uint8_t                       Bluetooth_HCINextState;\r
 static   uint8_t                       Bluetooth_TempDeviceAddress[6];\r
 \r
 static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength)\r
@@ -56,51 +57,92 @@ static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength)
          memcpy(&CommandBuffer[sizeof(HCICommandHeader)], Parameters, ParamLength);\r
 \r
        Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
        return USB_Host_SendControlRequest(CommandBuffer);\r
 }\r
 \r
-static bool Bluetooth_GetNextHCIEventHeader(void)\r
-{\r
-       Pipe_SelectPipe(BLUETOOTH_EVENTS_PIPE);\r
-       Pipe_Unfreeze();\r
-       \r
-       if (!(Pipe_IsReadWriteAllowed()))\r
-       {\r
-               Pipe_Freeze();\r
-               return false;\r
-       }\r
-         \r
-       Pipe_Read_Stream_LE(&HCIEventHeader, sizeof(HCIEventHeader));\r
-       Pipe_Freeze();\r
-\r
-       return true;\r
-}\r
-\r
-static void Bluetooth_DiscardRemainingHCIEventParameters(void)\r
-{\r
-       Pipe_SelectPipe(BLUETOOTH_EVENTS_PIPE);\r
-       Pipe_Unfreeze();\r
-\r
-       Pipe_Discard_Stream(HCIEventHeader.ParameterLength);\r
-       Pipe_ClearIN();\r
-\r
-       Pipe_Freeze();\r
-       \r
-       HCIEventHeader.ParameterLength = 0;\r
-}\r
-\r
 void Bluetooth_ProcessHCICommands(void)\r
 {\r
        uint8_t ErrorCode;\r
 \r
        switch (Bluetooth_HCIProcessingState)\r
        {\r
-               case Bluetooth_Init:\r
+               case Bluetooth_ProcessEvents:\r
                        Pipe_SelectPipe(BLUETOOTH_EVENTS_PIPE);\r
+                       Pipe_Unfreeze();\r
+                       \r
+                       if (Pipe_IsReadWriteAllowed())\r
+                       {\r
+                               Pipe_Read_Stream_LE(&HCIEventHeader, sizeof(HCIEventHeader));\r
+                               \r
+                               uint8_t EventParams[HCIEventHeader.ParameterLength];\r
+\r
+                               Pipe_Read_Stream_LE(&EventParams, HCIEventHeader.ParameterLength);\r
+                               Pipe_ClearIN();\r
+\r
+                               BT_DEBUG("(HCI) 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_DEBUG("(HCI) >> Command Complete (Opcode 0x%04x)", \r
+                                                        ((Bluetooth_HCIEvent_CommandComplete_t*)&EventParams)->Opcode);\r
+                                               break;\r
+                                       case EVENT_COMMAND_STATUS:\r
+                                               if (((Bluetooth_HCIEvent_CommandStatus_t*)&EventParams)->Status)\r
+                                                 Bluetooth_HCIProcessingState = Bluetooth_Init;\r
+\r
+                                               BT_DEBUG("(HCI) >> Command Status: 0x%02X",\r
+                                                        ((Bluetooth_HCIEvent_CommandStatus_t*)&EventParams)->Status);                                  \r
+                                               break;\r
+                                       case EVENT_CONNECTION_REQUEST:\r
+                                               memcpy(Bluetooth_TempDeviceAddress,\r
+                                                      &((Bluetooth_HCIEvent_ConnectionRequest_t*)&EventParams)->RemoteAddress,\r
+                                                      sizeof(Bluetooth_TempDeviceAddress));\r
+                                       \r
+                                               Bluetooth_HCIProcessingState = (Bluetooth_Connection.IsConnected ||\r
+                                                                              (((Bluetooth_HCIEvent_ConnectionRequest_t*)&EventParams)->LinkType != 0x01)) ?\r
+                                                                                                          Bluetooth_Conn_RejectConnection : Bluetooth_Conn_AcceptConnection;\r
+\r
+                                               BT_DEBUG("(HCI) >> 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
+                                               memcpy(Bluetooth_TempDeviceAddress,\r
+                                                      &((Bluetooth_HCIEvent_PinCodeRequest_t*)&EventParams)->RemoteAddress,\r
+                                                      sizeof(Bluetooth_TempDeviceAddress));\r
+\r
+                                               Bluetooth_HCIProcessingState = Bluetooth_Conn_SendPINCode;\r
+\r
+                                               BT_DEBUG("(HCI) >> 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
+                                               memcpy(Bluetooth_Connection.RemoteAddress,\r
+                                                      &((Bluetooth_HCIEvent_ConnectionComplete_t*)&EventParams)->RemoteAddress,\r
+                                                      sizeof(Bluetooth_TempDeviceAddress));\r
+\r
+                                               Bluetooth_Connection.ConnectionHandle = ((Bluetooth_HCIEvent_ConnectionComplete_t*)&EventParams)->ConnectionHandle;\r
+                                               Bluetooth_Connection.IsConnected      = true;\r
+\r
+                                               BT_DEBUG("(HCI) >> 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
+                                               break;\r
+                               }\r
+                       }\r
+                       \r
+                       Pipe_Freeze();\r
                        \r
+                       break;\r
+               case Bluetooth_Init:\r
                        memset(&Bluetooth_Connection, 0x00, sizeof(Bluetooth_Connection));\r
-                                                          \r
+\r
                        Bluetooth_HCIProcessingState = Bluetooth_Init_Reset; \r
                        break;\r
                case Bluetooth_Init_Reset:\r
@@ -113,19 +155,9 @@ void Bluetooth_ProcessHCICommands(void)
                        BT_DEBUG("(HCI) Enter State: Bluetooth_Init_Reset", NULL);\r
 \r
                        ErrorCode = Bluetooth_SendHCICommand(NULL, 0);\r
-\r
-                       do\r
-                       {\r
-                               while (!(Bluetooth_GetNextHCIEventHeader()))\r
-                               {\r
-                                       if (USB_HostState == HOST_STATE_Unattached)\r
-                                         return;\r
-                               }\r
-               \r
-                               Bluetooth_DiscardRemainingHCIEventParameters();\r
-                       } while (HCIEventHeader.EventCode != EVENT_COMMAND_COMPLETE);\r
-\r
-                       Bluetooth_HCIProcessingState = Bluetooth_Init_ReadBufferSize;\r
+                       \r
+                       Bluetooth_HCINextState       = Bluetooth_Init_ReadBufferSize;\r
+                       Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_ReadBufferSize:\r
                        HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
@@ -138,46 +170,8 @@ void Bluetooth_ProcessHCICommands(void)
 \r
                        ErrorCode = Bluetooth_SendHCICommand(NULL, 0);\r
 \r
-                       do\r
-                       {\r
-                               while (!(Bluetooth_GetNextHCIEventHeader()))\r
-                               {\r
-                                       if (USB_HostState == HOST_STATE_Unattached)\r
-                                         return;\r
-                               }\r
-\r
-                               Bluetooth_DiscardRemainingHCIEventParameters();\r
-                       } while (HCIEventHeader.EventCode != EVENT_COMMAND_COMPLETE);\r
-\r
-                       Bluetooth_HCIProcessingState = Bluetooth_Init_SetEventMask;             \r
-                       break;\r
-               case Bluetooth_Init_SetEventMask:\r
-                       HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
-                       {\r
-                               OpCode: {OGF: OGF_CTRLR_BASEBAND, OCF: OCF_CTRLR_BASEBAND_SET_EVENT_MASK},\r
-                               ParameterLength: 8,\r
-                       };\r
-               \r
-                       BT_DEBUG("(HCI) Enter State: Bluetooth_Init_SetEventMask", NULL);\r
-                       \r
-                       uint8_t EventMask[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
-                       ErrorCode = Bluetooth_SendHCICommand(&EventMask, 8);\r
-\r
-                       BT_DEBUG("(HCI) -- Event mask: 0x%02X%02X%02X%02X%02X%02X%02X%02X", EventMask[7], EventMask[6], EventMask[5], EventMask[4],\r
-                                                                                           EventMask[3], EventMask[2], EventMask[1], EventMask[0]);\r
-                       do\r
-                       {\r
-                               while (!(Bluetooth_GetNextHCIEventHeader()))\r
-                               {\r
-                                       if (USB_HostState == HOST_STATE_Unattached)\r
-                                         return;\r
-                               }\r
-\r
-                               Bluetooth_DiscardRemainingHCIEventParameters();\r
-                       } while (HCIEventHeader.EventCode != EVENT_COMMAND_COMPLETE);\r
-               \r
-\r
-                       Bluetooth_HCIProcessingState = Bluetooth_Init_SetLocalName;             \r
+                       Bluetooth_HCINextState       = Bluetooth_Init_SetLocalName;\r
+                       Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_SetLocalName:\r
                        HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
@@ -190,19 +184,9 @@ void Bluetooth_ProcessHCICommands(void)
                        BT_DEBUG("(HCI)  -- Name: %s", Bluetooth_DeviceConfiguration.Name);\r
 \r
                        ErrorCode = Bluetooth_SendHCICommand(Bluetooth_DeviceConfiguration.Name, strlen(Bluetooth_DeviceConfiguration.Name));\r
-                       \r
-                       do\r
-                       {\r
-                               while (!(Bluetooth_GetNextHCIEventHeader()))\r
-                               {\r
-                                       if (USB_HostState == HOST_STATE_Unattached)\r
-                                         return;\r
-                               }\r
 \r
-                               Bluetooth_DiscardRemainingHCIEventParameters();\r
-                       } while (HCIEventHeader.EventCode != EVENT_COMMAND_COMPLETE);\r
-                       \r
-                       Bluetooth_HCIProcessingState = Bluetooth_Init_SetDeviceClass;\r
+                       Bluetooth_HCINextState       = Bluetooth_Init_SetDeviceClass;\r
+                       Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_SetDeviceClass:\r
                        HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
@@ -215,18 +199,8 @@ void Bluetooth_ProcessHCICommands(void)
 \r
                        ErrorCode = Bluetooth_SendHCICommand(&Bluetooth_DeviceConfiguration.Class, 3);\r
 \r
-                       do\r
-                       {\r
-                               while (!(Bluetooth_GetNextHCIEventHeader()))\r
-                               {\r
-                                       if (USB_HostState == HOST_STATE_Unattached)\r
-                                         return;\r
-                               }\r
-\r
-                               Bluetooth_DiscardRemainingHCIEventParameters();\r
-                       } while (HCIEventHeader.EventCode != EVENT_COMMAND_COMPLETE);\r
-\r
-                       Bluetooth_HCIProcessingState = Bluetooth_Init_WriteScanEnable;  \r
+                       Bluetooth_HCINextState       = Bluetooth_Init_WriteScanEnable;\r
+                       Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Init_WriteScanEnable:\r
                        HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
@@ -239,168 +213,65 @@ void Bluetooth_ProcessHCICommands(void)
 \r
                        uint8_t Interval = InquiryAndPageScans;\r
                        ErrorCode = Bluetooth_SendHCICommand(&Interval, 1);\r
-\r
-                       do\r
-                       {\r
-                               while (!(Bluetooth_GetNextHCIEventHeader()))\r
-                               {\r
-                                       if (USB_HostState == HOST_STATE_Unattached)\r
-                                         return;\r
-                               }\r
-\r
-                               Bluetooth_DiscardRemainingHCIEventParameters();\r
-                       } while (HCIEventHeader.EventCode != EVENT_COMMAND_COMPLETE);\r
-\r
-                       Bluetooth_HCIProcessingState = Bluetooth_PrepareToProcessEvents;\r
-                       break;\r
-               case Bluetooth_PrepareToProcessEvents:\r
-                       BT_DEBUG("(HCI) Enter State: Bluetooth_ProcessEvents", NULL);\r
-\r
-                       Bluetooth_HCIProcessingState     = Bluetooth_ProcessEvents;\r
-                       break;\r
-               case Bluetooth_ProcessEvents:\r
-                       if (Bluetooth_GetNextHCIEventHeader())\r
-                       {\r
-                               BT_DEBUG("(HCI) Event Code: 0x%02X", HCIEventHeader.EventCode);\r
                        \r
-                               if (HCIEventHeader.EventCode == EVENT_COMMAND_STATUS)\r
-                               {\r
-                                       Bluetooth_HCIEvent_CommandStatus_Header_t CommandStatusHeader;\r
-\r
-                                       Pipe_Read_Stream_LE(&CommandStatusHeader, sizeof(CommandStatusHeader));\r
-                                       HCIEventHeader.ParameterLength -= sizeof(CommandStatusHeader);\r
-                                                                               \r
-                                       BT_DEBUG("(HCI) >> Command status: 0x%02X", CommandStatusHeader.CommandStatus);\r
-                                       \r
-                                       if (CommandStatusHeader.CommandStatus)\r
-                                         Bluetooth_HCIProcessingState = Bluetooth_Init;\r
-                               }\r
-                               else if (HCIEventHeader.EventCode == EVENT_CONNECTION_REQUEST)\r
-                               {\r
-                                       Bluetooth_HCIEvent_ConnectionRequest_Header_t ConnectionRequestParams;\r
-                                       \r
-                                       Pipe_Read_Stream_LE(&ConnectionRequestParams, sizeof(ConnectionRequestParams));\r
-                                       HCIEventHeader.ParameterLength -= sizeof(ConnectionRequestParams);\r
-\r
-                                       BT_DEBUG("(HCI) >> Connection Request from device %02X:%02X:%02X:%02X:%02X:%02X",\r
-                                                ConnectionRequestParams.RemoteAddress[5], ConnectionRequestParams.RemoteAddress[4], \r
-                                                ConnectionRequestParams.RemoteAddress[3], ConnectionRequestParams.RemoteAddress[2], \r
-                                                ConnectionRequestParams.RemoteAddress[1], ConnectionRequestParams.RemoteAddress[0]);\r
-                                       BT_DEBUG("(HCI) -- Device Class: 0x%02X%04X", ConnectionRequestParams.ClassOfDevice_Service,\r
-                                                                                     ConnectionRequestParams.ClassOfDevice_MajorMinor);\r
-                                       BT_DEBUG("(HCI) -- Link Type: 0x%02x", ConnectionRequestParams.LinkType);\r
-                                       \r
-                                       memcpy(Bluetooth_TempDeviceAddress, ConnectionRequestParams.RemoteAddress,\r
-                                              sizeof(Bluetooth_TempDeviceAddress));\r
-\r
-                                       Bluetooth_HCIProcessingState = (Bluetooth_Connection.IsConnected) ? Bluetooth_Conn_RejectConnection :\r
-                                                                                                               Bluetooth_Conn_AcceptConnection;\r
-                               }\r
-                               else if (HCIEventHeader.EventCode == EVENT_DISCONNECTION_COMPLETE)\r
-                               {\r
-                                       BT_DEBUG("(HCI) >> Disconnection from device complete.", NULL);\r
-                                       Bluetooth_HCIProcessingState = Bluetooth_Init;\r
-                               }\r
-                               else if (HCIEventHeader.EventCode == EVENT_CONNECTION_COMPLETE)\r
-                               {\r
-                                       Bluetooth_HCIEvent_ConnectionComplete_Header_t ConnectionCompleteParams;\r
-                                       \r
-                                       Pipe_Read_Stream_LE(&ConnectionCompleteParams, sizeof(ConnectionCompleteParams));\r
-                                       HCIEventHeader.ParameterLength -= sizeof(ConnectionCompleteParams);\r
-\r
-                                       BT_DEBUG("(HCI) >> Connection to device complete.", NULL);\r
-                                       BT_DEBUG("(HCI) -- Status: %d", ConnectionCompleteParams.Status);\r
-                                       BT_DEBUG("(HCI) -- Handle: %d", ConnectionCompleteParams.ConnectionHandle);\r
-                                       \r
-                                       if (ConnectionCompleteParams.Status == 0x00)\r
-                                       {\r
-                                               memcpy(Bluetooth_Connection.DeviceAddress, ConnectionCompleteParams.RemoteAddress,\r
-                                                          sizeof(Bluetooth_Connection.DeviceAddress));\r
-                                               Bluetooth_Connection.ConnectionHandle = ConnectionCompleteParams.ConnectionHandle;\r
-                                               Bluetooth_Connection.IsConnected = true;\r
-                                       }\r
-                               }\r
-                               else if (HCIEventHeader.EventCode == EVENT_PIN_CODE_REQUEST)\r
-                               {\r
-                                       Pipe_Read_Stream_LE(&Bluetooth_TempDeviceAddress, sizeof(Bluetooth_TempDeviceAddress));\r
-                                       HCIEventHeader.ParameterLength -= sizeof(Bluetooth_TempDeviceAddress);\r
-\r
-                                       BT_DEBUG("(HCI) >> PIN code 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
-                                                        \r
-                                       Bluetooth_HCIProcessingState = Bluetooth_Conn_SendPINCode;\r
-                               }\r
-                               else if (HCIEventHeader.EventCode == EVENT_COMMAND_COMPLETE)\r
-                               {\r
-                                       BT_DEBUG("(HCI) >> Command Complete", NULL);\r
-                               }\r
-                               \r
-                               BT_DEBUG("(HCI) -- Unread Event Param Length: %d", HCIEventHeader.ParameterLength);\r
-\r
-                               Bluetooth_DiscardRemainingHCIEventParameters();\r
-                       }\r
-\r
+                       Bluetooth_HCINextState       = Bluetooth_ProcessEvents;\r
+                       Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_AcceptConnection:\r
                        HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
                                {\r
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_ACCEPT_CONNECTION_REQUEST},\r
-                                       ParameterLength: sizeof(Bluetooth_HCICommand_AcceptConnectionRequest_Params_t),\r
+                                       ParameterLength: sizeof(Bluetooth_HCICommand_AcceptConnectionRequest_t),\r
                                };\r
                        \r
                        BT_DEBUG("(HCI) Enter State: Bluetooth_Conn_AcceptConnection", NULL);\r
 \r
-                       Bluetooth_HCICommand_AcceptConnectionRequest_Params_t AcceptConnectionParams;\r
-                                                        \r
-                       memcpy(AcceptConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress,\r
-                              sizeof(Bluetooth_TempDeviceAddress));\r
+                       Bluetooth_HCICommand_AcceptConnectionRequest_t AcceptConnectionParams;\r
+\r
+                       memcpy(AcceptConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(Bluetooth_TempDeviceAddress));\r
                        AcceptConnectionParams.SlaveRole = true;\r
 \r
-                       Bluetooth_SendHCICommand(&AcceptConnectionParams, sizeof(AcceptConnectionParams));\r
+                       ErrorCode = Bluetooth_SendHCICommand(&AcceptConnectionParams, sizeof(AcceptConnectionParams));\r
                        \r
-                       Bluetooth_HCIProcessingState     = Bluetooth_PrepareToProcessEvents;\r
+                       Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_RejectConnection:\r
                        HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
                                {\r
-                                       OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_ACCEPT_CONNECTION_REQUEST},\r
-                                       ParameterLength: sizeof(Bluetooth_HCICommand_RejectConnectionRequest_Params_t),\r
+                                       OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_REJECT_CONNECTION_REQUEST},\r
+                                       ParameterLength: sizeof(Bluetooth_HCICommand_RejectConnectionRequest_t),\r
                                };\r
                        \r
                        BT_DEBUG("(HCI) Enter State: Bluetooth_Conn_RejectConnection", NULL);\r
 \r
-                       Bluetooth_HCICommand_RejectConnectionRequest_Params_t RejectConnectionParams;\r
+                       Bluetooth_HCICommand_RejectConnectionRequest_t RejectConnectionParams;\r
 \r
-                       memcpy(RejectConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress,\r
-                              sizeof(Bluetooth_TempDeviceAddress));\r
+                       memcpy(RejectConnectionParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(RejectConnectionParams.RemoteAddress));\r
                        RejectConnectionParams.Reason = ERROR_LIMITED_RESOURCES;\r
 \r
-                       Bluetooth_SendHCICommand(&AcceptConnectionParams, sizeof(AcceptConnectionParams));\r
+                       ErrorCode = Bluetooth_SendHCICommand(&RejectConnectionParams, sizeof(RejectConnectionParams));\r
                \r
-                       Bluetooth_HCIProcessingState     = Bluetooth_PrepareToProcessEvents;\r
+                       Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
                case Bluetooth_Conn_SendPINCode:\r
                        HCICommandHeader = (Bluetooth_HCICommand_Header_t)\r
                                {\r
                                        OpCode: {OGF: OGF_LINK_CONTROL, OCF: OCF_LINK_CONTROL_PIN_CODE_REQUEST_REPLY},\r
-                                       ParameterLength: sizeof(Bluetooth_HCICommand_PinCodeResponse_Params_t),\r
+                                       ParameterLength: sizeof(Bluetooth_HCICommand_PinCodeResponse_t),\r
                                };\r
                        \r
                        BT_DEBUG("(HCI) Enter State: Bluetooth_Conn_SendPINCode", NULL);\r
                        BT_DEBUG("(HCI) -- PIN: %s", Bluetooth_DeviceConfiguration.PINCode);\r
 \r
-                       Bluetooth_HCICommand_PinCodeResponse_Params_t PINCodeRequestParams;\r
+                       Bluetooth_HCICommand_PinCodeResponse_t PINCodeRequestParams;\r
                \r
-                       memcpy(PINCodeRequestParams.RemoteAddress, Bluetooth_TempDeviceAddress,\r
-                              sizeof(Bluetooth_TempDeviceAddress));\r
+                       memcpy(PINCodeRequestParams.RemoteAddress, Bluetooth_TempDeviceAddress, sizeof(Bluetooth_TempDeviceAddress));\r
                        PINCodeRequestParams.PINCodeLength = strlen(Bluetooth_DeviceConfiguration.PINCode);\r
-                       memcpy(PINCodeRequestParams.PINCode, Bluetooth_DeviceConfiguration.PINCode,\r
-                              sizeof(Bluetooth_DeviceConfiguration.PINCode));\r
+                       memcpy(PINCodeRequestParams.PINCode, Bluetooth_DeviceConfiguration.PINCode, sizeof(PINCodeRequestParams.PINCode));\r
                        \r
-                       Bluetooth_SendHCICommand(&PINCodeRequestParams, sizeof(PINCodeRequestParams));\r
+                       ErrorCode = Bluetooth_SendHCICommand(&PINCodeRequestParams, sizeof(PINCodeRequestParams));\r
 \r
-                       Bluetooth_HCIProcessingState     = Bluetooth_PrepareToProcessEvents;\r
+                       Bluetooth_HCIProcessingState = Bluetooth_ProcessEvents;\r
                        break;\r
        }\r
 }\r

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h
index 7b6b4f3..03a6505 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h
@@ -103,23 +103,30 @@
 \r
                typedef struct\r
                {\r
-                       uint8_t CommandStatus;\r
-                       uint8_t CommandPackets;\r
+                       uint8_t Status;\r
+                       uint8_t Packets;\r
 \r
                        struct\r
                        {\r
                                int OCF : 10;\r
                                int OGF : 6;\r
                        } OpCode;\r
-               } Bluetooth_HCIEvent_CommandStatus_Header_t;\r
+               } Bluetooth_HCIEvent_CommandStatus_t;\r
                \r
                typedef struct\r
                {\r
+                       uint8_t  HCLPacketsAllowable;\r
+                       uint16_t Opcode;\r
+                       uint8_t  ReturnParams[];\r
+               } Bluetooth_HCIEvent_CommandComplete_t;\r
+\r
+               typedef struct\r
+               {\r
                        uint8_t  RemoteAddress[6];\r
                        uint8_t  ClassOfDevice_Service;\r
                        uint16_t ClassOfDevice_MajorMinor;\r
                        uint8_t  LinkType;\r
-               } Bluetooth_HCIEvent_ConnectionRequest_Header_t;\r
+               } Bluetooth_HCIEvent_ConnectionRequest_t;\r
 \r
                typedef struct\r
                {\r
@@ -128,26 +135,31 @@
                        uint8_t  RemoteAddress[6];\r
                        uint8_t  LinkType;\r
                        uint8_t  EncryptionEnabled;\r
-               } Bluetooth_HCIEvent_ConnectionComplete_Header_t;\r
+               } Bluetooth_HCIEvent_ConnectionComplete_t;\r
+               \r
+               typedef struct\r
+               {\r
+                       uint8_t  RemoteAddress[6];\r
+               } Bluetooth_HCIEvent_PinCodeRequest_t;\r
                \r
                typedef struct\r
                {\r
                        uint8_t  RemoteAddress[6];\r
                        uint8_t  SlaveRole;\r
-               } Bluetooth_HCICommand_AcceptConnectionRequest_Params_t;\r
+               } Bluetooth_HCICommand_AcceptConnectionRequest_t;\r
                \r
                typedef struct\r
                {\r
                        uint8_t  RemoteAddress[6];\r
                        uint8_t  Reason;\r
-               } Bluetooth_HCICommand_RejectConnectionRequest_Params_t;\r
+               } Bluetooth_HCICommand_RejectConnectionRequest_t;\r
 \r
                typedef struct\r
                {\r
                        uint8_t  RemoteAddress[6];\r
                        uint8_t  PINCodeLength;\r
                        char     PINCode[16];\r
-               } Bluetooth_HCICommand_PinCodeResponse_Params_t;\r
+               } Bluetooth_HCICommand_PinCodeResponse_t;\r
                \r
        /* Enums: */\r
                enum Bluetooth_ScanEnable_Modes_t\r
@@ -160,18 +172,16 @@
 \r
                enum BluetoothStack_States_t\r
                {\r
-                       Bluetooth_Init                            = 0,\r
-                       Bluetooth_Init_Reset                      = 1,\r
-                       Bluetooth_Init_ReadBufferSize             = 2,\r
-                       Bluetooth_Init_SetEventMask               = 3,\r
+                       Bluetooth_ProcessEvents                   = 0,\r
+                       Bluetooth_Init                            = 1,\r
+                       Bluetooth_Init_Reset                      = 2,\r
+                       Bluetooth_Init_ReadBufferSize             = 3,\r
                        Bluetooth_Init_SetLocalName               = 4,\r
                        Bluetooth_Init_SetDeviceClass             = 5,\r
                        Bluetooth_Init_WriteScanEnable            = 6,\r
-                       Bluetooth_PrepareToProcessEvents          = 7,\r
-                       Bluetooth_ProcessEvents                   = 8,\r
-                       Bluetooth_Conn_AcceptConnection           = 9,\r
-                       Bluetooth_Conn_RejectConnection           = 10,\r
-                       Bluetooth_Conn_SendPINCode                = 11,\r
+                       Bluetooth_Conn_AcceptConnection           = 7,\r
+                       Bluetooth_Conn_RejectConnection           = 8,\r
+                       Bluetooth_Conn_SendPINCode                = 9,\r
                };\r
                \r
        /* External Variables: */\r
@@ -179,12 +189,10 @@
 \r
        /* Function Prototypes: */\r
                void Bluetooth_ProcessHCICommands(void);\r
+               void Bluetooth_ProcessHCIEvents(void);\r
 \r
                #if defined(INCLUDE_FROM_BLUETOOTHHCICOMMANDS_C)\r
                        static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength);\r
-                       static bool    Bluetooth_GetNextHCIEventHeader(void);\r
-                       static void    Bluetooth_DiscardRemainingHCIEventParameters(void);\r
-                       static void    Bluetooth_ProcessHCICommands(void);\r
                #endif\r
                \r
 #endif\r

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
index b5b8bac..7f49fc9 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
@@ -39,11 +39,13 @@ Bluetooth_Device_t     Bluetooth_DeviceConfiguration ATTR_WEAK =
                Name:    "LUFA BT Device"\r
        };\r
 \r
+void Bluetooth_State_Init(void)\r
+{\r
+       Bluetooth_HCIProcessingState = Bluetooth_Init;\r
+}\r
+\r
 void Bluetooth_Stack_Task(void)\r
 {\r
-       if (USB_HostState != HOST_STATE_Configured)\r
-         Bluetooth_HCIProcessingState = Bluetooth_Init;\r
-               \r
        Bluetooth_ProcessHCICommands();\r
        Bluetooth_ProcessACLPackets();\r
 }\r

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h
index a7323fa..0fc2dd2 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h
@@ -72,7 +72,7 @@
                {\r
                        bool                IsConnected;\r
                        uint16_t            ConnectionHandle;\r
-                       uint8_t             DeviceAddress[6];\r
+                       uint8_t             RemoteAddress[6];\r
                        Bluetooth_Channel_t Channels[BLUETOOTH_MAX_OPEN_CHANNELS];\r
                } Bluetooth_Connection_t;\r
                \r
@@ -87,6 +87,7 @@
                Bluetooth_Channel_t* Bluetooth_GetChannelData(uint16_t ChannelNumber, bool SearchBySource);\r
                Bluetooth_Channel_t* Bluetooth_InitChannelData(uint16_t RemoteChannelNumber, uint16_t PSM);\r
                \r
+               void Bluetooth_State_Init(void);\r
                void Bluetooth_Stack_Task(void);\r
 \r
        /* External Variables: */\r

diff --git a/LUFA/ManPages/AlternativeStacks.txt b/LUFA/ManPages/AlternativeStacks.txt
index c7fcfbf..28176ce 100644 (file)
--- a/LUFA/ManPages/AlternativeStacks.txt
+++ b/LUFA/ManPages/AlternativeStacks.txt
@@ -10,6 +10,10 @@
  *  LUFA is not the only stack available for the USB AVRs, although it is perhaps the best (see \ref Page_WhyUseLUFA).\r
  *  In the interests of completeness and user choice, other known USB AVR stacks are listed here.\r
  *\r
+ *  \section Sec_HardwareStacks Hardware USB AVR Stacks\r
+ *  These are the known alternative USB stacks which are designed for and run exclusively on the USB AVR series microcontrollers,\r
+ *  which contain on-chip USB controller hardware for maximum features and speed.\r
+ *\r
  *  - <b>Name:</b> Atmel USB AVR Stack (<i>Atmel Inc.</i>) \n\r
  *    <b>Cost:</b> Free \n\r
  *    <b>License:</b> Atmel Limited License (see Atmel download for details) \n\r
@@ -33,5 +37,26 @@
  *                        designed for the PJRC Teensy line of USB AVRs, and thus may need to be modified for other USB AVR\r
  *                        chips. These minimal code samples shows the inner workings of the USB controller, without all the \r
  *                        abstraction present in most other USB AVR stacks. \r
+ *\r
+ *  \section Sec_SoftwareStacks Software AVR Stacks\r
+ *  These are the known alternative USB stacks which can run on regular AVR models, lacking dedicated hardware USB controllers\r
+ *  via a bit-banged (emulated) version of the USB protocol. They are limited in their capabilities due to the cycles required\r
+ *  to be dedicated to managing the USB bus, but offer a cheap way to implement USB functionality into a design.\r
+ *\r
+ *  - <b>Name:</b> AVR309: Software USB (<i>Objective Development</i>) \n\r
+ *    <b>Cost:</b> Free for some uses, see website for licensing \n\r
+ *    <b>License:</b> None Stated \n\r
+ *    <b>Website:</b> http://www.atmel.com/dyn/Products/app_notes.asp?family_id=607 \n\r
+ *    <b>Description:</b> Atmel's official software USB implementation, an Application Note containing work by Igor Cesko. This\r
+ *                        is a minimal assembly-only implementation of software USB, providing HID functionality. Less compile\r
+ *                        options than V-USB (see below).\r
+ *\r
+ *  - <b>Name:</b> V-USB (<i>Objective Development</i>) \n\r
+ *    <b>Cost:</b> Free for some uses, see website for licensing \n\r
+ *    <b>License:</b> Dual GPL2/Custom \n\r
+ *    <b>Website:</b> http://www.obdev.at/products/vusb/index.html \n\r
+ *    <b>Description:</b> Well regarded and complete USB 1.1 software stack for several AVR models, implementing Low Speed HID.\r
+ *                        Used in many commercial and non-commercial designs, with user-submitted projects available for viewing\r
+ *                        on the company's website. Uses C language code mixed with assembly for time-critical sections.\r
  */\r
  
\ No newline at end of file