X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3125fd5f4fe79b6acc89aea9f51b159db2dfd3ff..55d7e1e65bccd6b4c44802cf971f39eb05e6e57a:/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c?ds=inline

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
index 23a18765f..01fab788f 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
@@ -42,15 +42,12 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c
 {
 	const RFCOMM_Command_t* CommandHeader  = (const RFCOMM_Command_t*)Command;
 	const uint8_t*          CommandData    = (const uint8_t*)Command + sizeof(RFCOMM_Command_t);
-	uint16_t                ControlDataLen = RFCOMM_GetFrameDataLength(CommandData);
-
-	/* Adjust the command data pointer to skip over the variable size field */
-	CommandData += (ControlDataLen < 128) ? 1 : 2;
+	uint8_t                 CommandDataLen = RFCOMM_GetVariableFieldValue(&CommandData);
 
 	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);
@@ -59,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, CommandData, Channel);
+			RFCOMM_ProcessMSCommand(CommandHeader, CommandDataLen, CommandData, Channel);
 			break;
 		case RFCOMM_Control_RemotePortNegotiation:
 			RFCOMM_ProcessRPNCommand(CommandHeader, CommandData, Channel);
@@ -76,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,
@@ -94,10 +110,49 @@ 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* CommandData,
-			                        Bluetooth_Channel_t* const Channel)
+static void RFCOMM_ProcessMSCommand(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;
+
 	BT_RFCOMM_DEBUG(1, "<< MS Command");
+	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;
+	
+	/* Retrieve existing channel configuration data, if already opened */
+	RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData(Params->Channel.DLCI);	
+	
+	/* If the channel does not exist, abort */
+	if (RFCOMMChannel == NULL)
+	  return;
+	  
+	/* Save the new channel signals to the channel state structure */
+	RFCOMMChannel->Remote.Signals = Params->Signals;
+	
+	/* If the command contains the optional break signals field, store the value */
+	if (CommandDataLen == sizeof(RFCOMM_MS_Parameters_t))
+	  RFCOMMChannel->Remote.BreakSignal = Params->BreakSignal;
+	  
+	struct
+	{
+		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, .CR = false};
+	MSResponse.Length         = (CommandDataLen << 1) | 0x01;
+	memcpy(&MSResponse.Params, Params, sizeof(RFCOMM_MS_Parameters_t));
+	
+	BT_RFCOMM_DEBUG(1, ">> MS Response");
+
+	/* Send the PDN response to acknowledge the command */
+	RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH,
+	                 (sizeof(MSResponse) - sizeof(MSResponse.Params) + CommandDataLen), &MSResponse, Channel);
 }
 
 static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
@@ -118,7 +173,7 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
 	const RFCOMM_DPN_Parameters_t* Params = (const RFCOMM_DPN_Parameters_t*)CommandData;
 
 	BT_RFCOMM_DEBUG(1, "<< DPN Command");
-	BT_RFCOMM_DEBUG(2, "-- Config DLCI: 0x%02X", Params->DLCI);
+	BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->DLCI);
 	
 	/* Ignore parameter negotiations to the control channel */
 	if (Params->DLCI == RFCOMM_CONTROL_DLCI)
@@ -138,6 +193,11 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
 			{
 				RFCOMMChannel       = &RFCOMM_Channels[i];
 				RFCOMMChannel->DLCI = Params->DLCI;
+				RFCOMMChannel->MTU  = 0xFFFF;
+				RFCOMMChannel->Remote.Signals     = 0 | (1 << 0);
+				RFCOMMChannel->Remote.BreakSignal = 0 | (1 << 0);
+				RFCOMMChannel->Local.Signals      = RFCOMM_SIGNAL_RTC | RFCOMM_SIGNAL_RTR | RFCOMM_SIGNAL_DV | (1 << 0);
+				RFCOMMChannel->Local.BreakSignal  = 0 | (1 << 0);
 				break;
 			}
 		}
@@ -151,10 +211,9 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
 	}
 	
 	/* Save the new channel configuration */
-	RFCOMMChannel->State       = RFCOMM_Channel_Open;
-	RFCOMMChannel->Priority    = Params->Priority;
-	RFCOMMChannel->UseUIFrames = (Params->FrameType != 0);
-	RFCOMMChannel->RemoteMTU   = Params->MaximumFrameSize;
+	RFCOMMChannel->State    = RFCOMM_Channel_Open;
+	RFCOMMChannel->Priority = Params->Priority;
+	RFCOMMChannel->MTU      = Params->MaximumFrameSize;
 	
 	struct
 	{
@@ -164,10 +223,10 @@ static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader
 	} DPNResponse;
 	
 	/* Fill out the DPN response data */
-	DPNResponse.CommandHeader.Command = CommandHeader->Command;
-	DPNResponse.CommandHeader.EA      = true;
-	DPNResponse.Length                = (sizeof(DPNResponse.Params) << 1) | 0x01;
-	DPNResponse.Params                = *Params;
+	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");