Fix incorrect macro guard in the UC3 EndpointStream header file.

[pub/USBasp.git] / 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 542a783..04d00c4 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in
   all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -28,6 +28,12 @@
   this software.
 */
 
+/** \file
+ *
+ *  Main module for the Bluetooth stack. This module contains the overall Bluetooth
+ *  stack state variables and the main Bluetooth stack management functions.
+ */
+
 #include "BluetoothStack.h"
 
 /** Bluetooth device connection information structure. Once connected to a remote device, this structure tracks the
@@ -49,7 +55,7 @@ Bluetooth_Stack_State_t Bluetooth_State     = { IsInitialized: false };
  */
 void Bluetooth_Stack_Init(void)
 {
-       /* Reset the HCI state machine - this will eventually reset the adapter and stack when the Bluetooth stack task is called */
+       /* Reset the HCI state machine - this will reset the adapter and stack when the Bluetooth stack task is called */
        Bluetooth_State.CurrentHCIState = Bluetooth_Init;
        Bluetooth_State.NextHCIState    = Bluetooth_Init;
 }
@@ -59,41 +65,10 @@ void Bluetooth_Stack_Init(void)
  */
 void Bluetooth_Stack_USBTask(void)
 {
+       if (USB_HostState != HOST_STATE_Configured)
+         return;
+
        Bluetooth_HCITask();
        Bluetooth_ACLTask();
 }
 
-/** 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)
-{
-       for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)
-       {
-               Bluetooth_Channel_t* ChannelData = &Bluetooth_Connection.Channels[i];
-       
-               bool FoundMatch = false;
-               
-               switch (SearchKey)
-               {
-                       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;
-}