Clean up excessive whitespace at the end of each line using the wspurify tool made by Laszlo Monda

6 files changed, 162 insertions, 156 deletions

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index 234b5ce88..38f78daf3 100644
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
-              
+
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  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 
+  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 
+  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
@@ -32,7 +32,7 @@
  *
  *  Main source file for the CDC class bootloader. This file contains the complete bootloader logic.
  */
- 
+
 #define  INCLUDE_FROM_BOOTLOADERCDC_C
 #include "BootloaderCDC.h"
 
@@ -57,7 +57,7 @@ uint32_t CurrAddress;
 bool RunBootloader = true;
 
 
-/** Main program entry point. This routine configures the hardware required by the bootloader, then continuously 
+/** Main program entry point. This routine configures the hardware required by the bootloader, then continuously
  *  runs the bootloader processing routine until instructed to soft-exit, or hard-reset via the watchdog to start
  *  the loaded application code.
  */
@@ -74,7 +74,7 @@ int main(void)
 		CDC_Task();
 		USB_USBTask();
 	}
-	
+
 	/* Disconnect from the host - USB interface will be reset later along with the AVR */
 	USB_Detach();
 
@@ -93,11 +93,11 @@ void SetupHardware(void)
 
 	/* Disable clock division */
 	clock_prescale_set(clock_div_1);
-	
+
 	/* Relocate the interrupt vector table to the bootloader section */
 	MCUCR = (1 << IVCE);
 	MCUCR = (1 << IVSEL);
-	
+
 	/* Initialize USB Subsystem */
 	USB_Init();
 }
@@ -132,14 +132,14 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 	{
 		case REQ_GetLineEncoding:
 			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{	
+			{
 				Endpoint_ClearSETUP();
 
 				/* Write the line coding data to the control endpoint */
 				Endpoint_Write_Control_Stream_LE(&LineEncoding, sizeof(CDC_Line_Coding_t));
 				Endpoint_ClearOUT();
 			}
-			
+
 			break;
 		case REQ_SetLineEncoding:
 			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
@@ -150,7 +150,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 				Endpoint_Read_Control_Stream_LE(&LineEncoding, sizeof(CDC_Line_Coding_t));
 				Endpoint_ClearIN();
 			}
-	
+
 			break;
 	}
 }
@@ -164,20 +164,20 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 {
 	uint16_t BlockSize;
 	char     MemoryType;
-	
+
 	bool     HighByte = false;
 	uint8_t  LowByte  = 0;
-	
+
 	BlockSize  = (FetchNextCommandByte() << 8);
 	BlockSize |=  FetchNextCommandByte();
-	
+
 	MemoryType =  FetchNextCommandByte();
 
 	if ((MemoryType != 'E') && (MemoryType != 'F'))
 	{
 		/* Send error byte back to the host */
 		WriteNextResponseByte('?');
-		
+
 		return;
 	}
 
@@ -195,13 +195,13 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 				#if (FLASHEND > 0xFFFF)
 				WriteNextResponseByte(pgm_read_byte_far(CurrAddress | HighByte));
 				#else
-				WriteNextResponseByte(pgm_read_byte(CurrAddress | HighByte));					
+				WriteNextResponseByte(pgm_read_byte(CurrAddress | HighByte));
 				#endif
-				
+
 				/* If both bytes in current word have been read, increment the address counter */
 				if (HighByte)
 				  CurrAddress += 2;
-				
+
 				HighByte = !HighByte;
 			}
 			else
@@ -211,7 +211,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 
 				/* Increment the address counter after use */
 				CurrAddress += 2;
-			}			
+			}
 		}
 	}
 	else
@@ -223,11 +223,11 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 			boot_page_erase(PageStartAddress);
 			boot_spm_busy_wait();
 		}
