X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ed031c1df2f5b053b9cd9f48c63e66a42b7c049e..526e398986583e2fb65c0a36a2fbf2ce153446e5:/Demos/Device/USBtoSerial/USBtoSerial.h

diff --git a/Demos/Device/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h
index 3fb6d7d9f..0352f5d75 100644
--- a/Demos/Device/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/USBtoSerial/USBtoSerial.h
@@ -39,16 +39,15 @@
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
-		#include <avr/interrupt.h>
+		#include <avr/interrupt.h>
 		#include <avr/power.h>
 
 		#include "Descriptors.h"
 		#include "RingBuff.h"
 
 		#include <LUFA/Version.h>                         // Library Version Information
-		#include <LUFA/Common/ButtLoadTag.h>              // PROGMEM tags readable by the ButtLoad project
 		#include <LUFA/Drivers/USB/USB.h>                 // USB Functionality
-		#include <LUFA/Drivers/AT90USBXXX/Serial.h>       // USART driver
+		#include <LUFA/Drivers/Peripheral/Serial.h>       // USART driver
 		#include <LUFA/Drivers/Board/LEDs.h>              // LEDs driver
 		#include <LUFA/Scheduler/Scheduler.h>             // Simple scheduler for task management
 
@@ -99,17 +98,17 @@
 		#define CONTROL_LINE_IN_RING         (1 << 3)
 
 		/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
-		 *  to indicate that a framing error has ocurred on the virtual serial port.
+		 *  to indicate that a framing error has occurred on the virtual serial port.
 		 */
 		#define CONTROL_LINE_IN_FRAMEERROR   (1 << 4)
 
 		/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
-		 *  to indicate that a parity error has ocurred on the virtual serial port.
+		 *  to indicate that a parity error has occurred on the virtual serial port.
 		 */
 		#define CONTROL_LINE_IN_PARITYERROR  (1 << 5)
 
 		/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
-		 *  to indicate that a data overrun error has ocurred on the virtual serial port.
+		 *  to indicate that a data overrun error has occurred on the virtual serial port.
 		 */
 		#define CONTROL_LINE_IN_OVERRUNERROR (1 << 6)
 		
@@ -139,7 +138,7 @@
 			uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the
 			                      *   CDCDevice_LineCodingParity_t enum
 			                      */
-			uint8_t  DataBits; /**< Bits of data per charater of the virtual serial port */
+			uint8_t  DataBits; /**< Bits of data per character of the virtual serial port */
 		} CDC_Line_Coding_t;
 		
 		/** Type define for a CDC notification, sent to the host via the CDC notification endpoint to indicate a