Reduce prescaler of the flush timer in the USBtoSerial demo, so that buffer overruns...

[pub/lufa.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 2495bb4..c9bd07a 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
@@ -38,7 +38,7 @@
 #define  INCLUDE_FROM_RFCOMM_CONTROL_C\r
 #include "RFCOMMControl.h"\r
 \r
-void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const Channel)\r
+void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const ACLChannel)\r
 {\r
        const RFCOMM_Command_t* CommandHeader  = (const RFCOMM_Command_t*)Command;\r
        const uint8_t*          CommandData    = (const uint8_t*)Command + sizeof(RFCOMM_Command_t);\r
@@ -47,25 +47,25 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c
        switch (CommandHeader->Command)\r
        {\r
                case RFCOMM_Control_Test:\r
-                       RFCOMM_ProcessTestCommand(CommandHeader, CommandDataLen, CommandData, Channel);\r
+                       RFCOMM_ProcessTestCommand(CommandHeader, CommandDataLen, CommandData, ACLChannel);\r
                        break;\r
                case RFCOMM_Control_FlowControlEnable:\r
-                       RFCOMM_ProcessFCECommand(CommandHeader, CommandData, Channel);\r
+                       RFCOMM_ProcessFCECommand(CommandHeader, CommandData, ACLChannel);\r
                        break;\r
                case RFCOMM_Control_FlowControlDisable:\r
-                       RFCOMM_ProcessFCDCommand(CommandHeader, CommandData, Channel);\r
+                       RFCOMM_ProcessFCDCommand(CommandHeader, CommandData, ACLChannel);\r
                        break;\r
                case RFCOMM_Control_ModemStatus:\r
-                       RFCOMM_ProcessMSCCommand(CommandHeader, CommandDataLen, CommandData, Channel);\r
+                       RFCOMM_ProcessMSCCommand(CommandHeader, CommandDataLen, CommandData, ACLChannel);\r
                        break;\r
                case RFCOMM_Control_RemotePortNegotiation:\r
-                       RFCOMM_ProcessRPNCommand(CommandHeader, CommandData, Channel);\r
+                       RFCOMM_ProcessRPNCommand(CommandHeader, CommandData, ACLChannel);\r
                        break;\r
                case RFCOMM_Control_RemoteLineStatus:\r
-                       RFCOMM_ProcessRLSCommand(CommandHeader, CommandData, Channel);\r
+                       RFCOMM_ProcessRLSCommand(CommandHeader, CommandData, ACLChannel);\r
                        break;\r
                case RFCOMM_Control_DLCParameterNegotiation:\r
-                       RFCOMM_ProcessDPNCommand(CommandHeader, CommandData, Channel);\r
+                       RFCOMM_ProcessDPNCommand(CommandHeader, CommandData, ACLChannel);\r
                        break;\r
                default:\r
                        BT_RFCOMM_DEBUG(1, "<< Unknown Command");               \r
@@ -74,7 +74,7 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c
 }\r
 \r
 static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,\r
-                                      const uint8_t* CommandData, Bluetooth_Channel_t* const Channel)\r
+                                      const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel)\r
 {\r
        const uint8_t* Params = (const uint8_t*)CommandData;\r
 \r
@@ -95,23 +95,23 @@ static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeade
        BT_RFCOMM_DEBUG(1, ">> TEST Response");\r
 \r
        /* Send the PDN response to acknowledge the command */\r
-       RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(TestResponse), &TestResponse, Channel);\r
+       RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(TestResponse), &TestResponse, ACLChannel);\r
 }\r
 \r
 static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r
-                                                Bluetooth_Channel_t* const Channel)\r
+                                                Bluetooth_Channel_t* const ACLChannel)\r
 {\r
        BT_RFCOMM_DEBUG(1, "<< FCE Command");\r
 }\r
 \r
 static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r
-                                                Bluetooth_Channel_t* const Channel)\r
+                                                Bluetooth_Channel_t* const ACLChannel)\r
 {\r
        BT_RFCOMM_DEBUG(1, "<< FCD Command");\r
 }\r
 \r
 static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,\r
