3 files changed, 423 insertions, 423 deletions
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
index c9bd07af3..0f829eab5 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c
@@ -1,234 +1,234 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
-  dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
-*/
-
-/*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this 
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *
- *  RFCOMM multiplexer control layer module. This module handles multiplexer
- *  channel commands to the control DLCI in the RFCOMM layer, to open, configure,
- *  test and close logical RFCOMM channels.
- */
-
-#define  INCLUDE_FROM_RFCOMM_CONTROL_C
-#include "RFCOMMControl.h"
-
-void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const ACLChannel)
-{
-	const RFCOMM_Command_t* CommandHeader  = (const RFCOMM_Command_t*)Command;
-	const uint8_t*          CommandData    = (const uint8_t*)Command + sizeof(RFCOMM_Command_t);
-	uint8_t                 CommandDataLen = RFCOMM_GetVariableFieldValue(&CommandData);
-
-	switch (CommandHeader->Command)
-	{
-		case RFCOMM_Control_Test:
-			RFCOMM_ProcessTestCommand(CommandHeader, CommandDataLen, CommandData, ACLChannel);
-			break;
-		case RFCOMM_Control_FlowControlEnable:
-			RFCOMM_ProcessFCECommand(CommandHeader, CommandData, ACLChannel);
-			break;
-		case RFCOMM_Control_FlowControlDisable:
-			RFCOMM_ProcessFCDCommand(CommandHeader, CommandData, ACLChannel);
-			break;
-		case RFCOMM_Control_ModemStatus:
-			RFCOMM_ProcessMSCCommand(CommandHeader, CommandDataLen, CommandData, ACLChannel);
-			break;
-		case RFCOMM_Control_RemotePortNegotiation:
-			RFCOMM_ProcessRPNCommand(CommandHeader, CommandData, ACLChannel);
-			break;
-		case RFCOMM_Control_RemoteLineStatus:
-			RFCOMM_ProcessRLSCommand(CommandHeader, CommandData, ACLChannel);
-			break;
-		case RFCOMM_Control_DLCParameterNegotiation:
-			RFCOMM_ProcessDPNCommand(CommandHeader, CommandData, ACLChannel);
-			break;
-		default:
-			BT_RFCOMM_DEBUG(1, "<< Unknown Command");		
-			break;
-	}
-}
-
-static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,
-                                      const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel)
-{
-	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, ACLChannel);
-}
-
-static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                         Bluetooth_Channel_t* const ACLChannel)
-{
-	BT_RFCOMM_DEBUG(1, "<< FCE Command");
-}
-
-static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                         Bluetooth_Channel_t* const ACLChannel)
-{
-	BT_RFCOMM_DEBUG(1, "<< FCD Command");
-}
-
-static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,
-                                     const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel)
-{
-	const RFCOMM_MSC_Parameters_t* Params = (const RFCOMM_MSC_Parameters_t*)CommandData;
-
-	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 */
-	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;
-
-	/* Check if the MSC packet is a command or a response */
-	if (CommandHeader->CR)
-	{
-		/* 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;
-
-		/* Notify the user application that the signals have been received */
-		RFCOMM_ChannelSignalsReceived(RFCOMMChannel);
-		  
-		struct
-		{
-			RFCOMM_Command_t        CommandHeader;
-			uint8_t                 Length;
-			RFCOMM_MSC_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_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, ACLChannel);
-	}
-	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,
-			                         Bluetooth_Channel_t* const ACLChannel)
-{
-	BT_RFCOMM_DEBUG(1, "<< RPN Command");
-}
-
-static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                         Bluetooth_Channel_t* const ACLChannel)
-{
-	BT_RFCOMM_DEBUG(1, "<< RLS Command");
-}
-
-static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                         Bluetooth_Channel_t* const ACLChannel)
-{
-	const RFCOMM_DPN_Parameters_t* Params = (const RFCOMM_DPN_Parameters_t*)CommandData;
-
-	BT_RFCOMM_DEBUG(1, "<< DPN Command");
-	BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->DLCI);
-	
-	/* Ignore parameter negotiations to the control channel */
-	if (Params->DLCI == RFCOMM_CONTROL_DLCI)
-	  return;
-	
-	/* Retrieve existing channel configuration data, if already opened */
-	RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData(Params->DLCI);
-	
-	/* Check if the channel has no corresponding entry - remote did not open it first */
-	if (RFCOMMChannel == NULL)
-	{
-		/* 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)
-		{
-			BT_RFCOMM_DEBUG(2, "-- No Free Channel");
-			return;
-		}
-	}
-	
-	/* Save the new channel configuration */
-	RFCOMMChannel->State       = RFCOMM_Channel_Configure;
-	RFCOMMChannel->Priority    = Params->Priority;
-	RFCOMMChannel->MTU         = Params->MaximumFrameSize;
-	
-	struct
-	{
-		RFCOMM_Command_t        CommandHeader;
-		uint8_t                 Length;
-		RFCOMM_DPN_Parameters_t Params;
-	} DPNResponse;
-	
-	/* Fill out the DPN response data */
-	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");
-
-	/* Send the DPN response to acknowledge the command */
-	RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(DPNResponse), &DPNResponse, ACLChannel);
-}
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  RFCOMM multiplexer control layer module. This module handles multiplexer
+ *  channel commands to the control DLCI in the RFCOMM layer, to open, configure,
+ *  test and close logical RFCOMM channels.
+ */
+
+#define  INCLUDE_FROM_RFCOMM_CONTROL_C
+#include "RFCOMMControl.h"
+
+void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const ACLChannel)
+{
+	const RFCOMM_Command_t* CommandHeader  = (const RFCOMM_Command_t*)Command;
+	const uint8_t*          CommandData    = (const uint8_t*)Command + sizeof(RFCOMM_Command_t);
+	uint8_t                 CommandDataLen = RFCOMM_GetVariableFieldValue(&CommandData);
+
+	switch (CommandHeader->Command)
+	{
+		case RFCOMM_Control_Test:
+			RFCOMM_ProcessTestCommand(CommandHeader, CommandDataLen, CommandData, ACLChannel);
+			break;
+		case RFCOMM_Control_FlowControlEnable:
+			RFCOMM_ProcessFCECommand(CommandHeader, CommandData, ACLChannel);
+			break;
+		case RFCOMM_Control_FlowControlDisable:
+			RFCOMM_ProcessFCDCommand(CommandHeader, CommandData, ACLChannel);
+			break;
+		case RFCOMM_Control_ModemStatus:
+			RFCOMM_ProcessMSCCommand(CommandHeader, CommandDataLen, CommandData, ACLChannel);
+			break;
+		case RFCOMM_Control_RemotePortNegotiation:
+			RFCOMM_ProcessRPNCommand(CommandHeader, CommandData, ACLChannel);
+			break;
+		case RFCOMM_Control_RemoteLineStatus:
+			RFCOMM_ProcessRLSCommand(CommandHeader, CommandData, ACLChannel);
+			break;
+		case RFCOMM_Control_DLCParameterNegotiation:
+			RFCOMM_ProcessDPNCommand(CommandHeader, CommandData, ACLChannel);
+			break;
+		default:
+			BT_RFCOMM_DEBUG(1, "<< Unknown Command");		
+			break;
+	}
+}
+
+static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,
+                                      const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel)
+{
+	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, ACLChannel);
+}
+
+static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                         Bluetooth_Channel_t* const ACLChannel)
+{
+	BT_RFCOMM_DEBUG(1, "<< FCE Command");
+}
+
+static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                         Bluetooth_Channel_t* const ACLChannel)
+{
+	BT_RFCOMM_DEBUG(1, "<< FCD Command");
+}
+
+static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,
+                                     const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel)
+{
+	const RFCOMM_MSC_Parameters_t* Params = (const RFCOMM_MSC_Parameters_t*)CommandData;
+
+	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 */
+	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;
+
+	/* Check if the MSC packet is a command or a response */
+	if (CommandHeader->CR)
+	{
+		/* 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;
+
+		/* Notify the user application that the signals have been received */
+		RFCOMM_ChannelSignalsReceived(RFCOMMChannel);
+		  
+		struct
+		{
+			RFCOMM_Command_t        CommandHeader;
+			uint8_t                 Length;
+			RFCOMM_MSC_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_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, ACLChannel);
+	}
+	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,
+			                         Bluetooth_Channel_t* const ACLChannel)
+{
+	BT_RFCOMM_DEBUG(1, "<< RPN Command");
+}
+
+static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                         Bluetooth_Channel_t* const ACLChannel)
+{
+	BT_RFCOMM_DEBUG(1, "<< RLS Command");
+}
+
+static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                         Bluetooth_Channel_t* const ACLChannel)
+{
+	const RFCOMM_DPN_Parameters_t* Params = (const RFCOMM_DPN_Parameters_t*)CommandData;
+
+	BT_RFCOMM_DEBUG(1, "<< DPN Command");
+	BT_RFCOMM_DEBUG(2, "-- DLCI: 0x%02X", Params->DLCI);
+	
+	/* Ignore parameter negotiations to the control channel */
+	if (Params->DLCI == RFCOMM_CONTROL_DLCI)
+	  return;
+	
+	/* Retrieve existing channel configuration data, if already opened */
+	RFCOMM_Channel_t* RFCOMMChannel = RFCOMM_GetChannelData(Params->DLCI);
+	
+	/* Check if the channel has no corresponding entry - remote did not open it first */
+	if (RFCOMMChannel == NULL)
+	{
+		/* 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)
+		{
+			BT_RFCOMM_DEBUG(2, "-- No Free Channel");
+			return;
+		}
+	}
+	
+	/* Save the new channel configuration */
+	RFCOMMChannel->State       = RFCOMM_Channel_Configure;
+	RFCOMMChannel->Priority    = Params->Priority;
+	RFCOMMChannel->MTU         = Params->MaximumFrameSize;
+	
+	struct
+	{
+		RFCOMM_Command_t        CommandHeader;
+		uint8_t                 Length;
+		RFCOMM_DPN_Parameters_t Params;
+	} DPNResponse;
+	
+	/* Fill out the DPN response data */
+	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");
+
+	/* Send the DPN response to acknowledge the command */
+	RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(DPNResponse), &DPNResponse, ACLChannel);
+}
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h
index 9b02f7b19..d47715f80 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h
@@ -1,137 +1,137 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
-  dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
-*/
-
-/*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this 
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *
- *  Header file for RFCOMMControl.c.
- */
-
-#ifndef _RFCOMM_CONTROL_H_
-#define _RFCOMM_CONTROL_H_
-
-	/* Includes: */
-		#include <avr/io.h>
-		#include <avr/pgmspace.h>
-		#include <string.h>
-		#include <stdbool.h>
-		#include <stdio.h>
-
-		#include <LUFA/Common/Common.h>
-		#include <LUFA/Drivers/Peripheral/SerialStream.h>
-
-		#include "BluetoothStack.h"
-		#include "RFCOMM.h"
-		
-	/* Macros: */
-		#define RFCOMM_SIGNAL_FC               (1 << 1)
-		#define RFCOMM_SIGNAL_RTC              (1 << 2)
-		#define RFCOMM_SIGNAL_RTR              (1 << 3)
-		#define RFCOMM_SIGNAL_IC               (1 << 6)
-		#define RFCOMM_SIGNAL_DV               (1 << 7)
-		
-		#define RFCOMM_CONFIG_REMOTESIGNALS    (1 << 0)
-		#define RFCOMM_CONFIG_LOCALSIGNALS     (1 << 1)
-		#define RFCOMM_CONFIG_LOCALSIGNALSSENT (1 << 2)
-		#define RFCOMM_CONFIG_ABMMODESET       (1 << 3)
-
-	/* Enums: */
-		enum RFCOMM_Control_Commands_t
-		{
-			RFCOMM_Control_Test                    = (0x20 >> 2),
-			RFCOMM_Control_FlowControlEnable       = (0xA0 >> 2),
-			RFCOMM_Control_FlowControlDisable      = (0x60 >> 2),
-			RFCOMM_Control_ModemStatus             = (0xE0 >> 2),
-			RFCOMM_Control_RemotePortNegotiation   = (0x90 >> 2),
-			RFCOMM_Control_RemoteLineStatus        = (0x50 >> 2),
-			RFCOMM_Control_DLCParameterNegotiation = (0x80 >> 2),
-			RFCOMM_Control_NonSupportedCommand     = (0x10 >> 2),
-		};
-	
-	/* Type Defines: */
-		typedef struct
-		{
-			unsigned char EA   : 1;
-			unsigned char CR   : 1;
-			unsigned char DLCI : 6;
-		} RFCOMM_Address_t;
-
-		typedef struct
-		{
-			RFCOMM_Address_t Address;
-			uint8_t          Control;
-		} RFCOMM_Header_t;
-
-		typedef struct
-		{
-			unsigned char EA      : 1;
-			unsigned char CR      : 1;
-			unsigned char Command : 6;
-		} RFCOMM_Command_t;
-		
-		typedef struct
-		{
-			uint8_t          DLCI;
-			unsigned char    FrameType        : 4;
-			unsigned char    ConvergenceLayer : 4;
-			uint8_t          Priority;
-			uint8_t          ACKTimerTicks;
-			uint16_t         MaximumFrameSize;
-			uint8_t          MaxRetransmissions;
-			uint8_t          RecoveryWindowSize;			
-		} RFCOMM_DPN_Parameters_t;
-		
-		typedef struct
-		{
-			RFCOMM_Address_t Channel;
-			uint8_t          Signals;
-			uint8_t          BreakSignal;
-		} RFCOMM_MSC_Parameters_t;
-
-	/* Function Prototypes: */
-		void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const Channel);
-
-		#if defined(INCLUDE_FROM_RFCOMM_CONTROL_C)
-			static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen, 
-			                                      const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel);
-			static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                                     Bluetooth_Channel_t* const ACLChannel);
-			static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                                     Bluetooth_Channel_t* const ACLChannel);
-			static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,
-			                                     const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel);
-			static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                                     Bluetooth_Channel_t* const ACLChannel);
-			static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                                     Bluetooth_Channel_t* const ACLChannel);
-			static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
-			                                     Bluetooth_Channel_t* const ACLChannel);
-		#endif
-		
-#endif
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Header file for RFCOMMControl.c.
+ */
+
+#ifndef _RFCOMM_CONTROL_H_
+#define _RFCOMM_CONTROL_H_
+
+	/* Includes: */
+		#include <avr/io.h>
+		#include <avr/pgmspace.h>
+		#include <string.h>
+		#include <stdbool.h>
+		#include <stdio.h>
+
+		#include <LUFA/Common/Common.h>
+		#include <LUFA/Drivers/Peripheral/SerialStream.h>
+
+		#include "BluetoothStack.h"
+		#include "RFCOMM.h"
+		
+	/* Macros: */
+		#define RFCOMM_SIGNAL_FC               (1 << 1)
+		#define RFCOMM_SIGNAL_RTC              (1 << 2)
+		#define RFCOMM_SIGNAL_RTR              (1 << 3)
+		#define RFCOMM_SIGNAL_IC               (1 << 6)
+		#define RFCOMM_SIGNAL_DV               (1 << 7)
+		
+		#define RFCOMM_CONFIG_REMOTESIGNALS    (1 << 0)
+		#define RFCOMM_CONFIG_LOCALSIGNALS     (1 << 1)
+		#define RFCOMM_CONFIG_LOCALSIGNALSSENT (1 << 2)
+		#define RFCOMM_CONFIG_ABMMODESET       (1 << 3)
+
+	/* Enums: */
+		enum RFCOMM_Control_Commands_t
+		{
+			RFCOMM_Control_Test                    = (0x20 >> 2),
+			RFCOMM_Control_FlowControlEnable       = (0xA0 >> 2),
+			RFCOMM_Control_FlowControlDisable      = (0x60 >> 2),
+			RFCOMM_Control_ModemStatus             = (0xE0 >> 2),
+			RFCOMM_Control_RemotePortNegotiation   = (0x90 >> 2),
+			RFCOMM_Control_RemoteLineStatus        = (0x50 >> 2),
+			RFCOMM_Control_DLCParameterNegotiation = (0x80 >> 2),
+			RFCOMM_Control_NonSupportedCommand     = (0x10 >> 2),
+		};
+	
+	/* Type Defines: */
+		typedef struct
+		{
+			unsigned char EA   : 1;
+			unsigned char CR   : 1;
+			unsigned char DLCI : 6;
+		} RFCOMM_Address_t;
+
+		typedef struct
+		{
+			RFCOMM_Address_t Address;
+			uint8_t          Control;
+		} RFCOMM_Header_t;
+
+		typedef struct
+		{
+			unsigned char EA      : 1;
+			unsigned char CR      : 1;
+			unsigned char Command : 6;
+		} RFCOMM_Command_t;
+		
+		typedef struct
+		{
+			uint8_t          DLCI;
+			unsigned char    FrameType        : 4;
+			unsigned char    ConvergenceLayer : 4;
+			uint8_t          Priority;
+			uint8_t          ACKTimerTicks;
+			uint16_t         MaximumFrameSize;
+			uint8_t          MaxRetransmissions;
+			uint8_t          RecoveryWindowSize;			
+		} RFCOMM_DPN_Parameters_t;
+		
+		typedef struct
+		{
+			RFCOMM_Address_t Channel;
+			uint8_t          Signals;
+			uint8_t          BreakSignal;
+		} RFCOMM_MSC_Parameters_t;
+
+	/* Function Prototypes: */
+		void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const Channel);
+
+		#if defined(INCLUDE_FROM_RFCOMM_CONTROL_C)
+			static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen, 
+			                                      const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel);
+			static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                                     Bluetooth_Channel_t* const ACLChannel);
+			static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                                     Bluetooth_Channel_t* const ACLChannel);
+			static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,
+			                                     const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel);
+			static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                                     Bluetooth_Channel_t* const ACLChannel);
+			static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                                     Bluetooth_Channel_t* const ACLChannel);
+			static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData,
+			                                     Bluetooth_Channel_t* const ACLChannel);
+		#endif
+		
+#endif
diff --git a/LUFA/Drivers/USB/LowLevel/Device.c b/LUFA/Drivers/USB/LowLevel/Device.c
index b21e6574d..5355ca27c 100644
--- a/LUFA/Drivers/USB/LowLevel/Device.c
+++ b/LUFA/Drivers/USB/LowLevel/Device.c
@@ -1,52 +1,52 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
-  dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
-*/
-
-/*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this 
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../HighLevel/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "Device.h"
-
-void USB_Device_SendRemoteWakeup(void)
-{
-	if (!(USB_Options & USB_OPT_MANUAL_PLL))
-	{
-		USB_PLL_On();
-		while (!(USB_PLL_IsReady()));
-	}
-
-	USB_CLK_Unfreeze();
-
-	UDCON |= (1 << RMWKUP);
-	while (!(UDCON & (1 << RMWKUP)));
-}
-
-#endif
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#define  __INCLUDE_FROM_USB_DRIVER
+#include "../HighLevel/USBMode.h"
+
+#if defined(USB_CAN_BE_DEVICE)
+
+#include "Device.h"
+
+void USB_Device_SendRemoteWakeup(void)
+{
+	if (!(USB_Options & USB_OPT_MANUAL_PLL))
+	{
+		USB_PLL_On();
+		while (!(USB_PLL_IsReady()));
+	}
+
+	USB_CLK_Unfreeze();
+
+	UDCON |= (1 << RMWKUP);
+	while (!(UDCON & (1 << RMWKUP)));
+}
+
+#endif