Split RFCOMM channel signals into Remote and Local pairs. Use memcpy() to copy over...

[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 1d18633..01fab78 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
@@ -88,7 +88,7 @@ static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeade
        } TestResponse;\r
 \r
        /* Fill out the Test response data */\r
-       TestResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_Test, .EA = true};\r
+       TestResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_Test, .EA = true, .CR = false};\r
        TestResponse.Length        = (CommandDataLen << 1) | 0x01;\r
        memcpy(TestResponse.TestData, Params, CommandDataLen);\r
        \r
@@ -130,11 +130,11 @@ static void RFCOMM_ProcessMSCommand(const RFCOMM_Command_t* const CommandHeader,
          return;\r
          \r
        /* Save the new channel signals to the channel state structure */\r
-       RFCOMMChannel->Signals = Params->Signals;\r
+       RFCOMMChannel->Remote.Signals = Params->Signals;\r
        \r
        /* If the command contains the optional break signals field, store the value */\r
        if (CommandDataLen == sizeof(RFCOMM_MS_Parameters_t))\r
-         RFCOMMChannel->BreakSignals = Params->BreakSignals;\r
+         RFCOMMChannel->Remote.BreakSignal = Params->BreakSignal;\r
          \r
        struct\r
        {\r
@@ -144,14 +144,15 @@ static void RFCOMM_ProcessMSCommand(const RFCOMM_Command_t* const CommandHeader,
        } MSResponse;\r
 \r
        /* Fill out the MS response data */\r
-       MSResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_ModemStatus, .EA = true};\r
-       MSResponse.Length        = (CommandDataLen << 1) | 0x01;\r
-       MSResponse.Params        = *Params;\r
+       MSResponse.CommandHeader  = (RFCOMM_Command_t){.Command = RFCOMM_Control_ModemStatus, .EA = true, .CR = false};\r
+       MSResponse.Length         = (CommandDataLen << 1) | 0x01;\r
+       memcpy(&MSResponse.Params, Params, sizeof(RFCOMM_MS_Parameters_t));\r
        \r
        BT_RFCOMM_DEBUG(1, ">> MS Response");\r
 \r
        /* Send the PDN response to acknowledge the command */\r
-       RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(MSResponse), &MSResponse, Channel);\r
+       RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH,\r
+                        (sizeof(MSResponse) - sizeof(MSResponse.Params) + CommandDataLen), &MSResponse, Channel);\r
 }\r
 \r
 static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r
@@ -190,10 +191,13 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
                        /* If the channel's DLCI is zero, the channel state entry is free */\r
                        if (!(RFCOMM_Channels[i].DLCI))\r
                        {\r
-                               RFCOMMChannel               = &RFCOMM_Channels[i];\r
-                               RFCOMMChannel->DLCI         = Params->DLCI;\r
-                               RFCOMMChannel->Signals      = 0;\r
-                               RFCOMMChannel->BreakSignals = 0;\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
                                break;\r
                        }\r
                }\r
@@ -207,9 +211,9 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
        }\r
        \r
        /* Save the new channel configuration */\r
-       RFCOMMChannel->State       = RFCOMM_Channel_Open;\r
-       RFCOMMChannel->Priority    = Params->Priority;\r
-       RFCOMMChannel->MTU         = Params->MaximumFrameSize;\r
+       RFCOMMChannel->State    = RFCOMM_Channel_Open;\r
+       RFCOMMChannel->Priority = Params->Priority;\r
+       RFCOMMChannel->MTU      = Params->MaximumFrameSize;\r
        \r
        struct\r
        {\r
@@ -219,9 +223,9 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
        } DPNResponse;\r
        \r
        /* Fill out the DPN response data */\r
-       DPNResponse.CommandHeader           = (RFCOMM_Command_t){.Command = RFCOMM_Control_DLCParameterNegotiation, .EA = true};\r
+       DPNResponse.CommandHeader           = (RFCOMM_Command_t){.Command = RFCOMM_Control_DLCParameterNegotiation, .EA = true, .CR = false};\r
        DPNResponse.Length                  = (sizeof(DPNResponse.Params) << 1) | 0x01;\r
-       DPNResponse.Params                  = *Params;\r
+       memcpy(&DPNResponse.Params, Params, sizeof(RFCOMM_DPN_Parameters_t));\r
        DPNResponse.Params.ConvergenceLayer = 0x00; // TODO: Enable credit based transaction support\r
        \r
        BT_RFCOMM_DEBUG(1, ">> DPN Response");\r