-		
+
 		while (BlockSize--)
 		{
 			if (MemoryType == 'F')
-			{	
+			{
 				/* If both bytes in current word have been written, increment the address counter */
 				if (HighByte)
 				{
@@ -242,14 +242,14 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 				else
 				{
 					LowByte = FetchNextCommandByte();
-				
+
 					HighByte = true;
 				}
 			}
 			else
 			{
 				/* Write the next EEPROM byte from the endpoint */
-				eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());					
+				eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
 
 				/* Increment the address counter after use */
 				CurrAddress += 2;
@@ -261,13 +261,13 @@ static void ReadWriteMemoryBlock(const uint8_t Command)
 		{
 			/* Commit the flash page to memory */
 			boot_page_write(PageStartAddress);
-			
+
 			/* Wait until write operation has completed */
 			boot_spm_busy_wait();
 		}
-	
+
 		/* Send response byte back to the host */
-		WriteNextResponseByte('\r');		
+		WriteNextResponseByte('\r');
 	}
 }
 
@@ -280,7 +280,7 @@ static uint8_t FetchNextCommandByte(void)
 {
 	/* Select the OUT endpoint so that the next data byte can be read */
 	Endpoint_SelectEndpoint(CDC_RX_EPNUM);
-	
+
 	/* If OUT endpoint empty, clear it and wait for the next packet from the host */
 	while (!(Endpoint_IsReadWriteAllowed()))
 	{
@@ -292,7 +292,7 @@ static uint8_t FetchNextCommandByte(void)
 			  return 0;
 		}
 	}
-	
+
 	/* Fetch the next byte from the OUT endpoint */
 	return Endpoint_Read_Byte();
 }
@@ -306,19 +306,19 @@ static void WriteNextResponseByte(const uint8_t Response)
 {
 	/* Select the IN endpoint so that the next data byte can be written */
 	Endpoint_SelectEndpoint(CDC_TX_EPNUM);
-	
+
 	/* If IN endpoint full, clear it and wait until ready for the next packet to the host */
 	if (!(Endpoint_IsReadWriteAllowed()))
 	{
 		Endpoint_ClearIN();
-		
+
 		while (!(Endpoint_IsINReady()))
 		{
 			if (USB_DeviceState == DEVICE_STATE_Unattached)
 			  return;
 		}
 	}
-	
+
 	/* Write the next byte to the OUT endpoint */
 	Endpoint_Write_Byte(Response);
 }
@@ -330,7 +330,7 @@ void CDC_Task(void)
 {
 	/* Select the OUT endpoint */
 	Endpoint_SelectEndpoint(CDC_RX_EPNUM);
-	
+
 	/* Check if endpoint has a command in it sent from the host */
 	if (Endpoint_IsOUTReceived())
 	{
@@ -345,7 +345,7 @@ void CDC_Task(void)
 			  FetchNextCommandByte();
 
 			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');			
+			WriteNextResponseByte('\r');
 		}
 		else if (Command == 't')
 		{
@@ -370,13 +370,13 @@ void CDC_Task(void)
 		else if (Command == 'p')
 		{
 			/* Indicate serial programmer back to the host */
-			WriteNextResponseByte('S');		 
+			WriteNextResponseByte('S');
 		}
 		else if (Command == 'S')
 		{
 			/* Write the 7-byte software identifier to the endpoint */
 			for (uint8_t CurrByte = 0; CurrByte < 7; CurrByte++)
-			  WriteNextResponseByte(SOFTWARE_IDENTIFIER[CurrByte]);		
+			  WriteNextResponseByte(SOFTWARE_IDENTIFIER[CurrByte]);
 		}
 		else if (Command == 'V')
 		{
@@ -385,17 +385,17 @@ void CDC_Task(void)
 		}
 		else if (Command == 's')
 		{
-			WriteNextResponseByte(AVR_SIGNATURE_3);		
+			WriteNextResponseByte(AVR_SIGNATURE_3);
 			WriteNextResponseByte(AVR_SIGNATURE_2);
 			WriteNextResponseByte(AVR_SIGNATURE_1);
 		}
 		else if (Command == 'b')
 		{
 			WriteNextResponseByte('Y');
-				
+
 			/* Send block size to the host */
 			WriteNextResponseByte(SPM_PAGESIZE >> 8);
-			WriteNextResponseByte(SPM_PAGESIZE & 0xFF);		
+			WriteNextResponseByte(SPM_PAGESIZE & 0xFF);
 		}
 		else if (Command == 'e')
 		{
@@ -409,9 +409,9 @@ void CDC_Task(void)
 
 				CurrFlashAddress += SPM_PAGESIZE;
 			}
-			
+
 			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
+			WriteNextResponseByte('\r');
 		}
 		else if (Command == 'l')
 		{
@@ -423,7 +423,7 @@ void CDC_Task(void)
 		}
 		else if (Command == 'r')
 		{
-			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_LOCK_BITS));		
+			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_LOCK_BITS));
 		}
 		else if (Command == 'F')
 		{
@@ -431,41 +431,41 @@ void CDC_Task(void)
 		}
 		else if (Command == 'N')
 		{
-			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS));		
+			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS));
 		}
 		else if (Command == 'Q')
 		{
-			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_EXTENDED_FUSE_BITS));		
+			WriteNextResponseByte(boot_lock_fuse_bits_get(GET_EXTENDED_FUSE_BITS));
 		}
 		else if (Command == 'C')
