Add the svn:eol-style property onto new files which where missing it to ensure uniform line endings.

6 files changed, 817 insertions, 817 deletions

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
index 510160629..a57f3a44d 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c
@@ -1,183 +1,183 @@
-/*

-             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 layer module. This module manages the RFCOMM layer of the

- *  stack, providing virtual serial port channels on top of the lower

- *  L2CAP layer.

- */

-

-#define  INCLUDE_FROM_RFCOMM_C

-#include "RFCOMM.h"

-

-/** 8-Bit CRC table used by the FCS field of each RFCOMM encoded frame, sourced from the ETSI TS 101 369 V7.2.0

- *  specification document, upon which the RFCOMM specification is based.

- */

-const uint8_t CRC8_Table[256] PROGMEM =

-	{

-		0x00, 0x91, 0xE3, 0x72, 0x07, 0x96, 0xE4, 0x75, 0x0E, 0x9F, 0xED, 0x7C, 0x09, 0x98, 0xEA, 0x7B,

-		0x1C, 0x8D, 0xFF, 0x6E, 0x1B, 0x8A, 0xF8, 0x69, 0x12, 0x83, 0xF1, 0x60, 0x15, 0x84, 0xF6, 0x67,

-		0x38, 0xA9, 0xDB, 0x4A, 0x3F, 0xAE, 0xDC, 0x4D, 0x36, 0xA7, 0xD5, 0x44, 0x31, 0xA0, 0xD2, 0x43,

-		0x24, 0xB5, 0xC7, 0x56, 0x23, 0xB2, 0xC0, 0x51, 0x2A, 0xBB, 0xC9, 0x58, 0x2D, 0xBC, 0xCE, 0x5F,

-		0x70, 0xE1, 0x93, 0x02, 0x77, 0xE6, 0x94, 0x05, 0x7E, 0xEF, 0x9D, 0x0C, 0x79, 0xE8, 0x9A, 0x0B,

-		0x6C, 0xFD, 0x8F, 0x1E, 0x6B, 0xFA, 0x88, 0x19, 0x62, 0xF3, 0x81, 0x10, 0x65, 0xF4, 0x86, 0x17,

-		0x48, 0xD9, 0xAB, 0x3A, 0x4F, 0xDE, 0xAC, 0x3D, 0x46, 0xD7, 0xA5, 0x34, 0x41, 0xD0, 0xA2, 0x33,

-		0x54, 0xC5, 0xB7, 0x26, 0x53, 0xC2, 0xB0, 0x21, 0x5A, 0xCB, 0xB9, 0x28, 0x5D, 0xCC, 0xBE, 0x2F,

-		0xE0, 0x71, 0x03, 0x92, 0xE7, 0x76, 0x04, 0x95, 0xEE, 0x7F, 0x0D, 0x9C, 0xE9, 0x78, 0x0A, 0x9B,

-		0xFC, 0x6D, 0x1F, 0x8E, 0xFB, 0x6A, 0x18, 0x89, 0xF2, 0x63, 0x11, 0x80, 0xF5, 0x64, 0x16, 0x87,

-		0xD8, 0x49, 0x3B, 0xAA, 0xDF, 0x4E, 0x3C, 0xAD, 0xD6, 0x47, 0x35, 0xA4, 0xD1, 0x40, 0x32, 0xA3,

-		0xC4, 0x55, 0x27, 0xB6, 0xC3, 0x52, 0x20, 0xB1, 0xCA, 0x5B, 0x29, 0xB8, 0xCD, 0x5C, 0x2E, 0xBF,

-		0x90, 0x01, 0x73, 0xE2, 0x97, 0x06, 0x74, 0xE5, 0x9E, 0x0F, 0x7D, 0xEC, 0x99, 0x08, 0x7A, 0xEB,

-		0x8C, 0x1D, 0x6F, 0xFE, 0x8B, 0x1A, 0x68, 0xF9, 0x82, 0x13, 0x61, 0xF0, 0x85, 0x14, 0x66, 0xF7,

-		0xA8, 0x39, 0x4B, 0xDA, 0xAF, 0x3E, 0x4C, 0xDD, 0xA6, 0x37, 0x45, 0xD4, 0xA1, 0x30, 0x42, 0xD3,

-		0xB4, 0x25, 0x57, 0xC6, 0xB3, 0x22, 0x50, 0xC1, 0xBA, 0x2B, 0x59, 0xC8, 0xBD, 0x2C, 0x5E, 0xCF

-	};

-

-/** Initializes the RFCOMM service, ready for new connections from a SDP client. */

-void RFCOMM_Initialize(void)

-{

-	/* Not currently used */

-}

-

-void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel)

-{

-	const RFCOMM_Header_t* FrameHeader = (const RFCOMM_Header_t*)Data;

-	

-	/* 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);

-			break;

-		case RFCOMM_Frame_DISC:

-			RFCOMM_ProcessDISC(FrameHeader, Channel);

-			break;

-		case RFCOMM_Frame_UIH:

-			RFCOMM_ProcessUIH(FrameHeader, Channel);

-			break;

-		default:

-			BT_RFCOMM_DEBUG(1, "<< Unknown Frame Type");

-			break;

-	}

-}

-

-static void RFCOMM_ProcessSABM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)

-{

-	BT_RFCOMM_DEBUG(1, "<< SABM Received");

-	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);

-	

-	// TODO: Reset channel send/receive state here

-	

-	struct

-	{

-		RFCOMM_Header_t FrameHeader;

-		uint8_t         FrameLength;

-		uint8_t         FCS;

-	} ResponsePacket;

-	

-	/* Copy over the same frame header as the sent packet to copy the logical RFCOMM channel address */

-	ResponsePacket.FrameHeader.Address              = FrameHeader->Address;

-	

-	/* Set the frame type to an Unnumbered Acknowledgement to acknowledge the SABM request */

-	ResponsePacket.FrameHeader.Control = RFCOMM_Frame_UA;

-	

-	/* Set the length to 0 (LSB indicates end of 8-bit length field) */

-	ResponsePacket.FrameLength = 0x01;

-	

-	/* Calculate the frame checksum from all fields except the FCS field itself */

-	ResponsePacket.FCS = RFCOMM_GetFCSValue(&ResponsePacket, sizeof(ResponsePacket) - sizeof(ResponsePacket.FCS));

-	

-	BT_RFCOMM_DEBUG(1, ">> UA Sent");

-

-	/* Send the completed response packet to the sender */

-	Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), Channel);

-}

-

-static void RFCOMM_ProcessUA(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)

-{

-	const uint8_t* CurrBufferPos = ((const uint8_t*)FrameHeader + sizeof(RFCOMM_Header_t));

-

-	BT_RFCOMM_DEBUG(1, "<< UA Received");

-	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);

-}

-

-static void RFCOMM_ProcessDM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)

