Rename RFCOMM_GetFrameDataLength() to RFCOMM_GetVariableFieldValue() as it is multi...

[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 23a1876..3a6bf67 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
@@ -42,10 +42,7 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c
 {\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
 {\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

-       uint16_t                ControlDataLen = RFCOMM_GetFrameDataLength(CommandData);\r
-\r
-       /* Adjust the command data pointer to skip over the variable size field */\r
-       CommandData += (ControlDataLen < 128) ? 1 : 2;\r
+       uint8_t                 CommandDataLen = RFCOMM_GetVariableFieldValue(&CommandData);\r

 \r
        switch (CommandHeader->Command)\r
        {\r
 \r
        switch (CommandHeader->Command)\r
        {\r


@@ -59,7 +56,7 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c
                        RFCOMM_ProcessFCDCommand(CommandHeader, CommandData, Channel);\r
                        break;\r
                case RFCOMM_Control_ModemStatus:\r
                        RFCOMM_ProcessFCDCommand(CommandHeader, CommandData, Channel);\r
                        break;\r
                case RFCOMM_Control_ModemStatus:\r

-                       RFCOMM_ProcessMSCommand(CommandHeader, CommandData, Channel);\r
+                       RFCOMM_ProcessMSCommand(CommandHeader, CommandDataLen, CommandData, Channel);\r

                        break;\r
                case RFCOMM_Control_RemotePortNegotiation:\r
                        RFCOMM_ProcessRPNCommand(CommandHeader, CommandData, Channel);\r
                        break;\r
                case RFCOMM_Control_RemotePortNegotiation:\r
                        RFCOMM_ProcessRPNCommand(CommandHeader, CommandData, Channel);\r


@@ -94,10 +91,48 @@ static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader
        BT_RFCOMM_DEBUG(1, "<< FCD Command");\r
 }\r
 \r
        BT_RFCOMM_DEBUG(1, "<< FCD Command");\r
 }\r
 \r

-static void RFCOMM_ProcessMSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r
-                                               Bluetooth_Channel_t* const Channel)\r
+static void RFCOMM_ProcessMSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,\r
+                                    const uint8_t* CommandData, Bluetooth_Channel_t* const Channel)\r

 {\r
 {\r

+       const RFCOMM_MS_Parameters_t* Params = (const RFCOMM_MS_Parameters_t*)CommandData;\r
+\r

        BT_RFCOMM_DEBUG(1, "<< MS Command");\r
        BT_RFCOMM_DEBUG(1, "<< MS Command");\r

+       BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->Channel.DLCI);\r
+       \r
+       /* Ignore status flags sent to the control channel */\r
+       if (Params->Channel.DLCI == RFCOMM_CONTROL_DLCI)\r
+         return;\r
+       \r
+       /* Retrieve existing channel configuration data, if already opened */\r
+       RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData(Params->Channel.DLCI);  \r
+       \r
+       /* If the channel does not exist, abort */\r
+       if (RFCOMMChannel == NULL)\r
+         return;\r
+         \r
+       /* Save the new channel signals to the channel state structure */\r
+       RFCOMMChannel->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
+         \r
+       struct\r
+       {\r
+               RFCOMM_Command_t       CommandHeader;\r
+               uint8_t                Length;\r
+               RFCOMM_MS_Parameters_t Params;\r
+       } 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
+       \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

 }\r
 \r
 static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r
 }\r
 \r
 static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,\r


@@ -118,7 +153,7 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
        const RFCOMM_DPN_Parameters_t* Params = (const RFCOMM_DPN_Parameters_t*)CommandData;\r
 \r
        BT_RFCOMM_DEBUG(1, "<< DPN Command");\r
        const RFCOMM_DPN_Parameters_t* Params = (const RFCOMM_DPN_Parameters_t*)CommandData;\r
 \r
        BT_RFCOMM_DEBUG(1, "<< DPN Command");\r

-       BT_RFCOMM_DEBUG(2, "-- Config DLCI: 0x%02X", Params->DLCI);\r
+       BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->DLCI);\r

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


@@ -136,8 +171,10 @@ 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
                        /* 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               = &RFCOMM_Channels[i];\r
+                               RFCOMMChannel->DLCI         = Params->DLCI;\r
+                               RFCOMMChannel->Signals      = 0;\r
+                               RFCOMMChannel->BreakSignals = 0;\r

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


@@ -154,7 +191,7 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
        RFCOMMChannel->State       = RFCOMM_Channel_Open;\r
        RFCOMMChannel->Priority    = Params->Priority;\r
        RFCOMMChannel->UseUIFrames = (Params->FrameType != 0);\r
        RFCOMMChannel->State       = RFCOMM_Channel_Open;\r
        RFCOMMChannel->Priority    = Params->Priority;\r
        RFCOMMChannel->UseUIFrames = (Params->FrameType != 0);\r

-       RFCOMMChannel->RemoteMTU   = Params->MaximumFrameSize;\r
+       RFCOMMChannel->MTU         = Params->MaximumFrameSize;\r

        \r
        struct\r
        {\r
        \r
        struct\r
        {\r


@@ -164,10 +201,10 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
        } DPNResponse;\r
        \r
        /* Fill out the DPN response data */\r
        } DPNResponse;\r
        \r
        /* Fill out the DPN response data */\r

-       DPNResponse.CommandHeader.Command = CommandHeader->Command;\r
-       DPNResponse.CommandHeader.EA      = true;\r
-       DPNResponse.Length                = (sizeof(DPNResponse.Params) << 1) | 0x01;\r
-       DPNResponse.Params                = *Params;\r
+       DPNResponse.CommandHeader           = (RFCOMM_Command_t){.Command = RFCOMM_Control_DLCParameterNegotiation, .EA = true};\r
+       DPNResponse.Length                  = (sizeof(DPNResponse.Params) << 1) | 0x01;\r
+       DPNResponse.Params                  = *Params;\r
+       DPNResponse.Params.ConvergenceLayer = 0x00; // TODO: Enable credit based transaction support\r

        \r
        BT_RFCOMM_DEBUG(1, ">> DPN Response");\r
 \r
        \r
        BT_RFCOMM_DEBUG(1, ">> DPN Response");\r
 \r