Move out class driver modules into seperate AS6 integration modules, add ability to disable host/device/both modes for faster compilation.

11 files changed, 830 insertions, 151 deletions

diff --git a/LUFA/StudioIntegration/XDK/lufa_module_transform.xslt b/LUFA/StudioIntegration/XDK/lufa_module_transform.xslt
index 9146202a4..ee9a050c1 100644
--- a/LUFA/StudioIntegration/XDK/lufa_module_transform.xslt
+++ b/LUFA/StudioIntegration/XDK/lufa_module_transform.xslt
@@ -44,17 +44,23 @@
 	     nodes instead and add descriptions, so that they show up as links in
 	     Studio correctly -->
 	<xsl:template match="build[@type='doxygen-entry-point']">
-		<build type="online-help" subtype="module-help-page-append">
-		 	<xsl:attribute name="value">
-		 		<!-- Extract filename of the HTML file that contains the documentation for this module from the Doxgen tag file -->
-			    <xsl:value-of select="document($lufa-doxygen-tagfile)/tagfile/compound[name=current()/@value]/filename"/>
-  			</xsl:attribute>
-  		</build>
-
-		<info type="description" value="summary">
-		 	<!-- Extract brief description of the module from the Doxygen combined XML documentation file -->
-			<xsl:value-of select="document($lufa-doxygen-docfile)/doxygen/compounddef[compoundname=current()/@value]/briefdescription/para"/>
-		</info>
+		<!-- select-by-config entries should not have a help link -->
+		<xsl:if test="not(parent::select-by-config)">
+			<build type="online-help" subtype="module-help-page-append">
+			 	<xsl:attribute name="value">
+			 		<!-- Extract filename of the HTML file that contains the documentation for this module from the Doxgen tag file -->
+				    <xsl:value-of select="document($lufa-doxygen-tagfile)/tagfile/compound[name=current()/@value]/filename"/>
+	  			</xsl:attribute>
+	  		</build>
+	  	</xsl:if>
+
+		<!-- Modules inside a select-by-config entries should not have a help link -->
+		<xsl:if test="not(parent::module and ../parent::select-by-config)">
+			<info type="description" value="summary">
+			 	<!-- Extract brief description of the module from the Doxygen combined XML documentation file -->
+				<xsl:value-of select="document($lufa-doxygen-docfile)/doxygen/compounddef[compoundname=current()/@value]/briefdescription/para"/>
+			</info>
+	  	</xsl:if>
 	</xsl:template>
 
 </xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class.xml
index d15a546a9..cd18bf10e 100644
--- a/LUFA/StudioIntegration/lufa_drivers_usb_class.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class.xml
@@ -10,146 +10,6 @@
 

 <lufa>

 	<asf>

-		<module type="service" id="lufa.drivers.usb.class.android" caption="LUFA USB Class Driver - Android Accessory">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassAOA"/>

-

-			<build type="header-file" value="Drivers/USB/Class/AndroidAccessoryClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/AndroidAccessoryClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/AndroidAccessoryClassHost.c"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.usb.class.audio" caption="LUFA USB Class Driver - Audio 1.0">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassAudio"/>

-

-			<build type="header-file" value="Drivers/USB/Class/AudioClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/AudioClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Device/AudioClassDevice.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Device/AudioClassDevice.c"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/AudioClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/AudioClassHost.c"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.usb.class.cdc" caption="LUFA USB Class Driver - CDC">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassCDC"/>

-

-			<build type="header-file" value="Drivers/USB/Class/CDCClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/CDCClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Device/CDCClassDevice.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Device/CDCClassDevice.c"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/CDCClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/CDCClassHost.c"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.usb.class.hid" caption="LUFA USB Class Driver - HID">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassHID"/>

-

-			<build type="header-file" value="Drivers/USB/Class/HIDClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/HIDClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Device/HIDClassDevice.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Device/HIDClassDevice.c"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/HIDClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/HIDClassHost.c"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.usb.class.ms" caption="LUFA USB Class Driver - Mass Storage">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassMS"/>

-

-			<build type="header-file" value="Drivers/USB/Class/MassStorageClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/MassStorageClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Device/MassStorageClassDevice.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Device/MassStorageClassDevice.c"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/MassStorageClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/MassStorageClassHost.c"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.usb.class.midi" caption="LUFA USB Class Driver - MIDI">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassMIDI"/>

-

-			<build type="header-file" value="Drivers/USB/Class/MIDIClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/MIDIClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Device/MIDIClassDevice.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Device/MIDIClassDevice.c"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/MIDIClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/MIDIClassHost.c"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.usb.class.printer" caption="LUFA USB Class Driver - Printer">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassPrinter"/>

-

