X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/13ea700b35aa8ee9f89cf1cb06d41109d065bfcf..35b7946950e178c5ba51b87ef16e8a927239fda4:/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 3a6bf67c5..e5bce54d2 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c @@ -47,7 +47,7 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c switch (CommandHeader->Command) { case RFCOMM_Control_Test: - RFCOMM_ProcessTestCommand(CommandHeader, CommandData, Channel); + RFCOMM_ProcessTestCommand(CommandHeader, CommandDataLen, CommandData, Channel); break; case RFCOMM_Control_FlowControlEnable: RFCOMM_ProcessFCECommand(CommandHeader, CommandData, Channel); @@ -56,7 +56,7 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c RFCOMM_ProcessFCDCommand(CommandHeader, CommandData, Channel); break; case RFCOMM_Control_ModemStatus: - RFCOMM_ProcessMSCommand(CommandHeader, CommandDataLen, CommandData, Channel); + RFCOMM_ProcessMSCCommand(CommandHeader, CommandDataLen, CommandData, Channel); break; case RFCOMM_Control_RemotePortNegotiation: RFCOMM_ProcessRPNCommand(CommandHeader, CommandData, Channel); @@ -73,10 +73,29 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c } } -static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, - Bluetooth_Channel_t* const Channel) +static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen, + const uint8_t* CommandData, Bluetooth_Channel_t* const Channel) { + const uint8_t* Params = (const uint8_t*)CommandData; + BT_RFCOMM_DEBUG(1, "<< TEST Command"); + + struct + { + RFCOMM_Command_t CommandHeader; + uint8_t Length; + uint8_t TestData[CommandDataLen]; + } TestResponse; + + /* Fill out the Test response data */ + 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 */ + RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(TestResponse), &TestResponse, Channel); } static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, @@ -91,12 +110,12 @@ static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader BT_RFCOMM_DEBUG(1, "<< FCD Command"); } -static void RFCOMM_ProcessMSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen, - const uint8_t* CommandData, Bluetooth_Channel_t* const Channel) +static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen, + const uint8_t* CommandData, Bluetooth_Channel_t* const Channel) { - const RFCOMM_MS_Parameters_t* Params = (const RFCOMM_MS_Parameters_t*)CommandData; + const RFCOMM_MSC_Parameters_t* Params = (const RFCOMM_MSC_Parameters_t*)CommandData; - BT_RFCOMM_DEBUG(1, "<< MS Command"); + 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 */ @@ -109,30 +128,41 @@ static void RFCOMM_ProcessMSCommand(const RFCOMM_Command_t* const CommandHeader, /* If the channel does not exist, abort */ if (RFCOMMChannel == NULL) return; - - /* Save the new channel signals to the channel state structure */ - RFCOMMChannel->Signals = Params->Signals; - - /* If the command contains the optional break signals field, store the value */ - if (CommandDataLen == sizeof(RFCOMM_MS_Parameters_t)) - RFCOMMChannel->BreakSignals = Params->BreakSignals; - - struct + + /* Check if the MSC packet is a command or a response */ + if (CommandHeader->CR) { - RFCOMM_Command_t CommandHeader; - uint8_t Length; - RFCOMM_MS_Parameters_t Params; - } MSResponse; - - /* Fill out the MS response data */ - MSResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_ModemStatus, .EA = true}; - MSResponse.Length = (CommandDataLen << 1) | 0x01; - MSResponse.Params = *Params; - - BT_RFCOMM_DEBUG(1, ">> MS Response"); + /* Save the new channel signals to the channel state structure */ + RFCOMMChannel->Remote.Signals = Params->Signals; + 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; + + struct + { + RFCOMM_Command_t CommandHeader; + uint8_t Length; + RFCOMM_MSC_Parameters_t Params; + } MSResponse; - /* Send the PDN response to acknowledge the command */ - RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(MSResponse), &MSResponse, Channel); + /* Fill out the MS response data */ + MSResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_ModemStatus, .EA = true, .CR = false}; + MSResponse.Length = (CommandDataLen << 1) | 0x01; + memcpy(&MSResponse.Params, Params, sizeof(RFCOMM_MSC_Parameters_t)); + + BT_RFCOMM_DEBUG(1, ">> MSC Response"); + + /* Send the MSC response to acknowledge the command */ + RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, + (sizeof(MSResponse) - sizeof(MSResponse.Params) + CommandDataLen), &MSResponse, Channel); + } + else + { + /* 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, const uint8_t* CommandData, @@ -165,19 +195,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 */ if (RFCOMMChannel == NULL) { - /* Find a free entry in the RFCOMM channel multiplexer state array */ - for (uint8_t i = 0; i < RFCOMM_MAX_OPEN_CHANNELS; i++) - { - /* If the channel's DLCI is zero, the channel state entry is free */ - if (!(RFCOMM_Channels[i].DLCI)) - { - RFCOMMChannel = &RFCOMM_Channels[i]; - RFCOMMChannel->DLCI = Params->DLCI; - RFCOMMChannel->Signals = 0; - RFCOMMChannel->BreakSignals = 0; - break; - } - } + /* 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) @@ -188,9 +207,8 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader } /* Save the new channel configuration */ - RFCOMMChannel->State = RFCOMM_Channel_Open; + RFCOMMChannel->State = RFCOMM_Channel_Configure; RFCOMMChannel->Priority = Params->Priority; - RFCOMMChannel->UseUIFrames = (Params->FrameType != 0); RFCOMMChannel->MTU = Params->MaximumFrameSize; struct @@ -201,13 +219,13 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader } DPNResponse; /* Fill out the DPN response data */ - DPNResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_DLCParameterNegotiation, .EA = true}; + DPNResponse.CommandHeader = (RFCOMM_Command_t){.Command = RFCOMM_Control_DLCParameterNegotiation, .EA = true, .CR = false}; DPNResponse.Length = (sizeof(DPNResponse.Params) << 1) | 0x01; - DPNResponse.Params = *Params; + 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 PDN response to acknowledge the command */ + /* Send the DPN response to acknowledge the command */ RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(DPNResponse), &DPNResponse, Channel); }