Squashed 'lib/lufa/' changes from f2bd51f4e..bbdc9ac40

bbdc9ac40 Merge pull request #1 from fredizzimo/fix_line_endings
75ba27b8d Fix xml file line endings
7a8237259 Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b'
713c65b5b Merge commit 'cedfbfcb1a9ad9cf93816f1952fc4bf7c55fbb61'
00e20c453 delete old lufa

git-subtree-dir: lib/lufa
git-subtree-split: bbdc9ac40c2ff543bbaf3870d407d0a96c945c1a

28 files changed, 1769 insertions, 1769 deletions

diff --git a/Demos/Device/ClassDriver/AudioInput/asf.xml b/Demos/Device/ClassDriver/AudioInput/asf.xml
index 466de73033..a915925af6 100644
--- a/Demos/Device/ClassDriver/AudioInput/asf.xml
+++ b/Demos/Device/ClassDriver/AudioInput/asf.xml
@@ -1,52 +1,52 @@
-<asf xmlversion="1.0">

-	<project caption="Audio Input Device Demo (Class Driver APIs)" id="lufa.demos.device.class.audio_input.example.avr8">

-		<require idref="lufa.demos.device.class.audio_input"/>

-		<require idref="lufa.boards.dummy.avr8"/>

-		<generator value="as5_8"/>

-

-		<device-support value="at90usb1287"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="16000000UL"/>

-		<build type="define" name="F_USB" value="16000000UL"/>

-	</project>

-

-	<module type="application" id="lufa.demos.device.class.audio_input" caption="Audio Input Device Demo (Class Driver APIs)">

-		<info type="description" value="summary">

-		Audio 1.0 Input device demo, implementing a basic USB microphone. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.

-		</info>

-

- 		<info type="gui-flag" value="move-to-root"/>

-

-		<info type="keyword" value="Technology">

-			<keyword value="Class Driver APIs"/>

-			<keyword value="USB Device"/>

-			<keyword value="Audio Class"/>

-		</info>

-

-		<device-support-alias value="lufa_avr8"/>

-		<device-support-alias value="lufa_xmega"/>

-		<device-support-alias value="lufa_uc3"/>

-

-		<build type="distribute" subtype="user-file" value="doxyfile"/>

-		<build type="distribute" subtype="user-file" value="AudioInput.txt"/>

-

-		<build type="c-source" value="AudioInput.c"/>

-		<build type="c-source" value="Descriptors.c"/>

-		<build type="header-file" value="AudioInput.h"/>

-		<build type="header-file" value="Descriptors.h"/>

-

-		<build type="module-config" subtype="path" value="Config"/>

-		<build type="module-config" subtype="required-header-file" value="AppConfig.h"/>

-		<build type="header-file" value="Config/AppConfig.h"/>

-		<build type="header-file" value="Config/LUFAConfig.h"/>

-

-		<require idref="lufa.common"/>

-		<require idref="lufa.platform"/>

-		<require idref="lufa.drivers.usb"/>

-		<require idref="lufa.drivers.peripheral.adc"/>

-		<require idref="lufa.drivers.board"/>

-		<require idref="lufa.drivers.board.leds"/>

-		<require idref="lufa.drivers.board.buttons"/>

-	</module>

-</asf>

+<asf xmlversion="1.0">
+	<project caption="Audio Input Device Demo (Class Driver APIs)" id="lufa.demos.device.class.audio_input.example.avr8">
+		<require idref="lufa.demos.device.class.audio_input"/>
+		<require idref="lufa.boards.dummy.avr8"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="none"/>
+
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.class.audio_input" caption="Audio Input Device Demo (Class Driver APIs)">
+		<info type="description" value="summary">
+		Audio 1.0 Input device demo, implementing a basic USB microphone. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.
+		</info>
+
+ 		<info type="gui-flag" value="move-to-root"/>
+
+		<info type="keyword" value="Technology">
+			<keyword value="Class Driver APIs"/>
+			<keyword value="USB Device"/>
+			<keyword value="Audio Class"/>
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="distribute" subtype="user-file" value="doxyfile"/>
+		<build type="distribute" subtype="user-file" value="AudioInput.txt"/>
+
+		<build type="c-source" value="AudioInput.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="AudioInput.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="module-config" subtype="required-header-file" value="AppConfig.h"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.peripheral.adc"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+	</module>
+</asf>
diff --git a/Demos/Device/ClassDriver/AudioOutput/asf.xml b/Demos/Device/ClassDriver/AudioOutput/asf.xml
index f46f3a0f19..b372ac6086 100644
--- a/Demos/Device/ClassDriver/AudioOutput/asf.xml
+++ b/Demos/Device/ClassDriver/AudioOutput/asf.xml
@@ -1,50 +1,50 @@
-<asf xmlversion="1.0">