-		{			
+		{
 			/* Write the high byte to the current flash page */
 			boot_page_fill(CurrAddress, FetchNextCommandByte());
 
 			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
+			WriteNextResponseByte('\r');
 		}
 		else if (Command == 'c')
-		{			
+		{
 			/* Write the low byte to the current flash page */
 			boot_page_fill(CurrAddress | 1, FetchNextCommandByte());
-			
+
 			/* Increment the address */
 			CurrAddress += 2;
 
 			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
+			WriteNextResponseByte('\r');
 		}
 		else if (Command == 'm')
 		{
 			/* Commit the flash page to memory */
 			boot_page_write(CurrAddress);
-			
+
 			/* Wait until write operation has completed */
 			boot_spm_busy_wait();
 
 			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
+			WriteNextResponseByte('\r');
 		}
 		else if ((Command == 'B') || (Command == 'g'))
 		{
@@ -477,9 +477,9 @@ void CDC_Task(void)
 			#if (FLASHEND > 0xFFFF)
 			uint16_t ProgramWord = pgm_read_word_far(CurrAddress);
 			#else
-			uint16_t ProgramWord = pgm_read_word(CurrAddress);			
+			uint16_t ProgramWord = pgm_read_word(CurrAddress);
 			#endif
-			
+
 			WriteNextResponseByte(ProgramWord >> 8);
 			WriteNextResponseByte(ProgramWord & 0xFF);
 		}
@@ -487,12 +487,12 @@ void CDC_Task(void)
 		{
 			/* Read the byte from the endpoint and write it to the EEPROM */
 			eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte());
-			
-			/* Increment the address after use */			
+
+			/* Increment the address after use */
 			CurrAddress += 2;
-	
+
 			/* Send confirmation byte back to the host */
-			WriteNextResponseByte('\r');		
+			WriteNextResponseByte('\r');
 		}
 		else if (Command == 'd')
 		{
@@ -520,12 +520,12 @@ void CDC_Task(void)
 
 		/* Send the endpoint data to the host */
 		Endpoint_ClearIN();
-		
+
 		/* If a full endpoint's worth of data was sent, we need to send an empty packet afterwards to signal end of transfer */
 		if (IsEndpointFull)
 		{
 			while (!(Endpoint_IsINReady()))
-			{				
+			{
 				if (USB_DeviceState == DEVICE_STATE_Unattached)
 				  return;
 			}
@@ -535,11 +535,11 @@ void CDC_Task(void)
 
 		/* Wait until the data has been sent to the host */
 		while (!(Endpoint_IsINReady()))
-		{				
+		{
 			if (USB_DeviceState == DEVICE_STATE_Unattached)
 			  return;
 		}
-		
+
 		/* Select the OUT endpoint */
 		Endpoint_SelectEndpoint(CDC_RX_EPNUM);
 
@@ -547,3 +547,4 @@ void CDC_Task(void)
 		Endpoint_ClearOUT();
 	}
 }
+
diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index 98154c2b9..492fbdd92 100644
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
-              
+
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  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 
+  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 
+  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
@@ -32,7 +32,7 @@
  *
  *  Header file for BootloaderCDC.c.
  */
- 
+
 #ifndef _CDC_H_
 #define _CDC_H_
 
@@ -55,7 +55,7 @@
 
 		/** Version minor of the CDC bootloader. */
 		#define BOOTLOADER_VERSION_MINOR     0x00
-				
+
 		/** Hardware version major of the CDC bootloader. */
 		#define BOOTLOADER_HWVERSION_MAJOR   0x01
 
@@ -64,7 +64,7 @@
 
 		/** Eight character bootloader firmware identifier reported to the host when requested */
 		#define SOFTWARE_IDENTIFIER          "LUFACDC"
-		
+
 		/** CDC Class specific request to get the current virtual serial port configuration settings. */
 		#define REQ_GetLineEncoding          0x21
 
@@ -89,7 +89,7 @@
 
 		/** Type define for a non-returning pointer to the start of the loaded application in flash memory. */
 		typedef void (*AppPtr_t)(void) ATTR_NO_RETURN;
-		
+
 	/* Enums: */
 		/** Enum for the possible line encoding formats of a virtual serial port. */
 		enum CDCDevice_CDC_LineCodingFormats_t
@@ -98,7 +98,7 @@
 			OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits */
 			TwoStopBits         = 2, /**< Each frame contains two stop bits */
 		};
-		
+
 		/** Enum for the possible line encoding parity settings of a virtual serial port. */
 		enum CDCDevice_LineCodingParity_t
 		{
@@ -122,3 +122,4 @@
 		#endif
 
 #endif
+
diff --git a/Bootloaders/CDC/BootloaderCDC.txt b/Bootloaders/CDC/BootloaderCDC.txt
index f4208ee4c..ae1da0804 100644
--- a/Bootloaders/CDC/BootloaderCDC.txt
+++ b/Bootloaders/CDC/BootloaderCDC.txt
@@ -3,7 +3,7 @@
  *  This file contains special DoxyGen information for the generation of the main page and other special
  *  documentation pages. It is not a project source file.
  */
- 
+
 /** \mainpage CDC Class USB AVR Bootloader
  *
  *  \section SSec_Compat Demo Compatibility:
@@ -28,7 +28,7 @@
  *    <td><b>USB Class:</b></td>
  *    <td>Communications Device Class (CDC)</td>
  *   </tr>
- *   <tr> 
+ *   <tr>
  *    <td><b>USB Subclass:</b></td>
  *    <td>Abstract Control Model (ACM)</td>
  *   </tr>
@@ -42,15 +42,15 @@
  *   </tr>
  *  </table>
  *
- *  \section SSec_Description Project Description: 
+ *  \section SSec_Description Project Description:
  *
  *  This bootloader enumerates to the host as a CDC Class device (virtual serial port), allowing for AVR109
- *  protocol compatible programming software to load firmware onto the AVR.	
- *  
+ *  protocol compatible programming software to load firmware onto the AVR.
+ *
  *  Out of the box this bootloader builds for the USB1287, and will fit into 4KB of bootloader space. If
  *  you wish to enlarge this space and/or change the AVR model, you will need to edit the BOOT_START and MCU
  *  values in the accompanying makefile.
- *  
+ *
  *  This bootloader is compatible with the open source application AVRDUDE, or Atmel's AVRPROG.
  *
  *  After running this bootloader for the first time on a new computer, you will need to supply the .INF
@@ -70,3 +70,4 @@
  *   </tr>
  *  </table>
  */
+
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index ae9a986a6..ae04fbd67 100644
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
-              
+
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  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 
+  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 
+  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
@@ -30,9 +30,9 @@
 
 /** \file
  *
- *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special 
+ *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special
  *  computer-readable structures which the host requests upon device enumeration, to determine
- *  the device's capabilities and functions.  
+ *  the device's capabilities and functions.
  */
 
 #include "Descriptors.h"
@@ -45,22 +45,22 @@
 USB_Descriptor_Device_t DeviceDescriptor =
 {
 	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
-		
+
 	.USBSpecification       = VERSION_BCD(01.10),
 	.Class                  = 0x02,
 	.SubClass               = 0x00,
 	.Protocol               = 0x00,
-				
+
 	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
-		
+
 	.VendorID               = 0x03EB,
 	.ProductID              = 0x204A,
 	.ReleaseNumber          = VERSION_BCD(00.01),
-		
+
 	.ManufacturerStrIndex   = NO_DESCRIPTOR,
 	.ProductStrIndex        = 0x01,
 	.SerialNumStrIndex      = NO_DESCRIPTOR,
-		
+
 	.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
 };
 
@@ -71,102 +71,102 @@ USB_Descriptor_Device_t DeviceDescriptor =
  */
 USB_Descriptor_Configuration_t ConfigurationDescriptor =
 {
-	.Config = 
+	.Config =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
 
 			.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
 			.TotalInterfaces        = 2,
-				
+
 			.ConfigurationNumber    = 1,
 			.ConfigurationStrIndex  = NO_DESCRIPTOR,
-				
+
 			.ConfigAttributes       = USB_CONFIG_ATTR_BUSPOWERED,
-			
+
 			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
 		},
-		
-	.CDC_CCI_Interface = 
+
+	.CDC_CCI_Interface =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
 			.InterfaceNumber        = 0,
 			.AlternateSetting       = 0,
-			
+
 			.TotalEndpoints         = 1,
-				
+
 			.Class                  = 0x02,
 			.SubClass               = 0x02,
 			.Protocol               = 0x01,
-				
+
 			.InterfaceStrIndex      = NO_DESCRIPTOR
 		},
 
-	.CDC_Functional_Header = 
+	.CDC_Functional_Header =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalHeader_t), .Type = DTYPE_CSInterface},
 			.Subtype                = 0x00,