-{

-	const uint8_t* CurrBufferPos = ((const uint8_t*)FrameHeader + sizeof(RFCOMM_Header_t));

-

-	BT_RFCOMM_DEBUG(1, "<< DM Received");

-	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);

-}

-

-static void RFCOMM_ProcessDISC(const RFCOMM_Header_t* const FrameHeader, 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, "-- Address 0x%02X", FrameHeader->Address);

-}

-

-static void RFCOMM_ProcessUIH(const RFCOMM_Header_t* const FrameHeader, 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, "-- Address 0x%02X", FrameHeader->Address);

-}

-

-static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, uint16_t Length)

-{

-	const uint8_t* CurrPos = FrameStart;

-	uint8_t        FCS     = 0xFF;

-	

-	while (Length--)

-	  FCS = pgm_read_byte(CRC8_Table[FCS ^ *(CurrPos++)]);

-

-	return ~FCS;

-}

-

-static uint16_t RFCOMM_GetFrameDataLength(const uint8_t** BufferPos)

-{

-	uint8_t FirstOctet  = *((*BufferPos)++);

-	uint8_t SecondOctet = 0;

-	

-	if (!(FirstOctet & 0x01))

-	  SecondOctet = *((*BufferPos)++);

-	

-	return (((uint16_t)SecondOctet << 7) | (FirstOctet >> 1));

-}

-

+/*
+             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 layer module. This module manages the RFCOMM layer of the
+ *  stack, providing virtual serial port channels on top of the lower
+ *  L2CAP layer.
+ */
+
+#define  INCLUDE_FROM_RFCOMM_C
+#include "RFCOMM.h"
+
+/** 8-Bit CRC table used by the FCS field of each RFCOMM encoded frame, sourced from the ETSI TS 101 369 V7.2.0
+ *  specification document, upon which the RFCOMM specification is based.
+ */
+const uint8_t CRC8_Table[256] PROGMEM =
+	{
+		0x00, 0x91, 0xE3, 0x72, 0x07, 0x96, 0xE4, 0x75, 0x0E, 0x9F, 0xED, 0x7C, 0x09, 0x98, 0xEA, 0x7B,
+		0x1C, 0x8D, 0xFF, 0x6E, 0x1B, 0x8A, 0xF8, 0x69, 0x12, 0x83, 0xF1, 0x60, 0x15, 0x84, 0xF6, 0x67,
+		0x38, 0xA9, 0xDB, 0x4A, 0x3F, 0xAE, 0xDC, 0x4D, 0x36, 0xA7, 0xD5, 0x44, 0x31, 0xA0, 0xD2, 0x43,
+		0x24, 0xB5, 0xC7, 0x56, 0x23, 0xB2, 0xC0, 0x51, 0x2A, 0xBB, 0xC9, 0x58, 0x2D, 0xBC, 0xCE, 0x5F,
+		0x70, 0xE1, 0x93, 0x02, 0x77, 0xE6, 0x94, 0x05, 0x7E, 0xEF, 0x9D, 0x0C, 0x79, 0xE8, 0x9A, 0x0B,
+		0x6C, 0xFD, 0x8F, 0x1E, 0x6B, 0xFA, 0x88, 0x19, 0x62, 0xF3, 0x81, 0x10, 0x65, 0xF4, 0x86, 0x17,
+		0x48, 0xD9, 0xAB, 0x3A, 0x4F, 0xDE, 0xAC, 0x3D, 0x46, 0xD7, 0xA5, 0x34, 0x41, 0xD0, 0xA2, 0x33,
+		0x54, 0xC5, 0xB7, 0x26, 0x53, 0xC2, 0xB0, 0x21, 0x5A, 0xCB, 0xB9, 0x28, 0x5D, 0xCC, 0xBE, 0x2F,
+		0xE0, 0x71, 0x03, 0x92, 0xE7, 0x76, 0x04, 0x95, 0xEE, 0x7F, 0x0D, 0x9C, 0xE9, 0x78, 0x0A, 0x9B,
+		0xFC, 0x6D, 0x1F, 0x8E, 0xFB, 0x6A, 0x18, 0x89, 0xF2, 0x63, 0x11, 0x80, 0xF5, 0x64, 0x16, 0x87,
+		0xD8, 0x49, 0x3B, 0xAA, 0xDF, 0x4E, 0x3C, 0xAD, 0xD6, 0x47, 0x35, 0xA4, 0xD1, 0x40, 0x32, 0xA3,
+		0xC4, 0x55, 0x27, 0xB6, 0xC3, 0x52, 0x20, 0xB1, 0xCA, 0x5B, 0x29, 0xB8, 0xCD, 0x5C, 0x2E, 0xBF,
+		0x90, 0x01, 0x73, 0xE2, 0x97, 0x06, 0x74, 0xE5, 0x9E, 0x0F, 0x7D, 0xEC, 0x99, 0x08, 0x7A, 0xEB,
+		0x8C, 0x1D, 0x6F, 0xFE, 0x8B, 0x1A, 0x68, 0xF9, 0x82, 0x13, 0x61, 0xF0, 0x85, 0x14, 0x66, 0xF7,
+		0xA8, 0x39, 0x4B, 0xDA, 0xAF, 0x3E, 0x4C, 0xDD, 0xA6, 0x37, 0x45, 0xD4, 0xA1, 0x30, 0x42, 0xD3,
+		0xB4, 0x25, 0x57, 0xC6, 0xB3, 0x22, 0x50, 0xC1, 0xBA, 0x2B, 0x59, 0xC8, 0xBD, 0x2C, 0x5E, 0xCF
+	};
+
+/** Initializes the RFCOMM service, ready for new connections from a SDP client. */
+void RFCOMM_Initialize(void)
+{
+	/* Not currently used */
+}
+
+void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel)
+{
+	const RFCOMM_Header_t* FrameHeader = (const RFCOMM_Header_t*)Data;
+	
+	/* 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);
+			break;
+		case RFCOMM_Frame_DISC:
+			RFCOMM_ProcessDISC(FrameHeader, Channel);
+			break;
+		case RFCOMM_Frame_UIH:
+			RFCOMM_ProcessUIH(FrameHeader, Channel);
+			break;
+		default:
+			BT_RFCOMM_DEBUG(1, "<< Unknown Frame Type");
+			break;
+	}
+}
+
+static void RFCOMM_ProcessSABM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)
+{
+	BT_RFCOMM_DEBUG(1, "<< SABM Received");
+	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);
+	
+	// TODO: Reset channel send/receive state here
+	
+	struct
+	{
+		RFCOMM_Header_t FrameHeader;
+		uint8_t         FrameLength;
+		uint8_t         FCS;
+	} ResponsePacket;
+	
+	/* Copy over the same frame header as the sent packet to copy the logical RFCOMM channel address */
+	ResponsePacket.FrameHeader.Address              = FrameHeader->Address;
+	
+	/* Set the frame type to an Unnumbered Acknowledgement to acknowledge the SABM request */
+	ResponsePacket.FrameHeader.Control = RFCOMM_Frame_UA;
+	
+	/* Set the length to 0 (LSB indicates end of 8-bit length field) */
+	ResponsePacket.FrameLength = 0x01;
+	
+	/* Calculate the frame checksum from all fields except the FCS field itself */
+	ResponsePacket.FCS = RFCOMM_GetFCSValue(&ResponsePacket, sizeof(ResponsePacket) - sizeof(ResponsePacket.FCS));
+	
+	BT_RFCOMM_DEBUG(1, ">> UA Sent");
+
+	/* Send the completed response packet to the sender */
+	Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), Channel);
+}
+
+static void RFCOMM_ProcessUA(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)
+{
+	const uint8_t* CurrBufferPos = ((const uint8_t*)FrameHeader + sizeof(RFCOMM_Header_t));
+
+	BT_RFCOMM_DEBUG(1, "<< UA Received");
+	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);
+}
+
+static void RFCOMM_ProcessDM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel)
+{
+	const uint8_t* CurrBufferPos = ((const uint8_t*)FrameHeader + sizeof(RFCOMM_Header_t));
+
+	BT_RFCOMM_DEBUG(1, "<< DM Received");
+	BT_RFCOMM_DEBUG(2, "-- Address 0x%02X", FrameHeader->Address);
+}
+
+static void RFCOMM_ProcessDISC(const RFCOMM_Header_t* const FrameHeader, 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, "-- Address 0x%02X", FrameHeader->Address);
+}
+
+static void RFCOMM_ProcessUIH(const RFCOMM_Header_t* const FrameHeader, 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, "-- Address 0x%02X", FrameHeader->Address);
+}
+
+static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, uint16_t Length)
+{
+	const uint8_t* CurrPos = FrameStart;
+	uint8_t        FCS     = 0xFF;
+	
+	while (Length--)
+	  FCS = pgm_read_byte(CRC8_Table[FCS ^ *(CurrPos++)]);
+
+	return ~FCS;
+}
+
+static uint16_t RFCOMM_GetFrameDataLength(const uint8_t** BufferPos)
+{
+	uint8_t FirstOctet  = *((*BufferPos)++);
+	uint8_t SecondOctet = 0;
+	
+	if (!(FirstOctet & 0x01))
+	  SecondOctet = *((*BufferPos)++);
+	
+	return (((uint16_t)SecondOctet << 7) | (FirstOctet >> 1));
+}
+
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h
index 194551d03..cd5375e91 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h
@@ -1,96 +1,96 @@
-/*

-             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 RFCOMM.c.

- */