-	<project caption="Audio Output Device Demo (Class Driver APIs)" id="lufa.demos.device.class.audio_output.example.avr8">

-		<require idref="lufa.demos.device.class.audio_output"/>

-		<require idref="lufa.boards.dummy.avr8"/>

-		<generator value="as5_8"/>

-

-		<device-support value="at90usb1287"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="16000000UL"/>

-		<build type="define" name="F_USB" value="16000000UL"/>

-	</project>

-

-	<module type="application" id="lufa.demos.device.class.audio_output" caption="Audio Output Device Demo (Class Driver APIs)">

-		<info type="description" value="summary">

-		Audio 1.0 Output device demo, implementing a basic USB speaker. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.

-		</info>

-

- 		<info type="gui-flag" value="move-to-root"/>

-

-		<info type="keyword" value="Technology">

-			<keyword value="Class Driver APIs"/>

-			<keyword value="USB Device"/>

-			<keyword value="Audio Class"/>

-		</info>

-

-		<device-support-alias value="lufa_avr8"/>

-		<device-support-alias value="lufa_xmega"/>

-		<device-support-alias value="lufa_uc3"/>

-

-		<build type="distribute" subtype="user-file" value="doxyfile"/>

-		<build type="distribute" subtype="user-file" value="AudioOutput.txt"/>

-

-		<build type="c-source" value="AudioOutput.c"/>

-		<build type="c-source" value="Descriptors.c"/>

-		<build type="header-file" value="AudioOutput.h"/>

-		<build type="header-file" value="Descriptors.h"/>

-

-		<build type="module-config" subtype="path" value="Config"/>

-		<build type="module-config" subtype="required-header-file" value="AppConfig.h"/>

-		<build type="header-file" value="Config/AppConfig.h"/>

-		<build type="header-file" value="Config/LUFAConfig.h"/>

-

-		<require idref="lufa.common"/>

-		<require idref="lufa.platform"/>

-		<require idref="lufa.drivers.usb"/>

-		<require idref="lufa.drivers.board"/>

-		<require idref="lufa.drivers.board.leds"/>

-	</module>

-</asf>

+<asf xmlversion="1.0">
+	<project caption="Audio Output Device Demo (Class Driver APIs)" id="lufa.demos.device.class.audio_output.example.avr8">
+		<require idref="lufa.demos.device.class.audio_output"/>
+		<require idref="lufa.boards.dummy.avr8"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="none"/>
+
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.class.audio_output" caption="Audio Output Device Demo (Class Driver APIs)">
+		<info type="description" value="summary">
+		Audio 1.0 Output device demo, implementing a basic USB speaker. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.
+		</info>
+
+ 		<info type="gui-flag" value="move-to-root"/>
+
+		<info type="keyword" value="Technology">
+			<keyword value="Class Driver APIs"/>
+			<keyword value="USB Device"/>
+			<keyword value="Audio Class"/>
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="distribute" subtype="user-file" value="doxyfile"/>
+		<build type="distribute" subtype="user-file" value="AudioOutput.txt"/>
+
+		<build type="c-source" value="AudioOutput.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="AudioOutput.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="module-config" subtype="required-header-file" value="AppConfig.h"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml b/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
index e00f339954..d136f1c8b5 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
@@ -1,62 +1,62 @@
-<asf xmlversion="1.0">

-	<project caption="Dual Virtual Serial Device Demo (Class Driver APIs)" id="lufa.demos.device.class.dual_cdc.example.avr8">

-		<require idref="lufa.demos.device.class.dual_cdc"/>

-		<require idref="lufa.boards.dummy.avr8"/>

-		<generator value="as5_8"/>