-			
+
 			.CDCSpecification       = VERSION_BCD(01.10),
 		},
 
-	.CDC_Functional_ACM = 
+	.CDC_Functional_ACM =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalACM_t), .Type = DTYPE_CSInterface},
 			.Subtype                = 0x02,
-			
+
 			.Capabilities           = 0x04,
 		},
-		
-	.CDC_Functional_Union = 
+
+	.CDC_Functional_Union =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalUnion_t), .Type = DTYPE_CSInterface},
 			.Subtype                = 0x06,
-			
+
 			.MasterInterfaceNumber  = 0,
 			.SlaveInterfaceNumber   = 1,
 		},
 
-	.CDC_NotificationEndpoint = 
+	.CDC_NotificationEndpoint =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-										 
+
 			.EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),
 			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
 			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,
 			.PollingIntervalMS      = 0x02
 		},
 
-	.CDC_DCI_Interface = 
+	.CDC_DCI_Interface =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
 			.InterfaceNumber        = 1,
 			.AlternateSetting       = 0,
-			
+
 			.TotalEndpoints         = 2,
-				
+
 			.Class                  = 0x0A,
 			.SubClass               = 0x00,
 			.Protocol               = 0x00,
-				
+
 			.InterfaceStrIndex      = NO_DESCRIPTOR
 		},
 