-

-#ifndef _RFCOMM_H_

-#define _RFCOMM_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"

-		

-	/* Macros: */

-		#define BT_RFCOMM_DEBUG(l, s, ...)              do { if (RFCOMM_DEBUG_LEVEL >= l) printf_P(PSTR("(RFCOMM) " s "\r\n"), ##__VA_ARGS__); } while (0)

-		#define RFCOMM_DEBUG_LEVEL                      2

-		

-		#define FRAME_POLL_FINAL                        (1 << 4)

-	

-	/* Enums: */

-		/** Enum for the types of RFCOMM frames which can be exchanged on a Bluetooth channel. */

-		enum RFCOMM_Frame_Types_t

-		{

-			RFCOMM_Frame_SABM  = 0x2F, /**< Set Asynchronous Balance Mode Field */

-			RFCOMM_Frame_UA    = 0x63, /**< Unnumbered Acknowledgement Field */

-			RFCOMM_Frame_DM    = 0x0F, /**< Disconnected Mode Field */

-			RFCOMM_Frame_DISC  = 0x43, /**< Disconnect Field */

-			RFCOMM_Frame_UIH   = 0xEF, /**< Unnumbered Information with Header check Field */

-		};

-	

-	/* Type Defines: */

-		typedef struct

-		{

-			struct

-			{

-				unsigned char LogicalChannel   : 6;

-				unsigned char PollResponse     : 1;

-				unsigned char LastAddressOctet : 1;

-			} Address;

-			

-			uint8_t Control;

-		} RFCOMM_Header_t;

-

-	/* Function Prototypes: */

-		void RFCOMM_Initialize(void);

-		void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel);

-		

-		#if defined(INCLUDE_FROM_RFCOMM_C)

-			static void RFCOMM_ProcessSABM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);

-			static void RFCOMM_ProcessUA(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);

-			static void RFCOMM_ProcessDM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);

-			static void RFCOMM_ProcessDISC(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);

-			static void RFCOMM_ProcessUIH(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);

-

-			static uint8_t  RFCOMM_GetFCSValue(const void* FrameStart, uint16_t Length);

-			static uint16_t RFCOMM_GetFrameDataLength(const uint8_t** BufferPos);

-		#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 RFCOMM.c.
+ */
+
+#ifndef _RFCOMM_H_
+#define _RFCOMM_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"
+		
+	/* Macros: */
+		#define BT_RFCOMM_DEBUG(l, s, ...)              do { if (RFCOMM_DEBUG_LEVEL >= l) printf_P(PSTR("(RFCOMM) " s "\r\n"), ##__VA_ARGS__); } while (0)
+		#define RFCOMM_DEBUG_LEVEL                      2
+		
+		#define FRAME_POLL_FINAL                        (1 << 4)
+	
+	/* Enums: */
+		/** Enum for the types of RFCOMM frames which can be exchanged on a Bluetooth channel. */
+		enum RFCOMM_Frame_Types_t
+		{
+			RFCOMM_Frame_SABM  = 0x2F, /**< Set Asynchronous Balance Mode Field */
+			RFCOMM_Frame_UA    = 0x63, /**< Unnumbered Acknowledgement Field */
+			RFCOMM_Frame_DM    = 0x0F, /**< Disconnected Mode Field */
+			RFCOMM_Frame_DISC  = 0x43, /**< Disconnect Field */
+			RFCOMM_Frame_UIH   = 0xEF, /**< Unnumbered Information with Header check Field */
+		};
+	
+	/* Type Defines: */
+		typedef struct
+		{
+			struct
+			{
+				unsigned char LogicalChannel   : 6;
+				unsigned char PollResponse     : 1;
+				unsigned char LastAddressOctet : 1;
+			} Address;
+			
+			uint8_t Control;
+		} RFCOMM_Header_t;
+
+	/* Function Prototypes: */
+		void RFCOMM_Initialize(void);
+		void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel);
+		
+		#if defined(INCLUDE_FROM_RFCOMM_C)
+			static void RFCOMM_ProcessSABM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);
+			static void RFCOMM_ProcessUA(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);
+			static void RFCOMM_ProcessDM(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);
+			static void RFCOMM_ProcessDISC(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);
+			static void RFCOMM_ProcessUIH(const RFCOMM_Header_t* const FrameHeader, Bluetooth_Channel_t* const Channel);
+
+			static uint8_t  RFCOMM_GetFCSValue(const void* FrameStart, uint16_t Length);
+			static uint16_t RFCOMM_GetFrameDataLength(const uint8_t** BufferPos);
+		#endif
+		
+#endif
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c
index 16317e787..0af592e91 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.c
@@ -1,183 +1,183 @@
-/*

-             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

- *

- *  SDP Service Attribute definitions. This file contains the attributes

- *  and attribute tables of all the services the device supports, which can

- *  then be retrieved by a connected Bluetooth device via the SDP server.

- */