-

-		<device-support value="at90usb1287"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="16000000UL"/>

-		<build type="define" name="F_USB" value="16000000UL"/>

-	</project>

-

-	<project caption="Dual Virtual Serial Device Demo (Class Driver APIs)" id="lufa.demos.device.class.dual_cdc.example.xmega">

-		<require idref="lufa.demos.device.class.dual_cdc"/>

-		<require idref="lufa.boards.dummy.xmega"/>

-		<generator value="as5_8"/>

-

-		<device-support value="atxmega128a1u"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="32000000UL"/>

-		<build type="define" name="F_USB" value="48000000UL"/>

-	</project>

-

-	<module type="application" id="lufa.demos.device.class.dual_cdc" caption="Dual Virtual Serial Device Demo (Class Driver APIs)">

-		<info type="description" value="summary">

-		Dual Virtual Serial (CDC) demo, implementing a pair of virtual serial port interfaces. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.

-		</info>

-

- 		<info type="gui-flag" value="move-to-root"/>

-

-		<info type="keyword" value="Technology">

-			<keyword value="Class Driver APIs"/>

-			<keyword value="USB Device"/>

-			<keyword value="CDC Class"/>

-		</info>

-

-		<device-support-alias value="lufa_avr8"/>

-		<device-support-alias value="lufa_xmega"/>

-		<device-support-alias value="lufa_uc3"/>

-

-		<build type="distribute" subtype="user-file" value="doxyfile"/>

-		<build type="distribute" subtype="user-file" value="DualVirtualSerial.txt"/>

-		<build type="distribute" subtype="user-file" value="LUFA DualVirtualSerial.inf"/>

-

-		<build type="c-source" value="DualVirtualSerial.c"/>

-		<build type="c-source" value="Descriptors.c"/>

-		<build type="header-file" value="DualVirtualSerial.h"/>

-		<build type="header-file" value="Descriptors.h"/>

-

-		<build type="module-config" subtype="path" value="Config"/>

-		<build type="header-file" value="Config/LUFAConfig.h"/>

-

-		<require idref="lufa.common"/>

-		<require idref="lufa.platform"/>

-		<require idref="lufa.drivers.usb"/>

-		<require idref="lufa.drivers.board"/>

-		<require idref="lufa.drivers.board.leds"/>

-		<require idref="lufa.drivers.board.joystick"/>

-	</module>

-</asf>

+<asf xmlversion="1.0">
+	<project caption="Dual Virtual Serial Device Demo (Class Driver APIs)" id="lufa.demos.device.class.dual_cdc.example.avr8">
+		<require idref="lufa.demos.device.class.dual_cdc"/>
+		<require idref="lufa.boards.dummy.avr8"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="none"/>
+
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
+	</project>
+
+	<project caption="Dual Virtual Serial Device Demo (Class Driver APIs)" id="lufa.demos.device.class.dual_cdc.example.xmega">
+		<require idref="lufa.demos.device.class.dual_cdc"/>
+		<require idref="lufa.boards.dummy.xmega"/>
+		<generator value="as5_8"/>
+
+		<device-support value="atxmega128a1u"/>
+		<config name="lufa.drivers.board.name" value="none"/>
+
+		<build type="define" name="F_CPU" value="32000000UL"/>
+		<build type="define" name="F_USB" value="48000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.class.dual_cdc" caption="Dual Virtual Serial Device Demo (Class Driver APIs)">
+		<info type="description" value="summary">
+		Dual Virtual Serial (CDC) demo, implementing a pair of virtual serial port interfaces. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.
+		</info>
+
+ 		<info type="gui-flag" value="move-to-root"/>
+
+		<info type="keyword" value="Technology">
+			<keyword value="Class Driver APIs"/>
+			<keyword value="USB Device"/>
+			<keyword value="CDC Class"/>
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="distribute" subtype="user-file" value="doxyfile"/>
+		<build type="distribute" subtype="user-file" value="DualVirtualSerial.txt"/>
+		<build type="distribute" subtype="user-file" value="LUFA DualVirtualSerial.inf"/>
+
+		<build type="c-source" value="DualVirtualSerial.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="DualVirtualSerial.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.joystick"/>
+	</module>
+</asf>
diff --git a/Demos/Device/ClassDriver/GenericHID/asf.xml b/Demos/Device/ClassDriver/GenericHID/asf.xml
index 710f7c719d..df8b08b656 100644
--- a/Demos/Device/ClassDriver/GenericHID/asf.xml
+++ b/Demos/Device/ClassDriver/GenericHID/asf.xml
@@ -1,63 +1,63 @@
-<asf xmlversion="1.0">