-	.CDC_DataOutEndpoint = 
+	.CDC_DataOutEndpoint =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-										 
+
 			.EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),
 			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
 			.EndpointSize           = CDC_TXRX_EPSIZE,
 			.PollingIntervalMS      = 0x00
 		},
-		
-	.CDC_DataInEndpoint = 
+
+	.CDC_DataInEndpoint =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-										 
+
 			.EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),
 			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
 			.EndpointSize           = CDC_TXRX_EPSIZE,
@@ -181,7 +181,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
 USB_Descriptor_String_t LanguageString =
 {
 	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
-		
+
 	.UnicodeString          = {LANGUAGE_ID_ENG}
 };
 
@@ -192,7 +192,7 @@ USB_Descriptor_String_t LanguageString =
 USB_Descriptor_String_t ProductString =
 {
 	.Header                 = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String},
-		
+
 	.UnicodeString          = L"AVR CDC Bootloader"
 };
 
@@ -233,10 +233,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 				Address = &ProductString;
 				Size    = ProductString.Header.Size;
 			}
-			
+
 			break;
 	}
-	
+
 	*DescriptorAddress = Address;
 	return Size;
 }
+
diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index 15941338b..9af079b9c 100644
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
-              
+
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  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 
+  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 
+  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
@@ -96,7 +96,7 @@
 		#define CDC_NOTIFICATION_EPNUM         2
 
 		/** Endpoint number for the CDC data interface TX (data IN) endpoint. */
