Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Demos / Host / Incomplete / BluetoothHost / Lib / RFCOMMControl.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
index 5bd8845..7d5a461 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   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
   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
   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
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -69,7 +69,7 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command,
                        RFCOMM_ProcessDPNCommand(CommandHeader, CommandData, ACLChannel);
                        break;
                default:
                        RFCOMM_ProcessDPNCommand(CommandHeader, CommandData, ACLChannel);
                        break;
                default:

-                       BT_RFCOMM_DEBUG(1, "<< Unknown Command");               
+                       BT_RFCOMM_DEBUG(1, "<< Unknown Command");

                        break;
        }
 }
                        break;
        }
 }


@@ -82,7 +82,7 @@ static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeade
        const uint8_t* Params = (const uint8_t*)CommandData;
 
        BT_RFCOMM_DEBUG(1, "<< TEST Command");
        const uint8_t* Params = (const uint8_t*)CommandData;
 
        BT_RFCOMM_DEBUG(1, "<< TEST Command");

-       
+

        struct
        {
                RFCOMM_Command_t CommandHeader;
        struct
        {
                RFCOMM_Command_t CommandHeader;


@@ -94,7 +94,7 @@ static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeade
        TestResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_Test, .EA = true, .CR = false};
        TestResponse.Length        = (CommandDataLen << 1) | 0x01;
        memcpy(TestResponse.TestData, Params, CommandDataLen);
        TestResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_Test, .EA = true, .CR = false};
        TestResponse.Length        = (CommandDataLen << 1) | 0x01;
        memcpy(TestResponse.TestData, Params, CommandDataLen);

-       
+

        BT_RFCOMM_DEBUG(1, ">> TEST Response");
 
        /* Send the PDN response to acknowledge the command */
        BT_RFCOMM_DEBUG(1, ">> TEST Response");
 
        /* Send the PDN response to acknowledge the command */


@@ -124,14 +124,14 @@ static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader
 
        BT_RFCOMM_DEBUG(1, "<< MSC %s", (CommandHeader->CR) ? "Command" : "Response");
        BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->Channel.DLCI);
 
        BT_RFCOMM_DEBUG(1, "<< MSC %s", (CommandHeader->CR) ? "Command" : "Response");
        BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->Channel.DLCI);

-       
+

        /* Ignore status flags sent to the control channel */
        if (Params->Channel.DLCI == RFCOMM_CONTROL_DLCI)
          return;
        /* Ignore status flags sent to the control channel */
        if (Params->Channel.DLCI == RFCOMM_CONTROL_DLCI)
          return;

-       
+

        /* Retrieve existing channel configuration data, if already opened */
        /* Retrieve existing channel configuration data, if already opened */

-       RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData(Params->Channel.DLCI);  
-       
+       RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData(Params->Channel.DLCI);
+

        /* If the channel does not exist, abort */
        if (RFCOMMChannel == NULL)
          return;
        /* If the channel does not exist, abort */
        if (RFCOMMChannel == NULL)
          return;


@@ -140,16 +140,16 @@ static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader
        if (CommandHeader->CR)
        {
                /* Save the new channel signals to the channel state structure */
        if (CommandHeader->CR)
        {
                /* Save the new channel signals to the channel state structure */

-               RFCOMMChannel->Remote.Signals  = Params->Signals;       
+               RFCOMMChannel->Remote.Signals  = Params->Signals;

                RFCOMMChannel->ConfigFlags    |= RFCOMM_CONFIG_REMOTESIGNALS;
                RFCOMMChannel->ConfigFlags    |= RFCOMM_CONFIG_REMOTESIGNALS;

-               
+

                /* If the command contains the optional break signals field, store the value */
                if (CommandDataLen == sizeof(RFCOMM_MSC_Parameters_t))
                  RFCOMMChannel->Remote.BreakSignal = Params->BreakSignal;
 
                /* Notify the user application that the signals have been received */
                RFCOMM_ChannelSignalsReceived(RFCOMMChannel);
                /* If the command contains the optional break signals field, store the value */
                if (CommandDataLen == sizeof(RFCOMM_MSC_Parameters_t))
                  RFCOMMChannel->Remote.BreakSignal = Params->BreakSignal;
 
                /* Notify the user application that the signals have been received */
                RFCOMM_ChannelSignalsReceived(RFCOMMChannel);

-                 
+

                struct
                {
                        RFCOMM_Command_t        CommandHeader;
                struct
                {
                        RFCOMM_Command_t        CommandHeader;


@@ -172,7 +172,7 @@ static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader
        {
                /* Indicate that the remote device has acknowledged the sent signals */
                RFCOMMChannel->ConfigFlags |= RFCOMM_CONFIG_LOCALSIGNALS;
        {
                /* Indicate that the remote device has acknowledged the sent signals */
                RFCOMMChannel->ConfigFlags |= RFCOMM_CONFIG_LOCALSIGNALS;

-       }       
+       }

 }
 
 static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader,
 }
 
 static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader,


@@ -197,20 +197,20 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
 
        BT_RFCOMM_DEBUG(1, "<< DPN Command");
        BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->DLCI);
 
        BT_RFCOMM_DEBUG(1, "<< DPN Command");
        BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->DLCI);