-	<project caption="Generic HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.generic_hid.example.avr8">

-		<require idref="lufa.demos.device.class.generic_hid"/>

-		<require idref="lufa.boards.dummy.avr8"/>

-		<generator value="as5_8"/>

-

-		<device-support value="at90usb1287"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="16000000UL"/>

-		<build type="define" name="F_USB" value="16000000UL"/>

-	</project>

-

-	<project caption="Generic HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.generic_hid.example.xmega">

-		<require idref="lufa.demos.device.class.generic_hid"/>

-		<require idref="lufa.boards.dummy.xmega"/>

-		<generator value="as5_8"/>

-

-		<device-support value="atxmega128a1u"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="32000000UL"/>

-		<build type="define" name="F_USB" value="48000000UL"/>

-	</project>

-

-	<module type="application" id="lufa.demos.device.class.generic_hid" caption="Generic HID Device Demo (Class Driver APIs)">

-		<info type="description" value="summary">

-		Generic HID device demo, implementing a device whose LEDs can be controlled via HID messages from the host. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.

-		</info>

-

- 		<info type="gui-flag" value="move-to-root"/>

-

-		<info type="keyword" value="Technology">

-			<keyword value="Class Driver APIs"/>

-			<keyword value="USB Device"/>

-			<keyword value="HID Class"/>

-		</info>

-

-		<device-support-alias value="lufa_avr8"/>

-		<device-support-alias value="lufa_xmega"/>

-		<device-support-alias value="lufa_uc3"/>

-

-		<build type="distribute" subtype="user-file" value="doxyfile"/>

-		<build type="distribute" subtype="user-file" value="GenericHID.txt"/>

-		<build type="distribute" subtype="directory" value="HostTestApp"/>

-

-		<build type="c-source" value="GenericHID.c"/>

-		<build type="c-source" value="Descriptors.c"/>

-		<build type="header-file" value="GenericHID.h"/>

-		<build type="header-file" value="Descriptors.h"/>

-

-		<build type="module-config" subtype="path" value="Config"/>

-		<build type="module-config" subtype="required-header-file" value="AppConfig.h"/>

-		<build type="header-file" value="Config/AppConfig.h"/>

-		<build type="header-file" value="Config/LUFAConfig.h"/>

-

-		<require idref="lufa.common"/>

-		<require idref="lufa.platform"/>

-		<require idref="lufa.drivers.usb"/>

-		<require idref="lufa.drivers.board"/>

-		<require idref="lufa.drivers.board.leds"/>

-	</module>

-</asf>

+<asf xmlversion="1.0">
+	<project caption="Generic HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.generic_hid.example.avr8">
+		<require idref="lufa.demos.device.class.generic_hid"/>
+		<require idref="lufa.boards.dummy.avr8"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="none"/>
+
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
+	</project>
+
+	<project caption="Generic HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.generic_hid.example.xmega">
+		<require idref="lufa.demos.device.class.generic_hid"/>
+		<require idref="lufa.boards.dummy.xmega"/>
+		<generator value="as5_8"/>
+
+		<device-support value="atxmega128a1u"/>
+		<config name="lufa.drivers.board.name" value="none"/>
+
+		<build type="define" name="F_CPU" value="32000000UL"/>
+		<build type="define" name="F_USB" value="48000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.class.generic_hid" caption="Generic HID Device Demo (Class Driver APIs)">
+		<info type="description" value="summary">
+		Generic HID device demo, implementing a device whose LEDs can be controlled via HID messages from the host. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.
+		</info>
+
+ 		<info type="gui-flag" value="move-to-root"/>
+
+		<info type="keyword" value="Technology">
+			<keyword value="Class Driver APIs"/>
+			<keyword value="USB Device"/>
+			<keyword value="HID Class"/>
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="distribute" subtype="user-file" value="doxyfile"/>
+		<build type="distribute" subtype="user-file" value="GenericHID.txt"/>
+		<build type="distribute" subtype="directory" value="HostTestApp"/>
+
+		<build type="c-source" value="GenericHID.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="GenericHID.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="module-config" subtype="required-header-file" value="AppConfig.h"/>
+		<build type="header-file" value="Config/AppConfig.h"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+	</module>
+</asf>
diff --git a/Demos/Device/ClassDriver/Joystick/asf.xml b/Demos/Device/ClassDriver/Joystick/asf.xml
index 97d37a5aaf..cd7b72c0c9 100644
--- a/Demos/Device/ClassDriver/Joystick/asf.xml
+++ b/Demos/Device/ClassDriver/Joystick/asf.xml
@@ -1,62 +1,62 @@
-<asf xmlversion="1.0">