-		#define CDC_TX_EPNUM                   3	
+		#define CDC_TX_EPNUM                   3
 
 		/** Endpoint number for the CDC data interface RX (data OUT) endpoint. */
 		#define CDC_RX_EPNUM                   4
@@ -130,7 +130,7 @@
 			uint8_t                 Subtype; /**< Sub type value used to distinguish between CDC class-specific descriptors. */
 			uint8_t                 Capabilities; /**< Capabilities of the ACM interface, given as a bit mask. */
 		} USB_Descriptor_CDC_FunctionalACM_t;
-		
+
 		/** Type define for a CDC class-specific functional Union descriptor. This indicates to the host that specific
 		 *  CDC control and data interfaces are related. See the CDC class specification for more details.
 		 */
@@ -166,3 +166,4 @@
 		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif
+
diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index c23424b9f..305c732b9 100644
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -35,7 +35,7 @@
 # make doxygen = Generate DoxyGen documentation for the project (must have
 #                DoxyGen installed)
 #
-# make debug = Start either simulavr or avarice as specified for debugging, 
+# make debug = Start either simulavr or avarice as specified for debugging,
 #              with avr-gdb or avr-insight as the front end for debugging.
 #
 # make filename.s = Just compile filename.c into the assembler code only.
@@ -52,14 +52,14 @@ MCU = at90usb1287
 
 
 # Target board (see library "Board Types" documentation, NONE for projects not requiring
-# LUFA board drivers). If USER is selected, put custom board drivers in a directory called 
+# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
 # "Board" inside the application directory.
 BOARD = USBKEY
 
 
 # Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the 
-#     processor frequency in Hz. You can then use this symbol in your source code to 
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 #     automatically to create a 32-bit value in your source code.
 #
@@ -72,7 +72,7 @@ F_CPU = 8000000
 
 
 # Input clock frequency.
-#     This will define a symbol, F_CLOCK, in all source code files equal to the 
+#     This will define a symbol, F_CLOCK, in all source code files equal to the
 #     input clock frequency (before any prescaling is performed) in Hz. This value may
 #     differ from F_CPU if prescaling is used on the latter, and is required as the
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed
@@ -136,7 +136,7 @@ SRC = $(TARGET).c                                                 \
 
 
 # List C++ source files here. (C dependencies are automatically generated.)
-CPPSRC = 
+CPPSRC =
 
 
 # List Assembler source files here.
@@ -149,7 +149,7 @@ CPPSRC =
 ASRC =
 
 
-# Optimization level, can be [0, 1, 2, 3, s]. 
+# Optimization level, can be [0, 1, 2, 3, s].
 #     0 = turn off optimization. s = optimize for size.
 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
 OPT = s
@@ -266,7 +266,7 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             for use in COFF files, additional information about filenames
 #             and function names needs to be present in the assembler source
 #             files -- see avr-libc docs [FIXME: not yet described there]
-#  -listing-cont-lines: Sets the maximum number of continuation lines of hex 
+#  -listing-cont-lines: Sets the maximum number of continuation lines of hex
 #       dump that will be displayed for a given single line of source input.
 ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
 
@@ -279,7 +279,7 @@ PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
 PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
 
 # If this is left blank, then it will use the Standard printf version.
-PRINTF_LIB = 
+PRINTF_LIB =
 #PRINTF_LIB = $(PRINTF_LIB_MIN)
 #PRINTF_LIB = $(PRINTF_LIB_FLOAT)
 
@@ -291,7 +291,7 @@ SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
 SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
 
 # If this is left blank, then it will use the Standard scanf version.
