X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/34e0fed4ca7e2804d4e0ed5f1d36e08dca659ba0..5ce3f0b17bc927513bd980e8710f588564fe1dcc:/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
index e69a27e4e..46cc182ec 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
@@ -69,77 +69,134 @@ void RFCOMM_Initialize(void)
 
 void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel)
 {
-	const RFCOMM_Header_t* FrameHeader = (const RFCOMM_Header_t*)Data;
+	const RFCOMM_Header_t* FrameHeader  = (const RFCOMM_Header_t*)Data;
+	const uint8_t*         FrameData    = (const uint8_t*)Data + sizeof(RFCOMM_Header_t);
+	uint16_t               FrameDataLen = RFCOMM_GetFrameDataLength(FrameData);
+
+	FrameData += (FrameDataLen < 128) ? 1 : 2;
 	
 	/* Decode the RFCOMM frame type from the header */
 	switch (FrameHeader->Control & ~FRAME_POLL_FINAL)
 	{
-		case RFCOMM_Frame_SABM:
-			RFCOMM_ProcessSABM(FrameHeader, Channel);
-			break;
-		case RFCOMM_Frame_UA:
-			RFCOMM_ProcessUA(FrameHeader, Channel);
-			break;
 		case RFCOMM_Frame_DM:
-			RFCOMM_ProcessDM(FrameHeader, Channel);
+			RFCOMM_ProcessDM(&FrameHeader->Address, Channel);
 			break;
 		case RFCOMM_Frame_DISC:
-			RFCOMM_ProcessDISC(FrameHeader, Channel);
+			RFCOMM_ProcessDISC(&FrameHeader->Address, Channel);
+			break;
+		case RFCOMM_Frame_SABM:
+			RFCOMM_ProcessSABM(&FrameHeader->Address, Channel);
+			break;
+		case RFCOMM_Frame_UA:
+			RFCOMM_ProcessUA(&FrameHeader->Address, Channel);
 			break;
 		case RFCOMM_Frame_UIH:
-			RFCOMM_ProcessUIH(FrameHeader, Channel);
+			RFCOMM_ProcessUIH(&FrameHeader->Address, FrameDataLen, FrameData, Channel);
 			break;
 		default:
-			BT_RFCOMM_DEBUG(1, "<< Unknown Frame Type");
+			BT_RFCOMM_DEBUG(1, "<< Unknown Frame Received");
 			break;
 	}
 }
 
-static void RFCOMM_ProcessSABM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)
+static void RFCOMM_ProcessDM(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const Channel)
 {
-	BT_RFCOMM_DEBUG(1, "<< SABM Received");
-	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameHeader->Address.DLCI);
-	
-	// TODO: Reset channel send/receive state here
-	
-	BT_RFCOMM_DEBUG(1, ">> UA Sent");
-	RFCOMM_SendFrame(FrameHeader->Address.DLCI, true, (RFCOMM_Frame_UA | FRAME_POLL_FINAL), 0, NULL, Channel);
+	BT_RFCOMM_DEBUG(1, "<< DM Received");
+	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI);
 }
 
-static void RFCOMM_ProcessUA(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)
+static void RFCOMM_ProcessDISC(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const Channel)
 {
-	const uint8_t* CurrBufferPos = ((const uint8_t*)FrameHeader + sizeof(RFCOMM_Header_t));
+	BT_RFCOMM_DEBUG(1, "<< DISC Received");
+	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI);
 
-	BT_RFCOMM_DEBUG(1, "<< UA Received");
-	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);
+	// TODO: Close down connection
+
+	BT_RFCOMM_DEBUG(1, ">> UA Sent");
+	RFCOMM_SendFrame(FrameAddress->DLCI, true, (RFCOMM_Frame_UA | FRAME_POLL_FINAL), 0, NULL, Channel);
 }
 
-static void RFCOMM_ProcessDM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)
+static void RFCOMM_ProcessSABM(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const Channel)
 {
-	const uint8_t* CurrBufferPos = ((const uint8_t*)FrameHeader + sizeof(RFCOMM_Header_t));
+	BT_RFCOMM_DEBUG(1, "<< SABM Received");
+	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI);
+	
+	// TODO: Reset channel send/receive state
+	
+	BT_RFCOMM_DEBUG(1, ">> UA Sent");
+	RFCOMM_SendFrame(FrameAddress->DLCI, true, (RFCOMM_Frame_UA | FRAME_POLL_FINAL), 0, NULL, Channel);
+}
 
-	BT_RFCOMM_DEBUG(1, "<< DM Received");
-	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);
+static void RFCOMM_ProcessUA(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const Channel)
+{
+	BT_RFCOMM_DEBUG(1, "<< UA Received");
+	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI);
 }
 
-static void RFCOMM_ProcessDISC(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)
+static void RFCOMM_ProcessUIH(const RFCOMM_Address_t* const FrameAddress, const uint16_t FrameLength, 
+                              const uint8_t* FrameData, Bluetooth_Channel_t* const Channel)
 {
-	const uint8_t* CurrBufferPos = ((const uint8_t*)FrameHeader + sizeof(RFCOMM_Header_t));
+	BT_RFCOMM_DEBUG(1, "<< UIH Received");
+	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI);
+	BT_RFCOMM_DEBUG(2, "-- Length 0x%02X", FrameLength);
+	
+	if (FrameAddress->DLCI == RFCOMM_CONTROL_DLCI)
+	{
+		RFCOMM_ProcessControlCommand((const RFCOMM_Command_t*)FrameData, Channel);
+		return;
+	}
 