-	<project caption="Joystick HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.joystick.example.avr8">

-		<require idref="lufa.demos.device.class.joystick"/>

-		<require idref="lufa.boards.dummy.avr8"/>

-		<generator value="as5_8"/>

-

-		<device-support value="at90usb1287"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="16000000UL"/>

-		<build type="define" name="F_USB" value="16000000UL"/>

-	</project>

-

-	<project caption="Joystick HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.joystick.example.xmega">

-		<require idref="lufa.demos.device.class.joystick"/>

-		<require idref="lufa.boards.dummy.xmega"/>

-		<generator value="as5_8"/>

-

-		<device-support value="atxmega128a1u"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="32000000UL"/>

-		<build type="define" name="F_USB" value="48000000UL"/>

-	</project>

-

-	<module type="application" id="lufa.demos.device.class.joystick" caption="Joystick HID Device Demo (Class Driver APIs)">

-		<info type="description" value="summary">

-		Joystick HID device demo, implementing a basic USB joystick that can send movement information to the host. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.

-		</info>

-

- 		<info type="gui-flag" value="move-to-root"/>

-

-		<info type="keyword" value="Technology">

-			<keyword value="Class Driver APIs"/>

-			<keyword value="USB Device"/>

-			<keyword value="HID Class"/>

-		</info>

-

-		<device-support-alias value="lufa_avr8"/>

-		<device-support-alias value="lufa_xmega"/>

-		<device-support-alias value="lufa_uc3"/>

-

-		<build type="distribute" subtype="user-file" value="doxyfile"/>

-		<build type="distribute" subtype="user-file" value="Joystick.txt"/>

-

-		<build type="c-source" value="Joystick.c"/>

-		<build type="c-source" value="Descriptors.c"/>

-		<build type="header-file" value="Joystick.h"/>

-		<build type="header-file" value="Descriptors.h"/>

-

-		<build type="module-config" subtype="path" value="Config"/>

-		<build type="header-file" value="Config/LUFAConfig.h"/>

-

-		<require idref="lufa.common"/>

-		<require idref="lufa.platform"/>

-		<require idref="lufa.drivers.usb"/>

-		<require idref="lufa.drivers.board"/>

-		<require idref="lufa.drivers.board.leds"/>

-		<require idref="lufa.drivers.board.buttons"/>

-		<require idref="lufa.drivers.board.joystick"/>

-	</module>

-</asf>

+<asf xmlversion="1.0">
+	<project caption="Joystick HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.joystick.example.avr8">
+		<require idref="lufa.demos.device.class.joystick"/>
+		<require idref="lufa.boards.dummy.avr8"/>
+		<generator value="as5_8"/>
+
+		<device-support value="at90usb1287"/>
+		<config name="lufa.drivers.board.name" value="none"/>
+
+		<build type="define" name="F_CPU" value="16000000UL"/>
+		<build type="define" name="F_USB" value="16000000UL"/>
+	</project>
+
+	<project caption="Joystick HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.joystick.example.xmega">
+		<require idref="lufa.demos.device.class.joystick"/>
+		<require idref="lufa.boards.dummy.xmega"/>
+		<generator value="as5_8"/>
+
+		<device-support value="atxmega128a1u"/>
+		<config name="lufa.drivers.board.name" value="none"/>
+
+		<build type="define" name="F_CPU" value="32000000UL"/>
+		<build type="define" name="F_USB" value="48000000UL"/>
+	</project>
+
+	<module type="application" id="lufa.demos.device.class.joystick" caption="Joystick HID Device Demo (Class Driver APIs)">
+		<info type="description" value="summary">
+		Joystick HID device demo, implementing a basic USB joystick that can send movement information to the host. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.
+		</info>
+
+ 		<info type="gui-flag" value="move-to-root"/>
+
+		<info type="keyword" value="Technology">
+			<keyword value="Class Driver APIs"/>
+			<keyword value="USB Device"/>
+			<keyword value="HID Class"/>
+		</info>
+
+		<device-support-alias value="lufa_avr8"/>
+		<device-support-alias value="lufa_xmega"/>
+		<device-support-alias value="lufa_uc3"/>
+
+		<build type="distribute" subtype="user-file" value="doxyfile"/>
+		<build type="distribute" subtype="user-file" value="Joystick.txt"/>
+
+		<build type="c-source" value="Joystick.c"/>
+		<build type="c-source" value="Descriptors.c"/>
+		<build type="header-file" value="Joystick.h"/>
+		<build type="header-file" value="Descriptors.h"/>
+
+		<build type="module-config" subtype="path" value="Config"/>
+		<build type="header-file" value="Config/LUFAConfig.h"/>
+
+		<require idref="lufa.common"/>
+		<require idref="lufa.platform"/>
+		<require idref="lufa.drivers.usb"/>
+		<require idref="lufa.drivers.board"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+		<require idref="lufa.drivers.board.joystick"/>
+	</module>
+</asf>
diff --git a/Demos/Device/ClassDriver/Keyboard/asf.xml b/Demos/Device/ClassDriver/Keyboard/asf.xml
index d7cdc17bcc..6adef2e4f6 100644
--- a/Demos/Device/ClassDriver/Keyboard/asf.xml
+++ b/Demos/Device/ClassDriver/Keyboard/asf.xml
@@ -1,62 +1,62 @@
-<asf xmlversion="1.0">

-	<project caption="Keyboard HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.keyboard.example.avr8">

-		<require idref="lufa.demos.device.class.keyboard"/>

-		<require idref="lufa.boards.dummy.avr8"/>

-		<generator value="as5_8"/>

-

-		<device-support value="at90usb1287"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="16000000UL"/>

-		<build type="define" name="F_USB" value="16000000UL"/>

-	</project>

-

-	<project caption="Keyboard HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.keyboard.example.xmega">

-		<require idref="lufa.demos.device.class.keyboard"/>

-		<require idref="lufa.boards.dummy.xmega"/>

-		<generator value="as5_8"/>

-

-		<device-support value="atxmega128a1u"/>

-		<config name="lufa.drivers.board.name" value="none"/>

-

-		<build type="define" name="F_CPU" value="32000000UL"/>

-		<build type="define" name="F_USB" value="48000000UL"/>

-	</project>

-

-	<module type="application" id="lufa.demos.device.class.keyboard" caption="Keyboard HID Device Demo (Class Driver APIs)">

-		<info type="description" value="summary">

-		Keyboard HID device demo, implementing a basic USB keyboard that can send key press information to the host. This demo uses the user-friendly USB Class Driver APIs to provide a simple, abstracted interface into the USB stack.

-		</info>

-

- 		<info type="gui-flag" value="move-to-root"/>

-

-		<info type="keyword" value="Technology">

-			<keyword value="Class Driver APIs"/>

-			<keyword value="USB Device"/>

-			<keyword value="HID Class"/>

-		</info>

-

-		<device-support-alias value="lufa_avr8"/>

-		<device-support-alias value="lufa_xmega"/>

-		<device-support-alias value="lufa_uc3"/>

-

-		<build type="distribute" subtype="user-file" value="doxyfile"/>

-		<build type="distribute" subtype="user-file" value="Keyboard.txt"/>

-

-		<build type="c-source" value="Keyboard.c"/>

-		<build type="c-source" value="Descriptors.c"/>

-		<build type="header-file" value="Keyboard.h"/>

-		<build type="header-file" value="Descriptors.h"/>

-

-		<build type="module-config" subtype="path" value="Config"/>

-		<build type="header-file" value="Config/LUFAConfig.