-			<build type="header-file" value="Drivers/USB/Class/PrinterClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/PrinterClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Device/PrinterClassDevice.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Device/PrinterClassDevice.c"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/PrinterClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/PrinterClassHost.c"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.usb.class.rndis" caption="LUFA USB Class Driver - RNDIS Ethernet">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassRNDIS"/>

-

-			<build type="header-file" value="Drivers/USB/Class/RNDISClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/RNDISClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Device/RNDISClassDevice.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Device/RNDISClassDevice.c"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/RNDISClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/RNDISClassHost.c"/>

-		</module>

-

-		<module type="service" id="lufa.drivers.usb.class.si" caption="LUFA USB Class Driver - Still Image">

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

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

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

-

-			<info type="gui-flag" value="hidden"/>

-			<build type="doxygen-entry-point" value="Group_USBClassSI"/>

-

-			<build type="header-file" value="Drivers/USB/Class/StillImageClass.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Common/StillImageClassCommon.h"/>

-			<build type="header-file" value="Drivers/USB/Class/Host/StillImageClassHost.h"/>

-			<build type="c-source"    value="Drivers/USB/Class/Host/StillImageClassHost.c"/>

-		</module>

-

 		<module type="service" id="lufa.drivers.usb.class" caption="LUFA USB Class Drivers">

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

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

diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_android.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_android.xml
new file mode 100644
index 000000000..345171257
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_android.xml
@@ -0,0 +1,54 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.android" name="lufa.drivers.usb.class.android.mode" default="host" caption="LUFA USB Class Driver - Android Accessory">
+			<build type="doxygen-entry-point" value="Group_USBClassAOA"/>
+
+			<module type="service" id="lufa.drivers.usb.class.android#host" caption="LUFA USB Class Driver - Android Accessory (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the Android Open Accessory USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassAOA"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/AndroidAccessoryClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/AndroidAccessoryClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/AndroidAccessoryClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.android#definitions_only" caption="LUFA USB Class Driver - Android Accessory (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the Android Open Accessory USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassAOA"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/AndroidAccessoryClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/AndroidAccessoryClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_audio.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_audio.xml
new file mode 100644
index 000000000..5f7c3ad4d
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_audio.xml
@@ -0,0 +1,109 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.audio" name="lufa.drivers.usb.class.audio.mode" default="host_device" caption="LUFA USB Class Driver - Audio 1.0">
+			<build type="doxygen-entry-point" value="Group_USBClassAudio"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<module type="service" id="lufa.drivers.usb.class.audio#host_device" caption="LUFA USB Class Driver - Audio 1.0 (Host/Device)">
+				<info type="description" value="summary">
+					Common definitions and Host/Device mode implementations of the Audio 1.0 USB class.
+				</info>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<build type="doxygen-entry-point" value="Group_USBClassAudio"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/AudioClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/AudioClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/AudioClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/AudioClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/AudioClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/AudioClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.audio#host" caption="LUFA USB Class Driver - Audio 1.0 (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the Audio 1.0 USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassAudio"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/AudioClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/AudioClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/AudioClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/AudioClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/AudioClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.audio#device" caption="LUFA USB Class Driver - Audio 1.0 (Device)">
+				<info type="description" value="summary">
+					Common definitions and Device mode implementation of the Audio 1.0 USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassAudio"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/AudioClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/AudioClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/AudioClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/AudioClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/AudioClassHost.h"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.audio#definitions_only" caption="LUFA USB Class Driver - Audio 1.0 (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the Audio 1.0 USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassAudio"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/AudioClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/AudioClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/AudioClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/AudioClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_cdc.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_cdc.xml
new file mode 100644
index 000000000..65d8cc98f
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_cdc.xml
@@ -0,0 +1,99 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.cdc" name="lufa.drivers.usb.class.cdc.mode" default="host_device" caption="LUFA USB Class Driver - CDC">
+			<build type="doxygen-entry-point" value="Group_USBClassCDC"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<module type="service" id="lufa.drivers.usb.class.cdc#host_device" caption="LUFA USB Class Driver - CDC (Host/Device)">
+				<info type="description" value="summary">
+					Common definitions and Host/Device mode implementations of the CDC USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassCDC"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/CDCClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/CDCClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/CDCClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/CDCClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/CDCClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/CDCClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.cdc#host" caption="LUFA USB Class Driver - CDC (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the CDC USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassCDC"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/CDCClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/CDCClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/CDCClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/CDCClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/CDCClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.cdc#device" caption="LUFA USB Class Driver - CDC (Device)">
+				<info type="description" value="summary">
+					Common definitions and Device mode implementation of the CDC USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassCDC"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/CDCClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/CDCClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/CDCClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/CDCClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/CDCClassHost.h"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.cdc#definitions_only" caption="LUFA USB Class Driver - CDC (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the CDC USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassCDC"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/CDCClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/CDCClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/CDCClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/CDCClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_hid.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_hid.xml
new file mode 100644
index 000000000..3d533fb53
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_hid.xml
@@ -0,0 +1,99 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.hid" name="lufa.drivers.usb.class.hid.mode" default="host_device" caption="LUFA USB Class Driver - HID">
+			<build type="doxygen-entry-point" value="Group_USBClassHID"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<module type="service" id="lufa.drivers.usb.class.hid#host_device" caption="LUFA USB Class Driver - HID (Host/Device)">
+				<info type="description" value="summary">
+					Common definitions and Host/Device mode implementations of the HID USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassHID"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/HIDClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/HIDClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/HIDClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/HIDClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/HIDClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/HIDClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.hid#host" caption="LUFA USB Class Driver - HID (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the HID USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassHID"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/HIDClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/HIDClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/HIDClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/HIDClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/HIDClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.hid#device" caption="LUFA USB Class Driver - HID (Device)">
+				<info type="description" value="summary">
+					Common definitions and Device mode implementation of the HID USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassHID"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/HIDClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/HIDClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/HIDClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/HIDClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/HIDClassHost.h"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.hid#definitions_only" caption="LUFA USB Class Driver - HID (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the HID USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassHID"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/HIDClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/HIDClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/HIDClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/HIDClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_midi.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_midi.xml
new file mode 100644
index 000000000..3ddab0bbd
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_midi.xml
@@ -0,0 +1,99 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.midi" name="lufa.drivers.usb.class.midi.mode" default="host_device" caption="LUFA USB Class Driver - MIDI">
+			<build type="doxygen-entry-point" value="Group_USBClassMIDI"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<module type="service" id="lufa.drivers.usb.class.midi#host_device" caption="LUFA USB Class Driver - MIDI (Host/Device)">
+				<info type="description" value="summary">
+					Common definitions and Host/Device mode implementations of the MIDI USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassMIDI"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/MIDIClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/MIDIClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/MIDIClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/MIDIClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/MIDIClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/MIDIClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.midi#host" caption="LUFA USB Class Driver - MIDI (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the MIDI USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassMIDI"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/MIDIClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/MIDIClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/MIDIClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/MIDIClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/MIDIClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.midi#device" caption="LUFA USB Class Driver - MIDI (Device)">
+				<info type="description" value="summary">
+					Common definitions and Device mode implementation of the MIDI USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassMIDI"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/MIDIClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/MIDIClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/MIDIClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/MIDIClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/MIDIClassHost.h"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.midi#definitions_only" caption="LUFA USB Class Driver - MIDI (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the MIDI USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassMIDI"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/MIDIClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/MIDIClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/MIDIClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/MIDIClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_ms.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_ms.xml
new file mode 100644
index 000000000..283b85ca7
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_ms.xml
@@ -0,0 +1,99 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.ms" name="lufa.drivers.usb.class.ms.mode" default="host_device" caption="LUFA USB Class Driver - Mass Storage">
+			<build type="doxygen-entry-point" value="Group_USBClassMS"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<module type="service" id="lufa.drivers.usb.class.ms#host_device" caption="LUFA USB Class Driver - Mass Storage (Host/Device)">
+				<info type="description" value="summary">
+					Common definitions and Host/Device mode implementations of the Mass Storage USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassMS"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/MassStorageClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/MassStorageClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/MassStorageClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/MassStorageClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/MassStorageClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/MassStorageClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.ms#host" caption="LUFA USB Class Driver - Mass Storage (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the Mass Storage USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassMS"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/MassStorageClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/MassStorageClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/MassStorageClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/MassStorageClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/MassStorageClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.ms#device" caption="LUFA USB Class Driver - Mass Storage (Device)">
+				<info type="description" value="summary">
+					Common definitions and Device mode implementation of the Mass Storage USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassMS"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/MassStorageClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/MassStorageClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/MassStorageClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/MassStorageClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/MassStorageClassHost.h"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.ms#definitions_only" caption="LUFA USB Class Driver - Mass Storage (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the Mass Storage USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassMS"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/MassStorageClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/MassStorageClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/MassStorageClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/MassStorageClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_printer.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_printer.xml
new file mode 100644
index 000000000..2465035ce
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_printer.xml
@@ -0,0 +1,99 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.printer" name="lufa.drivers.usb.class.printer.mode" default="host_device" caption="LUFA USB Class Driver - Printer">
+			<build type="doxygen-entry-point" value="Group_USBClassPrinter"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<module type="service" id="lufa.drivers.usb.class.printer#host_device" caption="LUFA USB Class Driver - Printer (Host/Device)">
+				<info type="description" value="summary">
+					Common definitions and Host/Device mode implementations of the Printer USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassPrinter"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/PrinterClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/PrinterClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/PrinterClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/PrinterClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/PrinterClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/PrinterClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.printer#host" caption="LUFA USB Class Driver - Printer (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the Printer USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassPrinter"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/PrinterClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/PrinterClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/PrinterClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/PrinterClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/PrinterClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.printer#device" caption="LUFA USB Class Driver - Printer (Device)">
+				<info type="description" value="summary">
+					Common definitions and Device mode implementation of the Printer USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassPrinter"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/PrinterClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/PrinterClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/PrinterClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/PrinterClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/PrinterClassHost.h"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.printer#definitions_only" caption="LUFA USB Class Driver - Printer (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the Printer USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassPrinter"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/PrinterClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/PrinterClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/PrinterClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/PrinterClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_rndis.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_rndis.xml
new file mode 100644
index 000000000..6a606679d
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_rndis.xml
@@ -0,0 +1,99 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.rndis" name="lufa.drivers.usb.class.rndis.mode" default="host_device" caption="LUFA USB Class Driver - RNDIS Ethernet">
+			<build type="doxygen-entry-point" value="Group_USBClassRNDIS"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<module type="service" id="lufa.drivers.usb.class.rndis#host_device" caption="LUFA USB Class Driver - RNDIS Ethernet (Host/Device)">
+				<info type="description" value="summary">
+					Common definitions and Host/Device mode implementations of the RNDIS Ethernet USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassRNDIS"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/RNDISClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/RNDISClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/RNDISClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/RNDISClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/RNDISClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/RNDISClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.rndis#host" caption="LUFA USB Class Driver - RNDIS Ethernet (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the RNDIS Ethernet USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassRNDIS"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/RNDISClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/RNDISClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/RNDISClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/RNDISClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/RNDISClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.rndis#device" caption="LUFA USB Class Driver - RNDIS Ethernet (Device)">
+				<info type="description" value="summary">
+					Common definitions and Device mode implementation of the RNDIS Ethernet USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassRNDIS"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/RNDISClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/RNDISClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/RNDISClassDevice.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Device/RNDISClassDevice.c"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/RNDISClassHost.h"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.rndis#definitions_only" caption="LUFA USB Class Driver - RNDIS Ethernet (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the RNDIS Ethernet USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassRNDIS"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/RNDISClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/RNDISClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Device/RNDISClassDevice.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/RNDISClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class_si.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class_si.xml
new file mode 100644
index 000000000..c1bf8d560
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class_si.xml
@@ -0,0 +1,56 @@
+<!--
+             LUFA Library
+     Copyright (C) Dean Camera, 2013.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+-->
+
+<!-- Atmel Studio framework integration file -->
+
+<lufa>
+	<asf>
+		<select-by-config id="lufa.drivers.usb.class.si" name="lufa.drivers.usb.class.si.mode" default="host" caption="LUFA USB Class Driver - Still Image">
+			<build type="doxygen-entry-point" value="Group_USBClassSI"/>
+
+			<info type="gui-flag" value="hidden"/>
+
+			<module type="service" id="lufa.drivers.usb.class.si#host" caption="LUFA USB Class Driver - Still Image (Host)">
+				<info type="description" value="summary">
+					Common definitions and Host mode implementation of the Still Image USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassSI"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/StillImageClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/StillImageClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/StillImageClassHost.h"/>
+				<build type="c-source"    value="Drivers/USB/Class/Host/StillImageClassHost.c"/>
+			</module>
+
+			<module type="service" id="lufa.drivers.usb.class.si#definitions_only" caption="LUFA USB Class Driver - Still Image (Definitions Only)">
+				<info type="description" value="summary">
+					Common definitions only (no implementations) of the Still Image USB class.
+				</info>
+
+				<build type="doxygen-entry-point" value="Group_USBClassSI"/>
+
+				<info type="gui-flag" value="hidden"/>
+
+				<device-support-alias value="lufa_avr8"/>
+				<device-support-alias value="lufa_xmega"/>
+				<device-support-alias value="lufa_uc3"/>
+
+				<build type="header-file" value="Drivers/USB/Class/StillImageClass.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Common/StillImageClassCommon.h"/>
+				<build type="header-file" value="Drivers/USB/Class/Host/StillImageClassHost.h"/>
+			</module>
+		</select-by-config>
+	</asf>
+</lufa>