X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/fa1a092901319b3b41bf09e0c4cb9cbbec470d6b..a9e0935a90346beb0c981924becc1f55d969a08b:/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
index 4e0330e52..6b434ba43 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
@@ -33,67 +33,66 @@
 /** Bluetooth device connection information structure. Once connected to a remote device, this structure tracks the
  *  connection state of the individual L2CAP channels.
  */
-Bluetooth_Connection_t Bluetooth_Connection = {IsConnected: false};
+Bluetooth_Connection_t Bluetooth_Connection = { IsConnected: false };
 
-/** Bluetooth configuration structure. This structure configures the bluetooth stack's user alterable settings. */
-Bluetooth_Device_t Bluetooth_DeviceConfiguration =
-	{
-		Class:   (DEVICE_CLASS_SERVICE_CAPTURING | DEVICE_CLASS_MAJOR_COMPUTER | DEVICE_CLASS_MINOR_COMPUTER_PALM),
-		PINCode: "0000",
-		Name:    "LUFA Bluetooth Demo"
-	};
+/** Bluetooth device state information structure. This structure contains details on the current Bluetooth stack
+ *  state.
+ */
+Bluetooth_Stack_State_t Bluetooth_State     = { IsInitialized: false };
 
+/** Bluetooth stack initialization function. This function must be called once to initialize the Bluetooth stack,
+ *  ready for connection to remote devices.
+ *
+ *  \note This function only begins the initialization process; the stack is initialized as the main Bluetooth stack
+ *        management task is repeatedly called. The initialization process ends when the IsInitialized element of the
+ *        \ref Bluetooth_State structure becomes true and the \ref Bluetooth_StackInitialized() callback fires.
+ */
 void Bluetooth_Stack_Init(void)
 {
-	Bluetooth_HCIProcessingState = Bluetooth_Init;
+	/* Reset the HCI state machine - this will eventually reset the adapter and stack when the Bluetooth stack task is called */
+	Bluetooth_State.CurrentHCIState = Bluetooth_Init;
+	Bluetooth_State.NextHCIState    = Bluetooth_Init;
 }
 
+/** Bluetooth stack management task. This task must be repeatedly called to maintain the Bluetooth stack and any connection
+ *  to remote Bluetooth devices, including both the HCI control layer and the ACL channel layer.
+ */
 void Bluetooth_Stack_USBTask(void)
 {
-	Bluetooth_ProcessHCICommands();
-	Bluetooth_ProcessACLPackets();
+	Bluetooth_HCITask();
+	Bluetooth_ACLTask();
 }
 
-bool CALLBACK_Bluetooth_ConnectionRequest(uint8_t* RemoteAddress)
-{
-	/* Always accept connections from remote devices */
-	return true;
-}
-
-Bluetooth_Channel_t* Bluetooth_GetChannelData(uint16_t ChannelNumber, bool SearchBySource)
-{
-	Bluetooth_Channel_t* CurrentChannelStructure;
-
-	for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
-	{
-		CurrentChannelStructure = &Bluetooth_Connection.Channels[i];
-	
-		uint16_t CurrentChannelNumber = ((SearchBySource) ? CurrentChannelStructure->RemoteNumber : CurrentChannelStructure->LocalNumber);
-	
-		if (CurrentChannelNumber == ChannelNumber)
-		  return CurrentChannelStructure;
-	}
-
-	return NULL;
-}
-
-Bluetooth_Channel_t* Bluetooth_InitChannelData(uint16_t RemoteChannelNumber, uint16_t PSM)
+/** Retrieves the channel information structure with the given local or remote channel number from the channel list.
+ *
+ *  \param[in] SearchValue  Value to search for in the channel structure list
+ *  \param[in] SearchKey    Key to search within the channel structure, a CHANNEL_SEARCH_* mask
+ *
+ *  \return Pointer to the matching channel information structure in the channel table if found, NULL otherwise
+ */
+Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue, const uint8_t SearchKey)
 {
-	Bluetooth_Channel_t* CurrentChannelStructure;
-
 	for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
 	{
-		CurrentChannelStructure = &Bluetooth_Connection.Channels[i];
+		Bluetooth_Channel_t* ChannelData = &Bluetooth_Connection.Channels[i];
 	
-		if (CurrentChannelStructure->State == Channel_Closed)
+		bool FoundMatch = false;
+		
+		switch (SearchKey)
 		{
-			CurrentChannelStructure->RemoteNumber = RemoteChannelNumber;
-			CurrentChannelStructure->LocalNumber  = (BLUETOOTH_CHANNELNUMBER_BASEOFFSET + i);
-			CurrentChannelStructure->PSM          = PSM;
-			CurrentChannelStructure->State        = Channel_Config;
-			
-			return CurrentChannelStructure;
-		}		
+			case CHANNEL_SEARCH_LOCALNUMBER:
+				FoundMatch = (SearchValue == ChannelData->LocalNumber);
+				break;
+			case CHANNEL_SEARCH_REMOTENUMBER:
+				FoundMatch = (SearchValue == ChannelData->RemoteNumber);
+				break;
+			case CHANNEL_SEARCH_PSM:
+				FoundMatch = (SearchValue == ChannelData->PSM);
+				break;
+		}
+	
+		if (FoundMatch)
+		  return ChannelData;
 	}
 
 	return NULL;