Make sure that long reads are aborted early if the connection times out while waiting...

[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 d990ba0..6b434ba 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
@@ -33,27 +33,25 @@
 /** Bluetooth device connection information structure. Once connected to a remote device, this structure tracks the\r
  *  connection state of the individual L2CAP channels.\r
  */\r
 /** Bluetooth device connection information structure. Once connected to a remote device, this structure tracks the\r
  *  connection state of the individual L2CAP channels.\r
  */\r

-Bluetooth_Connection_t Bluetooth_Connection = {IsConnected: false};\r
+Bluetooth_Connection_t Bluetooth_Connection = { IsConnected: false };\r

 \r
 \r

-/** Bluetooth configuration structure. This structure configures the bluetooth stack's user alterable settings. */\r
-Bluetooth_Device_t Bluetooth_DeviceConfiguration =\r
-       {\r
-               Class:   (DEVICE_CLASS_SERVICE_CAPTURING | DEVICE_CLASS_MAJOR_COMPUTER | DEVICE_CLASS_MINOR_COMPUTER_PALM),\r
-               PINCode: "0000",\r
-               Name:    "LUFA Bluetooth Demo"\r
-       };\r
+/** Bluetooth device state information structure. This structure contains details on the current Bluetooth stack\r
+ *  state.\r
+ */\r
+Bluetooth_Stack_State_t Bluetooth_State     = { IsInitialized: false };\r

 \r
 /** Bluetooth stack initialization function. This function must be called once to initialize the Bluetooth stack,\r
  *  ready for connection to remote devices.\r
  *\r
  *  \note This function only begins the initialization process; the stack is initialized as the main Bluetooth stack\r
 \r
 /** Bluetooth stack initialization function. This function must be called once to initialize the Bluetooth stack,\r
  *  ready for connection to remote devices.\r
  *\r
  *  \note This function only begins the initialization process; the stack is initialized as the main Bluetooth stack\r

- *        management task is repeatedly called. The initialization process ends when the \ref Bluetooth_HCIProcessingState\r
- *        global enters the Bluetooth_ProcessEvents state.\r
+ *        management task is repeatedly called. The initialization process ends when the IsInitialized element of the\r
+ *        \ref Bluetooth_State structure becomes true and the \ref Bluetooth_StackInitialized() callback fires.\r

  */\r
 void Bluetooth_Stack_Init(void)\r
 {\r
        /* Reset the HCI state machine - this will eventually reset the adapter and stack when the Bluetooth stack task is called */\r
  */\r
 void Bluetooth_Stack_Init(void)\r
 {\r
        /* Reset the HCI state machine - this will eventually reset the adapter and stack when the Bluetooth stack task is called */\r

-       Bluetooth_HCIProcessingState = Bluetooth_Init;\r
+       Bluetooth_State.CurrentHCIState = Bluetooth_Init;\r
+       Bluetooth_State.NextHCIState    = Bluetooth_Init;\r

 }\r
 \r
 /** Bluetooth stack management task. This task must be repeatedly called to maintain the Bluetooth stack and any connection\r
 }\r
 \r
 /** Bluetooth stack management task. This task must be repeatedly called to maintain the Bluetooth stack and any connection\r


@@ -67,22 +65,33 @@ void Bluetooth_Stack_USBTask(void)
 \r
 /** Retrieves the channel information structure with the given local or remote channel number from the channel list.\r
  *\r
 \r
 /** Retrieves the channel information structure with the given local or remote channel number from the channel list.\r
  *\r

- *  \param ChannelNumber          Channel number to search for in the channel list\r
- *  \param SearchByRemoteChannel  Indicated whether to search for a channel information structure by the given remote channel\r
- *                                or local channel number\r
+ *  \param[in] SearchValue  Value to search for in the channel structure list\r
+ *  \param[in] SearchKey    Key to search within the channel structure, a CHANNEL_SEARCH_* mask\r

  *\r
  *  \return Pointer to the matching channel information structure in the channel table if found, NULL otherwise\r
  */\r
  *\r
  *  \return Pointer to the matching channel information structure in the channel table if found, NULL otherwise\r
  */\r

-Bluetooth_Channel_t* Bluetooth_GetChannelData(uint16_t ChannelNumber, bool SearchByRemoteChannel)\r
+Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue, const uint8_t SearchKey)\r

 {\r
        for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)\r
        {\r
                Bluetooth_Channel_t* ChannelData = &Bluetooth_Connection.Channels[i];\r
        \r
 {\r
        for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)\r
        {\r
                Bluetooth_Channel_t* ChannelData = &Bluetooth_Connection.Channels[i];\r
        \r

-               /* Fetch the channel number that is to be matched against from the current channel information struct */\r
-               uint16_t SearchChannelNumber = (SearchByRemoteChannel) ? ChannelData->RemoteNumber : ChannelData->LocalNumber;\r
+               bool FoundMatch = false;\r
+               \r
+               switch (SearchKey)\r
+               {\r
+                       case CHANNEL_SEARCH_LOCALNUMBER:\r
+                               FoundMatch = (SearchValue == ChannelData->LocalNumber);\r
+                               break;\r
+                       case CHANNEL_SEARCH_REMOTENUMBER:\r
+                               FoundMatch = (SearchValue == ChannelData->RemoteNumber);\r
+                               break;\r
+                       case CHANNEL_SEARCH_PSM:\r
+                               FoundMatch = (SearchValue == ChannelData->PSM);\r
+                               break;\r
+               }\r

        \r
        \r

-               if (SearchChannelNumber == ChannelNumber)\r
+               if (FoundMatch)\r

                  return ChannelData;\r
        }\r
 \r
                  return ChannelData;\r
        }\r
 \r