-

-#include "SDPServices.h"

-

-/** Serial Port Profile attribute, listing the unique service handle of the Serial Port service

- *  within the device. This handle can then be requested by the SDP client in future transactions

- *  in lieu of a search UUID list.

- */

-const struct

-{

-	uint8_t  Header;

-	uint32_t Data;

-} PROGMEM SerialPort_Attribute_ServiceHandle =

-	{

-		(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit),

-		SWAPENDIAN_32(0x00010001),

-	};

-

-/** Serial Port Profile attribute, listing the implemented Service Class UUIDs of the Serial Port service

- *  within the device. This list indicates all the class UUIDs that apply to the Serial Port service, so that

- *  a SDP client can search by a generalized class rather than a specific UUID to determine supported services.

- */

-const struct

-{

-	uint8_t    Header;

-	uint8_t    Size;

-	ItemUUID_t UUIDList[];

-} PROGMEM SerialPort_Attribute_ServiceClassIDs =

-	{

-		(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),

-		(sizeof(ItemUUID_t) * 1),

-		{

-			{(SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), SP_CLASS_UUID},

-		},

-	};

-

-/** Serial Port Profile attribute, listing the Protocols (and their attributes) of the Serial Port service

- *  within the device. This list indicates what protocols the service is layered on top of, as well as any

- *  configuration information for each layer.

- */

-const struct

-{

-	uint8_t               Header;

-	uint8_t               Size;

-

-	ItemProtocol_t        L2CAP;

-	ItemProtocolChannel_t RFCOMM;

-} PROGMEM SerialPort_Attribute_ProtocolDescriptor =

-	{

-		(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),

-		(sizeof(ItemProtocol_t) + sizeof(ItemProtocolChannel_t)),

-		{

-			(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),

-			sizeof(ItemUUID_t),

-			{

-				{(SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), L2CAP_UUID},

-			},

-		},

-		{

-			(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),

-			(sizeof(ItemUUID_t) + sizeof(Item8Bit_t)),

-			{

-				{(SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), RFCOMM_UUID},

-				{(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_8Bit), 0x03},

-			},

-		},

-	};

-

-/** Serial Port Profile attribute, listing the Browse Group List UUIDs which this service is a member of.

- *  Browse Group UUIDs give a way to group together services within a device in a simple heirachy, so that

- *  a SDP client can progressively narrow down an general browse to a specific service which it requires.

- */

-const struct

-{

-	uint8_t    Header;

-	uint8_t    Size;

-	ItemUUID_t UUIDList[];

-} PROGMEM SerialPort_Attribute_BrowseGroupList =

-	{

-		(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),

-		(sizeof(ItemUUID_t) * 1),

-		{

-			{(SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), PUBLICBROWSEGROUP_CLASS_UUID},

-		},

-	};

-

-/** Serial Port Profile attribute, listing the languages (and their encodings) supported

- *  by the Serial Port service in its text string attributes.

- */

-const struct

-{

-	uint8_t            Header;

-	uint8_t            Size;

-	ItemLangEncoding_t LanguageEncodings[];

-} PROGMEM SerialPort_Attribute_LanguageBaseIDOffset =

-	{

-		(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),

-		(sizeof(ItemLangEncoding_t) * 1),

-		{

-			{

-				{(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), SWAPENDIAN_16(0x454E)},

-				{(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), SWAPENDIAN_16(0x006A)},

-				{(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), SWAPENDIAN_16(0x0100)},

-			},

-		},

-	};

-

-/** Serial Port Profile attribute, listing a human readable name of the service. */

-const struct

-{

-	uint8_t Header;

-	uint8_t Size;

-	char    Text[];

-} PROGMEM SerialPort_Attribute_ServiceName =

-	{

-		(SDP_DATATYPE_String | SDP_DATASIZE_Variable8Bit),

-		sizeof("Wireless Serial Port") - 1,

-		"Wireless Serial Port",

-	};

-

-/** Serial Port Profile attribute, listing a human readable description of the service. */

-const struct

-{

-	uint8_t Header;

-	uint8_t Size;

-	char    Text[];

-} PROGMEM SerialPort_Attribute_ServiceDescription =

-	{

-		(SDP_DATATYPE_String | SDP_DATASIZE_Variable8Bit),

-		sizeof("Wireless Serial Port Service") - 1,

-		"Wireless Serial Port Service",

-	};

-

-/** Service Attribute Table for the Serial Port service, linking each supported attribute ID to its data, so that

- *  the SDP server can retrieve it for transmission back to a SDP client upon request.

- */

-const ServiceAttributeTable_t PROGMEM SerialPort_Attribute_Table[] =

-	{

-		{.AttributeID = SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE,    .Data = &SerialPort_Attribute_ServiceHandle       },

-		{.AttributeID = SDP_ATTRIBUTE_ID_SERVICECLASSIDS,        .Data = &SerialPort_Attribute_ServiceClassIDs     },

-		{.AttributeID = SDP_ATTRIBUTE_ID_PROTOCOLDESCRIPTORLIST, .Data = &SerialPort_Attribute_ProtocolDescriptor  },

-		{.AttributeID = SDP_ATTRIBUTE_ID_BROWSEGROUPLIST,        .Data = &SerialPort_Attribute_BrowseGroupList     },

-		{.AttributeID = SDP_ATTRIBUTE_ID_LANGUAGEBASEATTROFFSET, .Data = &SerialPort_Attribute_LanguageBaseIDOffset},

-		{.AttributeID = SDP_ATTRIBUTE_ID_SERVICENAME,            .Data = &SerialPort_Attribute_ServiceName         },

-		{.AttributeID = SDP_ATTRIBUTE_ID_SERVICEDESCRIPTION,     .Data = &SerialPort_Attribute_ServiceDescription  },

-

-		SERVICE_ATTRIBUTE_TABLE_TERMINATOR

-	};

