aboutsummaryrefslogtreecommitdiff
path: root/Demos
diff options
context:
space:
mode:
Diffstat (limited to 'Demos')
-rw-r--r--Demos/Device/AudioInput/AudioInput.h2
-rw-r--r--Demos/Device/RNDISEthernet/ProtocolDecoders.h2
-rw-r--r--Demos/Device/RNDISEthernet/RNDISEthernet.h2
-rw-r--r--Demos/Device/RNDISEthernet/makefile4
-rw-r--r--Demos/Device/USBtoSerial/USBtoSerial.h2
-rw-r--r--Demos/Device/USBtoSerial/makefile2
-rw-r--r--Demos/Host/CDCHost/CDCHost.h2
-rw-r--r--Demos/Host/CDCHost/makefile4
-rw-r--r--Demos/Host/GenericHIDHost/GenericHIDHost.h2
-rw-r--r--Demos/Host/GenericHIDHost/makefile4
-rw-r--r--Demos/Host/KeyboardHost/KeyboardHost.h2
-rw-r--r--Demos/Host/KeyboardHost/makefile4
-rw-r--r--Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h2
-rw-r--r--Demos/Host/KeyboardHostWithParser/makefile4
-rw-r--r--Demos/Host/MassStorageHost/MassStorageHost.h2
-rw-r--r--Demos/Host/MassStorageHost/makefile4
-rw-r--r--Demos/Host/MouseHost/MouseHost.h2
-rw-r--r--Demos/Host/MouseHost/makefile4
-rw-r--r--Demos/Host/MouseHostWithParser/MouseHostWithParser.h2
-rw-r--r--Demos/Host/MouseHostWithParser/makefile4
-rw-r--r--Demos/Host/StillImageHost/StillImageHost.h2
-rw-r--r--Demos/Host/StillImageHost/makefile4
-rw-r--r--Demos/OTG/TestApp/TestApp.c2
-rw-r--r--Demos/OTG/TestApp/TestApp.h4
-rw-r--r--Demos/OTG/TestApp/TestEvents.h2
-rw-r--r--Demos/OTG/TestApp/makefile4
26 files changed, 37 insertions, 37 deletions
diff --git a/Demos/Device/AudioInput/AudioInput.h b/Demos/Device/AudioInput/AudioInput.h
index c068baff99..b7174d1f89 100644
--- a/Demos/Device/AudioInput/AudioInput.h
+++ b/Demos/Device/AudioInput/AudioInput.h
@@ -46,7 +46,7 @@
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
- #include <LUFA/Drivers/AT90USBXXX/ADC.h> // ADC driver
+ #include <LUFA/Drivers/Peripheral/ADC.h> // ADC driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
/* Macros: */
diff --git a/Demos/Device/RNDISEthernet/ProtocolDecoders.h b/Demos/Device/RNDISEthernet/ProtocolDecoders.h
index 06e4c0ad46..c8101162d6 100644
--- a/Demos/Device/RNDISEthernet/ProtocolDecoders.h
+++ b/Demos/Device/RNDISEthernet/ProtocolDecoders.h
@@ -39,7 +39,7 @@
/* Includes: */
#include <avr/io.h>
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h>
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h>
#include "EthernetProtocols.h"
#include "Ethernet.h"
diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.h b/Demos/Device/RNDISEthernet/RNDISEthernet.h
index f21ace774b..732ad53809 100644
--- a/Demos/Device/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.h
@@ -56,7 +56,7 @@
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h>
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h>
/* Macros: */
/** Notification value to indicate that a frame is ready to be read by the host. */
diff --git a/Demos/Device/RNDISEthernet/makefile b/Demos/Device/RNDISEthernet/makefile
index 1a068a0336..23de96761c 100644
--- a/Demos/Device/RNDISEthernet/makefile
+++ b/Demos/Device/RNDISEthernet/makefile
@@ -143,8 +143,8 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
# List C++ source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h
index 8fb2c16176..0352f5d75f 100644
--- a/Demos/Device/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/USBtoSerial/USBtoSerial.h
@@ -47,7 +47,7 @@
#include <LUFA/Version.h> // Library Version Information
#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
diff --git a/Demos/Device/USBtoSerial/makefile b/Demos/Device/USBtoSerial/makefile
index 62939ab60a..650a677041 100644
--- a/Demos/Device/USBtoSerial/makefile
+++ b/Demos/Device/USBtoSerial/makefile
@@ -127,7 +127,7 @@ SRC = $(TARGET).c \
Descriptors.c \
RingBuff.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
diff --git a/Demos/Host/CDCHost/CDCHost.h b/Demos/Host/CDCHost/CDCHost.h
index c348acaefe..48f480791b 100644
--- a/Demos/Host/CDCHost/CDCHost.h
+++ b/Demos/Host/CDCHost/CDCHost.h
@@ -46,7 +46,7 @@
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/Host/CDCHost/makefile b/Demos/Host/CDCHost/makefile
index 80b986ad5f..4c5dc1e43b 100644
--- a/Demos/Host/CDCHost/makefile
+++ b/Demos/Host/CDCHost/makefile
@@ -126,8 +126,8 @@ LUFA_PATH = ../../..
SRC = $(TARGET).c \
ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.h b/Demos/Host/GenericHIDHost/GenericHIDHost.h
index 8483fa6863..008188a61b 100644
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.h
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.h
@@ -47,7 +47,7 @@
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/Host/GenericHIDHost/makefile b/Demos/Host/GenericHIDHost/makefile
index 32e32aaea8..d54317a691 100644
--- a/Demos/Host/GenericHIDHost/makefile
+++ b/Demos/Host/GenericHIDHost/makefile
@@ -126,8 +126,8 @@ LUFA_PATH = ../../..
SRC = $(TARGET).c \
ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
diff --git a/Demos/Host/KeyboardHost/KeyboardHost.h b/Demos/Host/KeyboardHost/KeyboardHost.h
index 2c541f6a53..14d92c0c6f 100644
--- a/Demos/Host/KeyboardHost/KeyboardHost.h
+++ b/Demos/Host/KeyboardHost/KeyboardHost.h
@@ -47,7 +47,7 @@
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/Host/KeyboardHost/makefile b/Demos/Host/KeyboardHost/makefile
index cb720f2bf0..9d65c436e0 100644
--- a/Demos/Host/KeyboardHost/makefile
+++ b/Demos/Host/KeyboardHost/makefile
@@ -126,8 +126,8 @@ LUFA_PATH = ../../..
SRC = $(TARGET).c \
ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
diff --git a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h
index 112dbfdecf..d142bda9dd 100644
--- a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h
+++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h
@@ -41,7 +41,7 @@
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/Host/KeyboardHostWithParser/makefile b/Demos/Host/KeyboardHostWithParser/makefile
index 0a2e95eaca..7a74768d78 100644
--- a/Demos/Host/KeyboardHostWithParser/makefile
+++ b/Demos/Host/KeyboardHostWithParser/makefile
@@ -127,8 +127,8 @@ SRC = $(TARGET).c \
ConfigDescriptor.c \
HIDReport.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h
index 73a69c0d8d..3791d27342 100644
--- a/Demos/Host/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/MassStorageHost/MassStorageHost.h
@@ -50,7 +50,7 @@
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Drivers/Board/HWB.h> // Hardware Button driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/Host/MassStorageHost/makefile b/Demos/Host/MassStorageHost/makefile
index 5d853e4bea..bfa40726f2 100644
--- a/Demos/Host/MassStorageHost/makefile
+++ b/Demos/Host/MassStorageHost/makefile
@@ -127,8 +127,8 @@ SRC = $(TARGET).c \
ConfigDescriptor.c \
MassStoreCommands.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
diff --git a/Demos/Host/MouseHost/MouseHost.h b/Demos/Host/MouseHost/MouseHost.h
index c7e5d2be2c..a87d6f874f 100644
--- a/Demos/Host/MouseHost/MouseHost.h
+++ b/Demos/Host/MouseHost/MouseHost.h
@@ -47,7 +47,7 @@
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/Host/MouseHost/makefile b/Demos/Host/MouseHost/makefile
index 65c9dd676b..bde4df2098 100644
--- a/Demos/Host/MouseHost/makefile
+++ b/Demos/Host/MouseHost/makefile
@@ -126,8 +126,8 @@ LUFA_PATH = ../../..
SRC = $(TARGET).c \
ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h
index f808745d75..746ffe159f 100644
--- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.h
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h
@@ -41,7 +41,7 @@
#include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/Host/MouseHostWithParser/makefile b/Demos/Host/MouseHostWithParser/makefile
index bc4ca6ca25..5d9d2da4ce 100644
--- a/Demos/Host/MouseHostWithParser/makefile
+++ b/Demos/Host/MouseHostWithParser/makefile
@@ -127,8 +127,8 @@ SRC = $(TARGET).c \
ConfigDescriptor.c \
HIDReport.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
diff --git a/Demos/Host/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h
index e4d2e85f88..a1ea47f62d 100644
--- a/Demos/Host/StillImageHost/StillImageHost.h
+++ b/Demos/Host/StillImageHost/StillImageHost.h
@@ -48,7 +48,7 @@
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LED driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/Host/StillImageHost/makefile b/Demos/Host/StillImageHost/makefile
index e34c18f39c..82aa7284d5 100644
--- a/Demos/Host/StillImageHost/makefile
+++ b/Demos/Host/StillImageHost/makefile
@@ -126,8 +126,8 @@ SRC = $(TARGET).c \
ConfigDescriptor.c \
StillImageCommands.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c
index e72c191b3a..d5a752322d 100644
--- a/Demos/OTG/TestApp/TestApp.c
+++ b/Demos/OTG/TestApp/TestApp.c
@@ -130,7 +130,7 @@ TASK(TestApp_CheckTemp)
if (Scheduler_HasDelayElapsed(10000, &DelayCounter))
{
printf_P(PSTR("Current temperature: %d Degrees Celcius\r\n\r\n"),
- (int)Temperature_GetTemperature());
+ (int8_t)Temperature_GetTemperature());
/* Reset the delay counter, ready to count another 10000 tick interval */
Scheduler_ResetDelay(&DelayCounter);
diff --git a/Demos/OTG/TestApp/TestApp.h b/Demos/OTG/TestApp/TestApp.h
index bf2d56098e..5e88dae619 100644
--- a/Demos/OTG/TestApp/TestApp.h
+++ b/Demos/OTG/TestApp/TestApp.h
@@ -47,8 +47,8 @@
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include <LUFA/MemoryAllocator/DynAlloc.h> // Auto-defragmenting Dynamic Memory allocation
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
- #include <LUFA/Drivers/AT90USBXXX/ADC.h> // ADC driver
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // USART Stream driver
+ #include <LUFA/Drivers/Peripheral/ADC.h> // ADC driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // USART Stream driver
#include <LUFA/Drivers/Board/Joystick.h> // Joystick driver
#include <LUFA/Drivers/Board/LEDs.h> // LED driver
#include <LUFA/Drivers/Board/HWB.h> // Hardware Button driver
diff --git a/Demos/OTG/TestApp/TestEvents.h b/Demos/OTG/TestApp/TestEvents.h
index 6ba06aed84..adaf875954 100644
--- a/Demos/OTG/TestApp/TestEvents.h
+++ b/Demos/OTG/TestApp/TestEvents.h
@@ -42,7 +42,7 @@
#include <LUFA/Common/Common.h> // Commonly used macros
#include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/Board/LEDs.h> // LED driver
- #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // USART Stream driver
+ #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // USART Stream driver
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile
index 0d19831754..a7429669ef 100644
--- a/Demos/OTG/TestApp/makefile
+++ b/Demos/OTG/TestApp/makefile
@@ -129,8 +129,8 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/MemoryAllocator/DynAlloc.c \
$(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \
- $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
+ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \