Fixed inability to enumerate any devices while in host mode (broken in a previous...

[pub/USBasp.git] / Demos / Device / USBtoSerial / USBtoSerial.h

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