-SCANF_LIB = 
+SCANF_LIB =
 #SCANF_LIB = $(SCANF_LIB_MIN)
 #SCANF_LIB = $(SCANF_LIB_FLOAT)
 
@@ -303,7 +303,7 @@ MATH_LIB = -lm
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRALIBDIRS = 
+EXTRALIBDIRS =
 
 
 
@@ -327,7 +327,7 @@ EXTMEMOPTS =
 #    --cref:    add cross reference to  map file
 LDFLAGS  = -Wl,-Map=$(TARGET).map,--cref
 LDFLAGS += -Wl,--section-start=.text=$(BOOT_START)
-LDFLAGS += -Wl,--relax 
+LDFLAGS += -Wl,--relax
 LDFLAGS += -Wl,--gc-sections
 LDFLAGS += $(EXTMEMOPTS)
 LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
@@ -361,7 +361,7 @@ AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
 #AVRDUDE_NO_VERIFY = -V
 
 # Increase verbosity level.  Please use this when submitting bug
-# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude> 
+# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>
 # to submit bug reports.
 #AVRDUDE_VERBOSE = -v -v
 
@@ -395,7 +395,7 @@ JTAG_DEV = /dev/com1
 DEBUG_PORT = 4242
 
 # Debugging host used to communicate between GDB / avarice / simulavr, normally
-#     just set to localhost unless doing some sort of crazy debugging when 
+#     just set to localhost unless doing some sort of crazy debugging when
 #     avarice is running on a different computer.
 DEBUG_HOST = localhost
 
@@ -424,7 +424,7 @@ WINSHELL = cmd
 MSG_ERRORS_NONE = Errors: none
 MSG_BEGIN = -------- begin --------
 MSG_END = --------  end  --------
-MSG_SIZE_BEFORE = Size before: 
+MSG_SIZE_BEFORE = Size before:
 MSG_SIZE_AFTER = Size after:
 MSG_COFF = Converting to AVR COFF:
 MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
@@ -443,10 +443,10 @@ MSG_CREATING_LIBRARY = Creating library:
 
 
 # Define all object files.
-OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o) 
+OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)
 
 # Define all listing files.
-LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst) 
+LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)
 
 
 # Compiler flags to generate dependency files.
@@ -511,19 +511,19 @@ sizeafter:
 
 
 # Display compiler version information.
-gccversion : 
+gccversion :
 	@$(CC) --version
 
 
-# Program the device.  
+# Program the device.
 program: $(TARGET).hex $(TARGET).eep
 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
 
 
 # Generate avr-gdb config/init file which does the following:
-#     define the reset signal, load the target file, connect to target, and set 
+#     define the reset signal, load the target file, connect to target, and set
 #     a breakpoint at main().
-gdb-config: 
+gdb-config:
 	@$(REMOVE) $(GDBINIT_FILE)
 	@echo define reset >> $(GDBINIT_FILE)
 	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)
@@ -621,14 +621,14 @@ extcoff: $(TARGET).elf
 $(OBJDIR)/%.o : %.c
 	@echo
 	@echo $(MSG_COMPILING) $<
-	$(CC) -c $(ALL_CFLAGS) $< -o $@ 
+	$(CC) -c $(ALL_CFLAGS) $< -o $@
 
 
 # Compile: create object files from C++ source files.
 $(OBJDIR)/%.o : %.cpp
 	@echo
 	@echo $(MSG_COMPILING_CPP) $<
-	$(CC) -c $(ALL_CPPFLAGS) $< -o $@ 
+	$(CC) -c $(ALL_CPPFLAGS) $< -o $@
 
 
 # Compile: create assembler files from C source files.
@@ -650,7 +650,7 @@ $(OBJDIR)/%.o : %.S
 
 # Create preprocessed source for use in sending a bug report.
 %.i : %.c
-	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@ 
+	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@
 
 
 # Target: clean project.
@@ -693,3 +693,4 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 .PHONY : all begin finish end sizebefore sizeafter gccversion \
 build elf hex eep lss sym coff extcoff doxygen clean          \
 clean_list clean_doxygen program debug gdb-config
+