-	BT_RFCOMM_DEBUG(1, "<< DISC Received");
-	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);
+	// TODO: Handle regular channel data here
 }
 
-static void RFCOMM_ProcessUIH(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)
+static void RFCOMM_ProcessControlCommand(const RFCOMM_Command_t* CommandHeader, Bluetooth_Channel_t* const Channel)
 {
-	const uint8_t* CurrBufferPos = ((const uint8_t*)FrameHeader + sizeof(RFCOMM_Header_t));
+	switch (CommandHeader->Command)
+	{
+		case RFCOMM_Control_Test:
+			BT_RFCOMM_DEBUG(1, "<< TEST Command");
+			break;
+		case RFCOMM_Control_FlowControlEnable:
+			BT_RFCOMM_DEBUG(1, "<< FCE Command");
+			break;
+		case RFCOMM_Control_FlowControlDisable:
+			BT_RFCOMM_DEBUG(1, "<< FCD Command");
+			break;
+		case RFCOMM_Control_ModemStatus:
+			BT_RFCOMM_DEBUG(1, "<< MS Command");
+			break;
+		case RFCOMM_Control_RemotePortNegotiation:
+			BT_RFCOMM_DEBUG(1, "<< RPN Command");
+			break;
+		case RFCOMM_Control_RemoteLineStatus:
+			BT_RFCOMM_DEBUG(1, "<< RLS Command");
+			break;
+		case RFCOMM_Control_DLCParameterNegotiation:
+			BT_RFCOMM_DEBUG(1, "<< DPN Command");
+			
+			struct
+			{
+				RFCOMM_Command_t Header;
+				RFCOMM_Command_t Command;
+			} Response =
+				{
+					.Header = (RFCOMM_Command_t)
+					{
+						.Command = RFCOMM_Control_NonSupportedCommand,
+						.CR      = true,
+						.EA      = true,
+					},
+					
+					.Command = *CommandHeader,
+				};
 
-	BT_RFCOMM_DEBUG(1, "<< UIH Received");
-	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);
+			RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(RFCOMM_Command_t), &Response, Channel);			
+			break;
+	}
 }
 
-static void RFCOMM_SendFrame(const uint8_t DLCI, const bool CommandResponse, const uint8_t Control, const uint16_t DataLen, const uint8_t* Data,
-                             Bluetooth_Channel_t* const Channel)
+static void RFCOMM_SendFrame(const uint8_t DLCI, const bool CommandResponse, const uint8_t Control, const uint16_t DataLen,
+                             const void* Data, Bluetooth_Channel_t* const Channel)
 {
 	struct
 	{
@@ -170,38 +227,38 @@ static void RFCOMM_SendFrame(const uint8_t DLCI, const bool CommandResponse, con
 	/* Copy over the packet data from the source buffer to the response packet buffer */
 	memcpy(ResponsePacket.Data, Data, DataLen);
 	
+	/* Determine the length of the frame which is to be used to calculate the CRC value */
+	uint8_t CRCLength = sizeof(ResponsePacket.FrameHeader);
+
+	if ((Control & ~FRAME_POLL_FINAL) != RFCOMM_Frame_UIH)
+	  CRCLength += sizeof(ResponsePacket.Size);
+	
 	/* Calculate the frame checksum from the appropriate fields */
-	if ((Control & ~FRAME_POLL_FINAL) == RFCOMM_Frame_UIH)
-	  ResponsePacket.FCS = RFCOMM_GetFCSValue(&ResponsePacket, sizeof(ResponsePacket.FrameHeader));
-	else
-	  ResponsePacket.FCS = RFCOMM_GetFCSValue(&ResponsePacket, sizeof(ResponsePacket.FrameHeader) + sizeof(ResponsePacket.Size));
+	ResponsePacket.FCS = RFCOMM_GetFCSValue(&ResponsePacket, CRCLength);
 
 	/* Send the completed response packet to the sender */
 	Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), Channel);
 }
 
-static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, uint16_t Length)
+static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, uint8_t Length)
 {
 	const uint8_t* CurrPos = FrameStart;
 	uint8_t        FCS     = 0xFF;
 	
-	while (Length--)
-	{
-		FCS = pgm_read_byte(&CRC8_Table[FCS ^ *CurrPos]);
-		CurrPos++;
-	}
+	for (uint8_t i = 0; i < Length; i++)
+	  FCS = pgm_read_byte(&CRC8_Table[FCS ^ *(CurrPos++)]);
 
-	return (0xFF - FCS);
+	return ~FCS;
 }
 
-static uint16_t RFCOMM_GetFrameDataLength(const uint8_t** BufferPos)
+static uint16_t RFCOMM_GetFrameDataLength(const uint8_t* const BufferPos)
 {
-	uint8_t FirstOctet  = *((*BufferPos)++);
+	uint8_t FirstOctet  = BufferPos[0];
 	uint8_t SecondOctet = 0;
 	
 	if (!(FirstOctet & 0x01))
-	  SecondOctet = *((*BufferPos)++);
+	  SecondOctet = BufferPos[1];
 	
-	return (((uint16_t)SecondOctet << 7) | (FirstOctet >> 1));
+	return (((uint16_t)SecondOctet << 7) | FirstOctet >> 1);
 }