Make bluetooth SDP code correctly unpack the search UUIDs and parameters.

[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 e265910..3d048a8 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
 \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -30,58 +30,60 @@
 \r
 #include "BluetoothStack.h"\r
 \r
 \r
 #include "BluetoothStack.h"\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
 \r
 Bluetooth_Connection_t Bluetooth_Connection = {IsConnected: false};\r
 \r

-Bluetooth_Device_t     Bluetooth_DeviceConfiguration ATTR_WEAK =\r
+/** Bluetooth configuration structure. This structure configures the bluetooth stack's user alterable settings. */\r
+Bluetooth_Device_t Bluetooth_DeviceConfiguration =\r

        {\r
        {\r

-               Class:   DEVICE_CLASS_MAJOR_MISC,\r
+               Class:   (DEVICE_CLASS_SERVICE_CAPTURING | DEVICE_CLASS_MAJOR_COMPUTER | DEVICE_CLASS_MINOR_COMPUTER_PALM),\r

                PINCode: "0000",\r
                PINCode: "0000",\r

-               Name:    "LUFA BT Device"\r
+               Name:    "LUFA Bluetooth Demo"\r

        };\r
 \r
        };\r
 \r

-void Bluetooth_Stack_Task(void)\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
+ */\r
+void Bluetooth_Stack_Init(void)\r

 {\r
 {\r

-       if (!(USB_IsConnected) || (USB_HostState != HOST_STATE_Ready))\r
-         Bluetooth_HCIProcessingState = Bluetooth_Init;\r
-               \r
-       Bluetooth_ProcessHCICommands();\r
-       Bluetooth_ProcessACLPackets();\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

 }\r
 \r
 }\r
 \r

-Bluetooth_Channel_t* Bluetooth_GetChannelData(uint16_t ChannelNumber, bool SearchBySource)\r
+/** Bluetooth stack management task. This task must be repeatedly called to maintain the Bluetooth stack and any connection\r
+ *  to remote Bluetooth devices, including both the HCI control layer and the ACL channel layer.\r
+ */\r
+void Bluetooth_Stack_USBTask(void)\r

 {\r
 {\r

-       Bluetooth_Channel_t* CurrentChannelStructure;\r
-\r
-       for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)\r
-       {\r
-               CurrentChannelStructure = &Bluetooth_Connection.Channels[i];\r
-       \r
-               uint16_t CurrentChannelNumber = ((SearchBySource) ? CurrentChannelStructure->RemoteNumber : CurrentChannelStructure->LocalNumber);\r
-       \r
-               if (CurrentChannelNumber == ChannelNumber)\r
-                 return CurrentChannelStructure;\r
-       }\r
-\r
-       return NULL;\r
+       Bluetooth_HCITask();\r
+       Bluetooth_ACLTask();\r

 }\r
 \r
 }\r
 \r

-Bluetooth_Channel_t* Bluetooth_InitChannelData(uint16_t RemoteChannelNumber, uint16_t PSM)\r
+/** Retrieves the channel information structure with the given local or remote channel number from the channel list.\r
+ *\r
+ *  \param[in] ChannelNumber          Channel number to search for in the channel list\r
+ *  \param[in] SearchByRemoteChannel  Indicated whether to search for a channel information structure by the given remote channel\r
+ *                                    or local channel number\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(const uint16_t ChannelNumber, const bool SearchByRemoteChannel)\r

 {\r
 {\r

-       Bluetooth_Channel_t* CurrentChannelStructure;\r
-\r

        for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)\r
        {\r
        for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)\r
        {\r

-               CurrentChannelStructure = &Bluetooth_Connection.Channels[i];\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

        \r
        \r

-               if (CurrentChannelStructure->State == Channel_Closed)\r
-               {\r
-                       CurrentChannelStructure->RemoteNumber = RemoteChannelNumber;\r
-                       CurrentChannelStructure->LocalNumber  = (BLUETOOTH_CHANNELNUMBER_BASEOFFSET + i);\r
-                       CurrentChannelStructure->PSM          = PSM;\r
-                       CurrentChannelStructure->State        = Channel_Config;\r
-                       \r
-                       return CurrentChannelStructure;\r
-               }               \r
+               if (SearchChannelNumber == ChannelNumber)\r
+                 return ChannelData;\r

        }\r
 \r
        return NULL;\r
        }\r
 \r
        return NULL;\r