+/*
+             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
+ *
+ *  SDP Service Attribute definitions. This file contains the attributes
+ *  and attribute tables of all the services the device supports, which can
+ *  then be retrieved by a connected Bluetooth device via the SDP server.
+ */
+
+#include "SDPServices.h"
+
+/** Serial Port Profile attribute, listing the unique service handle of the Serial Port service
+ *  within the device. This handle can then be requested by the SDP client in future transactions
+ *  in lieu of a search UUID list.
+ */
+const struct
+{
+	uint8_t  Header;
+	uint32_t Data;
+} PROGMEM SerialPort_Attribute_ServiceHandle =
+	{
+		(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit),
+		SWAPENDIAN_32(0x00010001),
+	};
+
+/** Serial Port Profile attribute, listing the implemented Service Class UUIDs of the Serial Port service
+ *  within the device. This list indicates all the class UUIDs that apply to the Serial Port service, so that
+ *  a SDP client can search by a generalized class rather than a specific UUID to determine supported services.
+ */
+const struct
+{
+	uint8_t    Header;
+	uint8_t    Size;
+	ItemUUID_t UUIDList[];
+} PROGMEM SerialPort_Attribute_ServiceClassIDs =
+	{
+		(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
+		(sizeof(ItemUUID_t) * 1),
+		{
+			{(SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), SP_CLASS_UUID},
+		},
+	};
+
+/** Serial Port Profile attribute, listing the Protocols (and their attributes) of the Serial Port service
+ *  within the device. This list indicates what protocols the service is layered on top of, as well as any
+ *  configuration information for each layer.
+ */
+const struct
+{
+	uint8_t               Header;
+	uint8_t               Size;
+
+	ItemProtocol_t        L2CAP;
+	ItemProtocolChannel_t RFCOMM;
+} PROGMEM SerialPort_Attribute_ProtocolDescriptor =
+	{
+		(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
+		(sizeof(ItemProtocol_t) + sizeof(ItemProtocolChannel_t)),
+		{
+			(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
+			sizeof(ItemUUID_t),
+			{
+				{(SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), L2CAP_UUID},
+			},
+		},
+		{
+			(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
+			(sizeof(ItemUUID_t) + sizeof(Item8Bit_t)),
+			{
+				{(SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), RFCOMM_UUID},
+				{(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_8Bit), 0x03},
+			},
+		},
+	};
+
+/** Serial Port Profile attribute, listing the Browse Group List UUIDs which this service is a member of.
+ *  Browse Group UUIDs give a way to group together services within a device in a simple heirachy, so that
+ *  a SDP client can progressively narrow down an general browse to a specific service which it requires.
+ */
+const struct
+{
+	uint8_t    Header;
+	uint8_t    Size;
+	ItemUUID_t UUIDList[];
+} PROGMEM SerialPort_Attribute_BrowseGroupList =
+	{
+		(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
+		(sizeof(ItemUUID_t) * 1),
+		{
+			{(SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), PUBLICBROWSEGROUP_CLASS_UUID},
+		},
+	};
+
+/** Serial Port Profile attribute, listing the languages (and their encodings) supported
+ *  by the Serial Port service in its text string attributes.
+ */
+const struct
+{
+	uint8_t            Header;
+	uint8_t            Size;
+	ItemLangEncoding_t LanguageEncodings[];
+} PROGMEM SerialPort_Attribute_LanguageBaseIDOffset =
+	{
+		(SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
+		(sizeof(ItemLangEncoding_t) * 1),
+		{
+			{
+				{(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), SWAPENDIAN_16(0x454E)},
+				{(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), SWAPENDIAN_16(0x006A)},
+				{(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), SWAPENDIAN_16(0x0100)},
+			},
+		},
+	};
+
+/** Serial Port Profile attribute, listing a human readable name of the service. */
+const struct
+{
+	uint8_t Header;
+	uint8_t Size;
+	char    Text[];
+} PROGMEM SerialPort_Attribute_ServiceName =
+	{
+		(SDP_DATATYPE_String | SDP_DATASIZE_Variable8Bit),
+		sizeof("Wireless Serial Port") - 1,
+		"Wireless Serial Port",
+	};
+
+/** Serial Port Profile attribute, listing a human readable description of the service. */
+const struct
+{
+	uint8_t Header;
+	uint8_t Size;
+	char    Text[];
+} PROGMEM SerialPort_Attribute_ServiceDescription =
+	{
+		(SDP_DATATYPE_String | SDP_DATASIZE_Variable8Bit),
+		sizeof("Wireless Serial Port Service") - 1,
+		"Wireless Serial Port Service",
+	};
+
+/** Service Attribute Table for the Serial Port service, linking each supported attribute ID to its data, so that
+ *  the SDP server can retrieve it for transmission back to a SDP client upon request.
+ */
+const ServiceAttributeTable_t PROGMEM SerialPort_Attribute_Table[] =
+	{
+		{.AttributeID = SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE,    .Data = &SerialPort_Attribute_ServiceHandle       },
+		{.AttributeID = SDP_ATTRIBUTE_ID_SERVICECLASSIDS,        .Data = &SerialPort_Attribute_ServiceClassIDs     },
+		{.AttributeID = SDP_ATTRIBUTE_ID_PROTOCOLDESCRIPTORLIST, .Data = &SerialPort_Attribute_ProtocolDescriptor  },
+		{.AttributeID = SDP_ATTRIBUTE_ID_BROWSEGROUPLIST,        .Data = &SerialPort_Attribute_BrowseGroupList     },
+		{.AttributeID = SDP_ATTRIBUTE_ID_LANGUAGEBASEATTROFFSET, .Data = &SerialPort_Attribute_LanguageBaseIDOffset},
+		{.AttributeID = SDP_ATTRIBUTE_ID_SERVICENAME,            .Data = &SerialPort_Attribute_ServiceName         },
+		{.AttributeID = SDP_ATTRIBUTE_ID_SERVICEDESCRIPTION,     .Data = &SerialPort_Attribute_ServiceDescription  },
+
+		SERVICE_ATTRIBUTE_TABLE_TERMINATOR
+	};
diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h
index 7e33638db..b0a78e686 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDPServices.h
@@ -1,177 +1,177 @@
-/*

-             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 SDPServices.c.

- */

-

-#ifndef _SDPSERVICES_H_

-#define _SDPSERVICES_H_

-	

-	/* Includes: */

-		#include "ServiceDiscoveryProtocol.h"

-

-	/* Macros: */

-		/** Size of a full 128 bit UUID, in bytes. */

-		#define UUID_SIZE_BYTES                         16

-		

-		/** First 80 bits common to all standardized Bluetooth services. */

-		#define BASE_80BIT_UUID                         0x0000, 0x0010, 0x0080, {0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB}

-		

-		#define RFCOMM_UUID                             {SWAPENDIAN_32(0x00000003), BASE_80BIT_UUID}

-		#define L2CAP_UUID                              {SWAPENDIAN_32(0x00000100), BASE_80BIT_UUID}

-		#define SP_CLASS_UUID                           {SWAPENDIAN_32(0x00001101), BASE_80BIT_UUID}

-		#define PUBLICBROWSEGROUP_CLASS_UUID            {SWAPENDIAN_32(0x00001002), BASE_80BIT_UUID}

-		

-		#define SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE    0x0000

-		#define SDP_ATTRIBUTE_ID_SERVICECLASSIDS        0x0001

-		#define SDP_ATTRIBUTE_ID_PROTOCOLDESCRIPTORLIST 0x0004

-		#define SDP_ATTRIBUTE_ID_BROWSEGROUPLIST        0x0005

-		#define SDP_ATTRIBUTE_ID_LANGUAGEBASEATTROFFSET 0x0006

-		#define SDP_ATTRIBUTE_ID_SERVICENAME            0x0100

-		#define SDP_ATTRIBUTE_ID_SERVICEDESCRIPTION     0x0101

-		

-		/** Swaps the byte ordering of a 16-bit value at compile time. Do not use this macro for swapping byte orderings

-		 *  of dynamic values computed at runtime -- use SwapEndian_16() instead.

-		 *

-		 *  \param[in]  x  16-bit value whose byte ordering is to be swapped

-		 *

-		 *  \return Input value with the byte ordering reversed

-		 */

-		#define SWAPENDIAN_16(x)                        ((((x) & 0xFF00) >> 8) | (((x) & 0x00FF) << 8))

-

-		/** Swaps the byte ordering of a 32-bit value at compile time. Do not use this macro for swapping byte orderings

-		 *  of dynamic values computed at runtime -- use SwapEndian_32() instead.

-		 *

-		 *  \param[in]  x  32-bit value whose byte ordering is to be swapped

-		 *

-		 *  \return Input value with the byte ordering reversed

-		 */

-		#define SWAPENDIAN_32(x)                        ((((x) & 0xFF000000UL) >> 24UL) | (((x) & 0x00FF0000UL) >> 8UL) | \

-		                                                 (((x) & 0x0000FF00UL) << 8UL) | (((x) & 0x000000FFUL) << 24UL))

-		

-		/** Terminator for a service attribute table of type \ref ServiceAttributeTable_t. */

-		#define SERVICE_ATTRIBUTE_TABLE_TERMINATOR      {.Data = NULL}

-		

-	/* Type Defines: */

-		/** Type define for a UUID value structure. This struct can be used to hold full 128-bit UUIDs. */

-		typedef struct

-		{

-			uint32_t A; /**< Bits 0-31 of the UUID. */

-			uint16_t B; /**< Bits 32-47 of the UUID. */

-			uint16_t C; /**< Bits 48-63 of the UUID. */

-			uint16_t D; /**< Bits 64-79 of the UUID. */

-			uint8_t  E[6]; /**< Bits 80-128 of the UUID. */

-		} UUID_t;

-	

-		/** Structure for the association of attribute ID values to an attribute value in FLASH. A table of these

-		 *  structures can then be built up for each supported UUID service within the device.

-		 *

-		 *  \note This table must be terminated with a \ref SERVICE_ATTRIBUTE_TABLE_TERMINATOR element.

-		 */

-		typedef struct

-		{

-			uint16_t    AttributeID; /**< Attribute ID of the table element which the UUID service supports */

-			const void* Data; /**< Pointer to the attribute data, located in PROGMEM memory space */

-		} ServiceAttributeTable_t;

-

-		/** Structure for a list of Data Elements containing 8-bit integers, for service attributes requiring such lists. */

-		typedef struct

-		{

-			uint8_t Header; /**< Data Element header, should be (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_8Bit) */

-			uint8_t Value; /**< Value to store in the list Data Element */

-		} Item8Bit_t;

-

-		/** Structure for a list of Data Elements containing 16-bit integers, for service attributes requiring such lists. */

-		typedef struct

-		{

-			uint8_t  Header; /**< Data Element header, should be (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit) */

-			uint16_t Value; /**< Value to store in the list Data Element */

-		} Item16Bit_t;

-

-		/** Structure for a list of Data Elements containing 32-bit integers, for service attributes requiring such lists. */

-		typedef struct

-		{

-			uint8_t  Header; /**< Data Element header, should be (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit) */

-			uint32_t Value; /**< Value to store in the list Data Element */

-		} Item32Bit_t;

-

-		/** Structure for a list of Data Elements containing UUIDs, for service attributes requiring UUID lists. */

-		typedef struct

-		{

-			uint8_t Header; /**< Data Element header, should be (SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit) */

-			UUID_t  UUID; /**< UUID to store in the list Data Element */

-		} ItemUUID_t;

-		

-		/** Structure for a list of Data Elements Sequences containing UUID Data Elements, for service attributes requiring

-		 *  protocol lists.

-		 */

-		typedef struct

-		{

-			uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */

-			uint8_t        Size; /**< Size of the inner Data Element sequence */

-			

-			struct

-			{

-				ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */

-			} Protocol;

-		} ItemProtocol_t;

-

-		/** Structure for a list of Data Elements Sequences containing UUID Data Elements and 8-bit channel values, for service

-		 *  attributes requiring extended protocol lists.

-		 */

-		typedef struct

-		{

-			uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */

-			uint8_t        Size; /**< Size of the inner Data Element sequence */

-			

-			struct

-			{

-				ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */

-				Item8Bit_t Channel; /**< Channel that is to be used to access the service */

-			} Protocol;

-		} ItemProtocolChannel_t;

-		

-		/** Structure for a list of Data Elements containing language encodings, including the language ID, Encoding ID and

-		 *  Attribute base offset.

-		 */

-		typedef struct

-		{

-			Item16Bit_t LanguageID; /**< Language ID for the current language */

-			Item16Bit_t EncodingID; /**< Encoding used for the current language */

-			Item16Bit_t OffsetID; /**< Attribute offset added to all strings using this language within the service */

-		} ItemLangEncoding_t;

-		

-	/* External Variables: */

-		extern const ServiceAttributeTable_t SerialPort_Attribute_Table[];

-		extern const ServiceAttributeTable_t PnP_Attribute_Table[];

-		

-#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 SDPServices.c.
+ */
+
+#ifndef _SDPSERVICES_H_
+#define _SDPSERVICES_H_
+	
+	/* Includes: */
+		#include "ServiceDiscoveryProtocol.h"
+
+	/* Macros: */
+		/** Size of a full 128 bit UUID, in bytes. */
+		#define UUID_SIZE_BYTES                         16
+		
+		/** First 80 bits common to all standardized Bluetooth services. */
+		#define BASE_80BIT_UUID                         0x0000, 0x0010, 0x0080, {0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB}
+		
+		#define RFCOMM_UUID                             {SWAPENDIAN_32(0x00000003), BASE_80BIT_UUID}
+		#define L2CAP_UUID                              {SWAPENDIAN_32(0x00000100), BASE_80BIT_UUID}
+		#define SP_CLASS_UUID                           {SWAPENDIAN_32(0x00001101), BASE_80BIT_UUID}
+		#define PUBLICBROWSEGROUP_CLASS_UUID            {SWAPENDIAN_32(0x00001002), BASE_80BIT_UUID}
+		
+		#define SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE    0x0000
+		#define SDP_ATTRIBUTE_ID_SERVICECLASSIDS        0x0001
+		#define SDP_ATTRIBUTE_ID_PROTOCOLDESCRIPTORLIST 0x0004
+		#define SDP_ATTRIBUTE_ID_BROWSEGROUPLIST        0x0005
+		#define SDP_ATTRIBUTE_ID_LANGUAGEBASEATTROFFSET 0x0006
+		#define SDP_ATTRIBUTE_ID_SERVICENAME            0x0100
+		#define SDP_ATTRIBUTE_ID_SERVICEDESCRIPTION     0x0101
+		
+		/** Swaps the byte ordering of a 16-bit value at compile time. Do not use this macro for swapping byte orderings
+		 *  of dynamic values computed at runtime -- use SwapEndian_16() instead.
+		 *
+		 *  \param[in]  x  16-bit value whose byte ordering is to be swapped
+		 *
+		 *  \return Input value with the byte ordering reversed
+		 */
+		#define SWAPENDIAN_16(x)                        ((((x) & 0xFF00) >> 8) | (((x) & 0x00FF) << 8))
+
+		/** Swaps the byte ordering of a 32-bit value at compile time. Do not use this macro for swapping byte orderings
+		 *  of dynamic values computed at runtime -- use SwapEndian_32() instead.
+		 *
+		 *  \param[in]  x  32-bit value whose byte ordering is to be swapped
+		 *
+		 *  \return Input value with the byte ordering reversed
+		 */
+		#define SWAPENDIAN_32(x)                        ((((x) & 0xFF000000UL) >> 24UL) | (((x) & 0x00FF0000UL) >> 8UL) | \
+		                                                 (((x) & 0x0000FF00UL) << 8UL) | (((x) & 0x000000FFUL) << 24UL))
+		
+		/** Terminator for a service attribute table of type \ref ServiceAttributeTable_t. */
+		#define SERVICE_ATTRIBUTE_TABLE_TERMINATOR      {.Data = NULL}
+		
+	/* Type Defines: */
+		/** Type define for a UUID value structure. This struct can be used to hold full 128-bit UUIDs. */
+		typedef struct
+		{
+			uint32_t A; /**< Bits 0-31 of the UUID. */
+			uint16_t B; /**< Bits 32-47 of the UUID. */
+			uint16_t C; /**< Bits 48-63 of the UUID. */
+			uint16_t D; /**< Bits 64-79 of the UUID. */
+			uint8_t  E[6]; /**< Bits 80-128 of the UUID. */
+		} UUID_t;
+	
+		/** Structure for the association of attribute ID values to an attribute value in FLASH. A table of these
+		 *  structures can then be built up for each supported UUID service within the device.
+		 *
+		 *  \note This table must be terminated with a \ref SERVICE_ATTRIBUTE_TABLE_TERMINATOR element.
+		 */
+		typedef struct
+		{
+			uint16_t    AttributeID; /**< Attribute ID of the table element which the UUID service supports */
+			const void* Data; /**< Pointer to the attribute data, located in PROGMEM memory space */
+		} ServiceAttributeTable_t;
+
+		/** Structure for a list of Data Elements containing 8-bit integers, for service attributes requiring such lists. */
+		typedef struct
+		{
+			uint8_t Header; /**< Data Element header, should be (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_8Bit) */
+			uint8_t Value; /**< Value to store in the list Data Element */
+		} Item8Bit_t;
+
+		/** Structure for a list of Data Elements containing 16-bit integers, for service attributes requiring such lists. */
+		typedef struct
+		{
+			uint8_t  Header; /**< Data Element header, should be (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit) */
+			uint16_t Value; /**< Value to store in the list Data Element */
+		} Item16Bit_t;
+
+		/** Structure for a list of Data Elements containing 32-bit integers, for service attributes requiring such lists. */
+		typedef struct
+		{
+			uint8_t  Header; /**< Data Element header, should be (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit) */
+			uint32_t Value; /**< Value to store in the list Data Element */
+		} Item32Bit_t;
+
+		/** Structure for a list of Data Elements containing UUIDs, for service attributes requiring UUID lists. */
+		typedef struct
+		{
+			uint8_t Header; /**< Data Element header, should be (SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit) */
+			UUID_t  UUID; /**< UUID to store in the list Data Element */
+		} ItemUUID_t;
+		
+		/** Structure for a list of Data Elements Sequences containing UUID Data Elements, for service attributes requiring
+		 *  protocol lists.
+		 */
+		typedef struct
+		{
+			uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */
+			uint8_t        Size; /**< Size of the inner Data Element sequence */
+			
+			struct
+			{
+				ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */
+			} Protocol;
+		} ItemProtocol_t;
+
+		/** Structure for a list of Data Elements Sequences containing UUID Data Elements and 8-bit channel values, for service
+		 *  attributes requiring extended protocol lists.
+		 */
+		typedef struct
+		{
+			uint8_t        Header; /**< Data Element header, should be (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit) */
+			uint8_t        Size; /**< Size of the inner Data Element sequence */
+			
+			struct
+			{
+				ItemUUID_t UUID; /**< UUID to store in the protocol list Data Element sequence */
+				Item8Bit_t Channel; /**< Channel that is to be used to access the service */
+			} Protocol;
+		} ItemProtocolChannel_t;
+		
+		/** Structure for a list of Data Elements containing language encodings, including the language ID, Encoding ID and
+		 *  Attribute base offset.
+		 */
+		typedef struct
+		{
+			Item16Bit_t LanguageID; /**< Language ID for the current language */
+			Item16Bit_t EncodingID; /**< Encoding used for the current language */
+			Item16Bit_t OffsetID; /**< Attribute offset added to all strings using this language within the service */
+		} ItemLangEncoding_t;
+		
+	/* External Variables: */
+		extern const ServiceAttributeTable_t SerialPort_Attribute_Table[];
+		extern const ServiceAttributeTable_t PnP_Attribute_Table[];
+		
+#endif
diff --git a/Projects/Benito/Lib/LightweightRingBuff.h b/Projects/Benito/Lib/LightweightRingBuff.h
index 8026cef64..a4b0f8b75 100644
--- a/Projects/Benito/Lib/LightweightRingBuff.h
+++ b/Projects/Benito/Lib/LightweightRingBuff.h
@@ -1,90 +1,90 @@
-/*

-             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

- *

- *  Ultra lightweight ring buffer, for fast insertion/deletion.

- */

- 

-#ifndef _ULW_RING_BUFF_H_

-#define _ULW_RING_BUFF_H_

-

-	/* Includes: */

-		#include <stdint.h>

-		#include <stdbool.h>

-

-	/* Defines: */

-		/** Size of each ring buffer, in bytes. */

-		#define BUFFER_SIZE      128

-		

-		/** Type of data to store into the buffer. */

-		#define RingBuff_Data_t  uint8_t

-

-	/* Type Defines: */

-		typedef struct

-		{

-			RingBuff_Data_t  Buffer[BUFFER_SIZE];

-			RingBuff_Data_t* In;

-			RingBuff_Data_t* Out;

-			uint8_t          Count;

-		} RingBuff_t;

-	

-	/* Inline Functions: */

-		static inline void RingBuffer_InitBuffer(RingBuff_t* const Buffer)

-		{

-			Buffer->In  = Buffer->Buffer;

-			Buffer->Out = Buffer->Buffer;

-			Buffer->Count = 0;

-		}

-		

-		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, RingBuff_Data_t Data)

-		{

-			*Buffer->In = Data;

-		

-			if (++Buffer->In == &Buffer->Buffer[BUFFER_SIZE])

-			  Buffer->In = Buffer->Buffer;

-			  

-			Buffer->Count++;

-		}

-

-		static inline RingBuff_Data_t RingBuffer_Remove(RingBuff_t* const Buffer)

-		{

-			RingBuff_Data_t Data = *Buffer->Out;

-		

-			if (++Buffer->Out == &Buffer->Buffer[BUFFER_SIZE])

-			  Buffer->Out = Buffer->Buffer;

-			  

-			Buffer->Count--;

-

-			return Data;

-		}

-

-#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
+ *
+ *  Ultra lightweight ring buffer, for fast insertion/deletion.
+ */
+ 
+#ifndef _ULW_RING_BUFF_H_
+#define _ULW_RING_BUFF_H_
+
+	/* Includes: */
+		#include <stdint.h>
+		#include <stdbool.h>
+
+	/* Defines: */
+		/** Size of each ring buffer, in bytes. */
+		#define BUFFER_SIZE      128
+		
+		/** Type of data to store into the buffer. */
+		#define RingBuff_Data_t  uint8_t
+
+	/* Type Defines: */
+		typedef struct
+		{
+			RingBuff_Data_t  Buffer[BUFFER_SIZE];
+			RingBuff_Data_t* In;
+			RingBuff_Data_t* Out;
+			uint8_t          Count;
+		} RingBuff_t;
+	
+	/* Inline Functions: */
+		static inline void RingBuffer_InitBuffer(RingBuff_t* const Buffer)
+		{
+			Buffer->In  = Buffer->Buffer;
+			Buffer->Out = Buffer->Buffer;
+			Buffer->Count = 0;
+		}
+		
+		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, RingBuff_Data_t Data)
+		{
+			*Buffer->In = Data;
+		
+			if (++Buffer->In == &Buffer->Buffer[BUFFER_SIZE])
+			  Buffer->In = Buffer->Buffer;
+			  
+			Buffer->Count++;
+		}
+
+		static inline RingBuff_Data_t RingBuffer_Remove(RingBuff_t* const Buffer)
+		{
+			RingBuff_Data_t Data = *Buffer->Out;
+		
+			if (++Buffer->Out == &Buffer->Buffer[BUFFER_SIZE])
+			  Buffer->Out = Buffer->Buffer;
+			  
+			Buffer->Count--;
+
+			return Data;
+		}
+
+#endif
  
\ No newline at end of file
diff --git a/Projects/USBtoSerial/Lib/LightweightRingBuff.h b/Projects/USBtoSerial/Lib/LightweightRingBuff.h
index 31430ddd4..c376ef480 100644
--- a/Projects/USBtoSerial/Lib/LightweightRingBuff.h
+++ b/Projects/USBtoSerial/Lib/LightweightRingBuff.h
@@ -1,90 +1,90 @@
-/*

-             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

- *

- *  Ultra lightweight ring buffer, for fast insertion/deletion.

- */

- 

-#ifndef _ULW_RING_BUFF_H_

-#define _ULW_RING_BUFF_H_

-

-	/* Includes: */

-		#include <stdint.h>

-		#include <stdbool.h>

-

-	/* Defines: */

-		/** Size of each ring buffer, in bytes */

-		#define BUFFER_SIZE      128

-		

-		/** Type of data to store into the buffer */

-		#define RingBuff_Data_t  uint8_t

-

-	/* Type Defines: */

-		typedef struct

-		{

-			RingBuff_Data_t  Buffer[BUFFER_SIZE];

-			RingBuff_Data_t* In;

-			RingBuff_Data_t* Out;

-			uint8_t          Count;

-		} RingBuff_t;

-	

-	/* Inline Functions: */

-		static inline void RingBuffer_InitBuffer(RingBuff_t* const Buffer)

-		{

-			Buffer->In  = Buffer->Buffer;

-			Buffer->Out = Buffer->Buffer;

-			Buffer->Count = 0;

-		}

-		

-		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, RingBuff_Data_t Data)

-		{

-			*Buffer->In = Data;

-		

-			if (++Buffer->In == &Buffer->Buffer[BUFFER_SIZE])

-			  Buffer->In = Buffer->Buffer;

-			  

-			Buffer->Count++;

-		}

-

-		static inline RingBuff_Data_t RingBuffer_Remove(RingBuff_t* const Buffer)

-		{

-			RingBuff_Data_t Data = *Buffer->Out;

-		

-			if (++Buffer->Out == &Buffer->Buffer[BUFFER_SIZE])

-			  Buffer->Out = Buffer->Buffer;

-			  

-			Buffer->Count--;

-

-			return Data;

-		}

-

-#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
+ *
+ *  Ultra lightweight ring buffer, for fast insertion/deletion.
+ */
+ 
+#ifndef _ULW_RING_BUFF_H_
+#define _ULW_RING_BUFF_H_
+
+	/* Includes: */
+		#include <stdint.h>
+		#include <stdbool.h>
+
+	/* Defines: */
+		/** Size of each ring buffer, in bytes */
+		#define BUFFER_SIZE      128
+		
+		/** Type of data to store into the buffer */
+		#define RingBuff_Data_t  uint8_t
+
+	/* Type Defines: */
+		typedef struct
+		{
+			RingBuff_Data_t  Buffer[BUFFER_SIZE];
+			RingBuff_Data_t* In;
+			RingBuff_Data_t* Out;
+			uint8_t          Count;
+		} RingBuff_t;
+	
+	/* Inline Functions: */
+		static inline void RingBuffer_InitBuffer(RingBuff_t* const Buffer)
+		{
+			Buffer->In  = Buffer->Buffer;
+			Buffer->Out = Buffer->Buffer;
+			Buffer->Count = 0;
+		}
+		
+		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, RingBuff_Data_t Data)
+		{
+			*Buffer->In = Data;
+		
+			if (++Buffer->In == &Buffer->Buffer[BUFFER_SIZE])
+			  Buffer->In = Buffer->Buffer;
+			  
+			Buffer->Count++;
+		}
+
+		static inline RingBuff_Data_t RingBuffer_Remove(RingBuff_t* const Buffer)
+		{
+			RingBuff_Data_t Data = *Buffer->Out;
+		
+			if (++Buffer->Out == &Buffer->Buffer[BUFFER_SIZE])
+			  Buffer->Out = Buffer->Buffer;
+			  
+			Buffer->Count--;
+
+			return Data;
+		}
+
+#endif
  
\ No newline at end of file