-                                     const uint8_t* CommandData, Bluetooth_Channel_t* const Channel)\r
+                                     const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel)\r
 {\r
        const RFCOMM_MSC_Parameters_t* Params = (const RFCOMM_MSC_Parameters_t*)CommandData;\r
 \r
@@ -139,6 +139,9 @@ static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader
                /* If the command contains the optional break signals field, store the value */\r
                if (CommandDataLen == sizeof(RFCOMM_MSC_Parameters_t))\r
                  RFCOMMChannel->Remote.BreakSignal = Params->BreakSignal;\r
+\r
+               /* Notify the user application that the signals have been received */\r
+               RFCOMM_ChannelSignalsReceived(RFCOMMChannel);\r
                  \r
                struct\r
                {\r
@@ -156,7 +159,7 @@ static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader
 \r
                /* Send the MSC response to acknowledge the command */\r
                RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH,\r
-                                                (sizeof(MSResponse) - sizeof(MSResponse.Params) + CommandDataLen), &MSResponse, Channel);\r
+                                                (sizeof(MSResponse) - sizeof(MSResponse.Params) + CommandDataLen), &MSResponse, ACLChannel);\r
        }\r
        else\r
        {\r
@@ -166,19 +169,19 @@ static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader
 }\r
 \r
 static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r
-                                                Bluetooth_Channel_t* const Channel)\r
+                                                Bluetooth_Channel_t* const ACLChannel)\r
 {\r
        BT_RFCOMM_DEBUG(1, "<< RPN Command");\r
 }\r
 \r
 static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r
-                                                Bluetooth_Channel_t* const Channel)\r
+                                                Bluetooth_Channel_t* const ACLChannel)\r
 {\r
        BT_RFCOMM_DEBUG(1, "<< RLS Command");\r
 }\r
 \r
 static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r
-                                                Bluetooth_Channel_t* const Channel)\r
+                                                Bluetooth_Channel_t* const ACLChannel)\r
 {\r
        const RFCOMM_DPN_Parameters_t* Params = (const RFCOMM_DPN_Parameters_t*)CommandData;\r
 \r
@@ -195,23 +198,8 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
        /* Check if the channel has no corresponding entry - remote did not open it first */\r
        if (RFCOMMChannel == NULL)\r
        {\r
-               /* Find a free entry in the RFCOMM channel multiplexer state array */\r
-               for (uint8_t i = 0; i < RFCOMM_MAX_OPEN_CHANNELS; i++)\r
-               {\r
-                       /* If the channel's state is closed, the channel state entry is free */\r
-                       if (RFCOMM_Channels[i].State == RFCOMM_Channel_Closed)\r
-                       {\r
-                               RFCOMMChannel                     = &RFCOMM_Channels[i];\r
-                               RFCOMMChannel->DLCI               = Params->DLCI;\r
-                               RFCOMMChannel->MTU                = 0xFFFF;\r
-                               RFCOMMChannel->Remote.Signals     = 0 | (1 << 0);\r
-                               RFCOMMChannel->Remote.BreakSignal = 0 | (1 << 0);\r
-                               RFCOMMChannel->Local.Signals      = RFCOMM_SIGNAL_RTC | RFCOMM_SIGNAL_RTR | RFCOMM_SIGNAL_DV | (1 << 0);\r
-                               RFCOMMChannel->Local.BreakSignal  = 0 | (1 << 0);\r
-                               RFCOMMChannel->ConfigFlags        = 0;\r
-                               break;\r
-                       }\r
-               }\r
+               /* Create a new entry in the channel table for the new channel */\r
+               RFCOMMChannel = RFCOMM_GetFreeChannelEntry(Params->DLCI);\r
                \r
                /* No free entry was found, discard the request */\r
                if (RFCOMMChannel == NULL)\r
@@ -242,5 +230,5 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
        BT_RFCOMM_DEBUG(1, ">> DPN Response");\r
 \r
        /* Send the DPN response to acknowledge the command */\r
-       RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(DPNResponse), &DPNResponse, Channel);\r
+       RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(DPNResponse), &DPNResponse, ACLChannel);\r
 }\r