-       
+

        /* Ignore parameter negotiations to the control channel */
        if (Params->DLCI == RFCOMM_CONTROL_DLCI)
          return;
        /* Ignore parameter negotiations to the control channel */
        if (Params->DLCI == RFCOMM_CONTROL_DLCI)
          return;

-       
+

        /* Retrieve existing channel configuration data, if already opened */
        RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData(Params->DLCI);
        /* Retrieve existing channel configuration data, if already opened */
        RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData(Params->DLCI);

-       
+

        /* Check if the channel has no corresponding entry - remote did not open it first */
        if (RFCOMMChannel == NULL)
        {
                /* Create a new entry in the channel table for the new channel */
                RFCOMMChannel = RFCOMM_GetFreeChannelEntry(Params->DLCI);
        /* Check if the channel has no corresponding entry - remote did not open it first */
        if (RFCOMMChannel == NULL)
        {
                /* Create a new entry in the channel table for the new channel */
                RFCOMMChannel = RFCOMM_GetFreeChannelEntry(Params->DLCI);

-               
+

                /* No free entry was found, discard the request */
                if (RFCOMMChannel == NULL)
                {
                /* No free entry was found, discard the request */
                if (RFCOMMChannel == NULL)
                {


@@ -218,27 +218,28 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
                        return;
                }
        }
                        return;
                }
        }

-       
+

        /* Save the new channel configuration */
        RFCOMMChannel->State       = RFCOMM_Channel_Configure;
        RFCOMMChannel->Priority    = Params->Priority;
        RFCOMMChannel->MTU         = Params->MaximumFrameSize;
        /* Save the new channel configuration */
        RFCOMMChannel->State       = RFCOMM_Channel_Configure;
        RFCOMMChannel->Priority    = Params->Priority;
        RFCOMMChannel->MTU         = Params->MaximumFrameSize;

-       
+

        struct
        {
                RFCOMM_Command_t        CommandHeader;
                uint8_t                 Length;
                RFCOMM_DPN_Parameters_t Params;
        } DPNResponse;
        struct
        {
                RFCOMM_Command_t        CommandHeader;
                uint8_t                 Length;
                RFCOMM_DPN_Parameters_t Params;
        } DPNResponse;

-       
+

        /* Fill out the DPN response data */
        DPNResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_DLCParameterNegotiation, .EA = true, .CR = false};
        DPNResponse.Length                  = (sizeof(DPNResponse.Params) << 1) | 0x01;
        memcpy(&DPNResponse.Params, Params, sizeof(RFCOMM_DPN_Parameters_t));
        DPNResponse.Params.ConvergenceLayer = 0x00; // TODO: Enable credit based transaction support
        /* Fill out the DPN response data */
        DPNResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_DLCParameterNegotiation, .EA = true, .CR = false};
        DPNResponse.Length                  = (sizeof(DPNResponse.Params) << 1) | 0x01;
        memcpy(&DPNResponse.Params, Params, sizeof(RFCOMM_DPN_Parameters_t));
        DPNResponse.Params.ConvergenceLayer = 0x00; // TODO: Enable credit based transaction support

-       
+

        BT_RFCOMM_DEBUG(1, ">> DPN Response");
 
        /* Send the DPN response to acknowledge the command */
        RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(DPNResponse), &DPNResponse, ACLChannel);
 }
        BT_RFCOMM_DEBUG(1, ">> DPN Response");
 
        /* Send the DPN response to acknowledge the command */
        RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(DPNResponse), &DPNResponse, ACLChannel);
 }

+