diff --git a/Demos/Device/AudioInput/Descriptors.h b/Demos/Device/AudioInput/Descriptors.h
index c2b4b05e7ef050a21b59d25ba31300a1adae74d0..0da895236e79cf880edb4a2ba47b11aef3e604d2 100644
--- a/Demos/Device/AudioInput/Descriptors.h
+++ b/Demos/Device/AudioInput/Descriptors.h
@@ -38,105 +38,11 @@
 
 	/* Includes: */
 		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/Device/Audio.h>
 
 		#include <avr/pgmspace.h>
 
 	/* Macros: */
-		/** Descriptor header constant to indicate a Audio class interface descriptor. */
-		#define DTYPE_AudioInterface         0x24
-
-		/** Descriptor header constant to indicate a Audio class endpoint descriptor. */
-		#define DTYPE_AudioEndpoint          0x25
-
-		/** Audio class descriptor subtype value for a Audio class specific header descriptor. */
-		#define DSUBTYPE_Header              0x01
-
-		/** Audio class descriptor subtype value for an Output Terminal Audio class specific descriptor. */
-		#define DSUBTYPE_InputTerminal       0x02
-
-		/** Audio class descriptor subtype value for an Input Terminal Audio class specific descriptor. */
-		#define DSUBTYPE_OutputTerminal      0x03
-
-		/** Audio class descriptor subtype value for a Feature Unit Audio class specific descriptor. */
-		#define DSUBTYPE_FeatureUnit         0x06
-
-		/** Audio class descriptor subtype value for a general Audio class specific descriptor. */
-		#define DSUBTYPE_General             0x01
-
-		/** Audio class descriptor subtype value for an Audio class specific descriptor indicating the format of an audio stream. */
-		#define DSUBTYPE_Format              0x02
-		
-		//@{
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-
-		#define CHANNEL_LEFT_FRONT           (1 << 0)
-		#define CHANNEL_RIGHT_FRONT          (1 << 1)
-		#define CHANNEL_CENTER_FRONT         (1 << 2)
-		#define CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)
-		#define CHANNEL_LEFT_SURROUND        (1 << 4)
-		#define CHANNEL_RIGHT_SURROUND       (1 << 5)
-		#define CHANNEL_LEFT_OF_CENTER       (1 << 6)
-		#define CHANNEL_RIGHT_OF_CENTER      (1 << 7)
-		#define CHANNEL_SURROUND             (1 << 8)
-		#define CHANNEL_SIDE_LEFT            (1 << 9)
-		#define CHANNEL_SIDE_RIGHT           (1 << 10)
-		#define CHANNEL_TOP                  (1 << 11)
-		//@}
-
-		//@{
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-
-		#define FEATURE_MUTE                 (1 << 0)
-		#define FEATURE_VOLUME               (1 << 1)
-		#define FEATURE_BASS                 (1 << 2)
-		#define FEATURE_MID                  (1 << 3)
-		#define FEATURE_TREBLE               (1 << 4)
-		#define FEATURE_GRAPHIC_EQUALIZER    (1 << 5)
-		#define FEATURE_AUTOMATIC_GAIN       (1 << 6)
-		#define FEATURE_DELAY                (1 << 7)
-		#define FEATURE_BASS_BOOST           (1 << 8)
-		#define FEATURE_BASS_LOUDNESS        (1 << 9)
-		//@}
-
-		//@{
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		
-		#define TERMINAL_UNDEFINED           0x0100
-		#define TERMINAL_STREAMING           0x0101
-		#define TERMINAL_VENDOR              0x01FF
-		#define TERMINAL_IN_UNDEFINED        0x0200
-		#define TERMINAL_IN_MIC              0x0201
-		#define TERMINAL_IN_DESKTOP_MIC      0x0202
-		#define TERMINAL_IN_PERSONAL_MIC     0x0203
-		#define TERMINAL_IN_OMNIDIR_MIC      0x0204
-		#define TERMINAL_IN_MIC_ARRAY        0x0205
-		#define TERMINAL_IN_PROCESSING_MIC   0x0206
-		#define TERMINAL_IN_OUT_UNDEFINED    0x0300
-		#define TERMINAL_OUT_SPEAKER         0x0301
-		#define TERMINAL_OUT_HEADPHONES      0x0302
-		#define TERMINAL_OUT_HEAD_MOUNTED    0x0303
-		#define TERMINAL_OUT_DESKTOP         0x0304
-		#define TERMINAL_OUT_ROOM            0x0305
-		#define TERMINAL_OUT_COMMUNICATION   0x0306
-		#define TERMINAL_OUT_LOWFREQ         0x0307
-		//@}
-
-		/** Convenience macro, to fill a 24-bit AudioSampleFreq_t structure with the given sample rate as a 24-bit number.
-		 *
-		 *  \param freq  Required audio sampling frequency in HZ
-		 */
-		#define SAMPLE_FREQ(freq)  {LowWord: ((uint32_t)freq & 0x00FFFF), HighByte: (((uint32_t)freq >> 16) & 0x0000FF)}
-		
-		/** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint
-		 *  accepts only filled endpoint packets of audio samples.
-		 */
-		#define EP_ACCEPTS_ONLY_FULL_PACKETS (1 << 7)
-
-		/** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint
-		 *  will accept partially filled endpoint packets of audio samples.
-		 */
-		#define EP_ACCEPTS_SMALL_PACKETS     (0 << 7)
-
 		#if defined(USB_FULL_CONTROLLER) || defined(__DOXYGEN__)
 			/** Endpoint number of the Audio isochronous streaming data endpoint. */
 			#define AUDIO_STREAM_EPNUM       1
@@ -154,148 +60,6 @@
 		#define AUDIO_SAMPLE_FREQUENCY       48000
 		
 	/* Type Defines: */
-		/** Type define for an Audio class specific interface descriptor. This follows a regular interface descriptor to
-		 *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more
-		 *  details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-
-			uint16_t                  ACSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */
-			uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */
-			
-			uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */
-			uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */
-		} USB_AudioInterface_AC_t;
-		
-		/** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features
-		 *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio
-		 *  specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-			
-			uint8_t                   UnitID; /**< ID value of this feature unit - must be a unique value within the device */
-			uint8_t                   SourceID; /**< Source ID value of the audio source input into this feature unit */
-			
-			uint8_t                   ControlSize; /**< Size of each element in the ChanelControlls array */
-			uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */
-			
-			uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
-		} USB_AudioFeatureUnit_t;
-
-		/** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device
-		 *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,
-		 *  a USB endpoint). See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-		
-			uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */
-			uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */
-			uint8_t                   AssociatedOutputTerminal; /**< ID of associated output terminal, for physically grouped terminals
-			                                                     *   such as the speaker and microphone of a phone handset
-			                                                     */
-			uint8_t                   TotalChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */
-			uint16_t                  ChannelConfig; /**< CHANNEL_* masks indicating what channel layout is supported by this terminal */
-			
-			uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */
-			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
-		} USB_AudioInputTerminal_t;
-
-		/** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device
-		 *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,
-		 *  a USB endpoint). See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-		
-			uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */
-			uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */
-			uint8_t                   AssociatedInputTerminal; /**< ID of associated input terminal, for physically grouped terminals
-			                                                    *   such as the speaker and microphone of a phone handset
-			                                                    */
-			uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */
-			
-			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
-		} USB_AudioOutputTerminal_t;
-		
-		/** Type define for an Audio class specific streaming interface descriptor. This indicates to the host
-		 *  how audio streams within the device are formatted. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-			
-			uint8_t                   TerminalLink; /**< ID value of the output terminal this descriptor is describing */
-			
-			uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */
-			uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */
-		} USB_AudioInterface_AS_t;
-		
-		/** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,
-		 *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.
-		 */
-		typedef struct
-		{
-			uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */
-			uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */
-		} AudioSampleFreq_t;
-
-		/** Type define for an Audio class specific audio format descriptor. This is used to give the host full details
-		 *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used
-		 *  in the device's audio streams. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-
-			uint8_t                   FormatType; /**< Format of the audio stream, see Audio Device Formats specification */
-			uint8_t                   Channels; /**< Total number of discrete channels in the stream */
-			
-			uint8_t                   SubFrameSize; /**< Size in bytes of each channel's sample data in the stream */
-			uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */
-
-			uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */			
-			AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */
-		} USB_AudioFormat_t;
-		
-		/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint 
-		 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */
-
-			uint8_t                   Refresh; /**< Always set to zero */
-			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */
-		} USB_AudioStreamEndpoint_Std_t;
-					
-		/** Type define for an Audio class specific extended endpoint descriptor. This contains extra information
-		 *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio
-		 *  class specific extended endpoint descriptor. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-			
-			uint8_t                   Attributes; /**< Audio class specific endpoint attributes, such as ACCEPTS_SMALL_PACKETS */
-
-			uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */
-			uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */
-		} USB_AudioStreamEndpoint_Spc_t;
-		
 		/** Type define for the device configuration descriptor structure. This must be defined in the
 		 *  application code, as the configuration descriptor contains several sub-descriptors which
 		 *  vary between devices, and which describe the device's usage to the host.
diff --git a/Demos/Device/AudioOutput/Descriptors.h b/Demos/Device/AudioOutput/Descriptors.h
index e1145717e318cf1e2f9814e7bf39d5e542a58dc2..1f03f647f7259abbb68f63a54b62f2b976e28e0b 100644
--- a/Demos/Device/AudioOutput/Descriptors.h
+++ b/Demos/Device/AudioOutput/Descriptors.h
@@ -38,105 +38,11 @@
 
 	/* Includes: */
 		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/Device/Audio.h>
 
 		#include <avr/pgmspace.h>
 
 	/* Macros: */
-		/** Descriptor header constant to indicate a Audio class interface descriptor. */
-		#define DTYPE_AudioInterface         0x24
-
-		/** Descriptor header constant to indicate a Audio class endpoint descriptor. */
-		#define DTYPE_AudioEndpoint          0x25
-
-		/** Audio class descriptor subtype value for a Audio class specific header descriptor. */
-		#define DSUBTYPE_Header              0x01
-
-		/** Audio class descriptor subtype value for an Output Terminal Audio class specific descriptor. */
-		#define DSUBTYPE_InputTerminal       0x02
-
-		/** Audio class descriptor subtype value for an Input Terminal Audio class specific descriptor. */
-		#define DSUBTYPE_OutputTerminal      0x03
-
-		/** Audio class descriptor subtype value for a Feature Unit Audio class specific descriptor. */
-		#define DSUBTYPE_FeatureUnit         0x06
-
-		/** Audio class descriptor subtype value for a general Audio class specific descriptor. */
-		#define DSUBTYPE_General             0x01
-
-		/** Audio class descriptor subtype value for an Audio class specific descriptor indicating the format of an audio stream. */
-		#define DSUBTYPE_Format              0x02
-		
-		//@{
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-
-		#define CHANNEL_LEFT_FRONT           (1 << 0)
-		#define CHANNEL_RIGHT_FRONT          (1 << 1)
-		#define CHANNEL_CENTER_FRONT         (1 << 2)
-		#define CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)
-		#define CHANNEL_LEFT_SURROUND        (1 << 4)
-		#define CHANNEL_RIGHT_SURROUND       (1 << 5)
-		#define CHANNEL_LEFT_OF_CENTER       (1 << 6)
-		#define CHANNEL_RIGHT_OF_CENTER      (1 << 7)
-		#define CHANNEL_SURROUND             (1 << 8)
-		#define CHANNEL_SIDE_LEFT            (1 << 9)
-		#define CHANNEL_SIDE_RIGHT           (1 << 10)
-		#define CHANNEL_TOP                  (1 << 11)
-		//@}
-
-		//@{
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-
-		#define FEATURE_MUTE                 (1 << 0)
-		#define FEATURE_VOLUME               (1 << 1)
-		#define FEATURE_BASS                 (1 << 2)
-		#define FEATURE_MID                  (1 << 3)
-		#define FEATURE_TREBLE               (1 << 4)
-		#define FEATURE_GRAPHIC_EQUALIZER    (1 << 5)
-		#define FEATURE_AUTOMATIC_GAIN       (1 << 6)
-		#define FEATURE_DELAY                (1 << 7)
-		#define FEATURE_BASS_BOOST           (1 << 8)
-		#define FEATURE_BASS_LOUDNESS        (1 << 9)
-		//@}
-
-		//@{
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		
-		#define TERMINAL_UNDEFINED           0x0100
-		#define TERMINAL_STREAMING           0x0101
-		#define TERMINAL_VENDOR              0x01FF
-		#define TERMINAL_IN_UNDEFINED        0x0200
-		#define TERMINAL_IN_MIC              0x0201
-		#define TERMINAL_IN_DESKTOP_MIC      0x0202
-		#define TERMINAL_IN_PERSONAL_MIC     0x0203
-		#define TERMINAL_IN_OMNIDIR_MIC      0x0204
-		#define TERMINAL_IN_MIC_ARRAY        0x0205
-		#define TERMINAL_IN_PROCESSING_MIC   0x0206
-		#define TERMINAL_IN_OUT_UNDEFINED    0x0300
-		#define TERMINAL_OUT_SPEAKER         0x0301
-		#define TERMINAL_OUT_HEADPHONES      0x0302
-		#define TERMINAL_OUT_HEAD_MOUNTED    0x0303
-		#define TERMINAL_OUT_DESKTOP         0x0304
-		#define TERMINAL_OUT_ROOM            0x0305
-		#define TERMINAL_OUT_COMMUNICATION   0x0306
-		#define TERMINAL_OUT_LOWFREQ         0x0307
-		//@}
-
-		/** Convenience macro, to fill a 24-bit AudioSampleFreq_t structure with the given sample rate as a 24-bit number.
-		 *
-		 *  \param freq  Required audio sampling frequency in HZ
-		 */
-		#define SAMPLE_FREQ(freq)  {LowWord: ((uint32_t)freq & 0x00FFFF), HighByte: (((uint32_t)freq >> 16) & 0x0000FF)}
-		
-		/** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint
-		 *  accepts only filled endpoint packets of audio samples.
-		 */
-		#define EP_ACCEPTS_ONLY_FULL_PACKETS (1 << 7)
-
-		/** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint
-		 *  will accept partially filled endpoint packets of audio samples.
-		 */
-		#define EP_ACCEPTS_SMALL_PACKETS     (0 << 7)
-
 		#if defined(USB_FULL_CONTROLLER) || defined(__DOXYGEN__)
 			/** Endpoint number of the Audio isochronous streaming data endpoint. */
 			#define AUDIO_STREAM_EPNUM       1
@@ -154,148 +60,6 @@
 		#define AUDIO_SAMPLE_FREQUENCY       48000
 		
 	/* Type Defines: */
-		/** Type define for an Audio class specific interface descriptor. This follows a regular interface descriptor to
-		 *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more
-		 *  details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-
-			uint16_t                  ACSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */
-			uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */
-			
-			uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */
-			uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */
-		} USB_AudioInterface_AC_t;
-		
-		/** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features
-		 *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio
-		 *  specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-			
-			uint8_t                   UnitID; /**< ID value of this feature unit - must be a unique value within the device */
-			uint8_t                   SourceID; /**< Source ID value of the audio source input into this feature unit */
-			
-			uint8_t                   ControlSize; /**< Size of each element in the ChanelControlls array */
-			uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */
-			
-			uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
-		} USB_AudioFeatureUnit_t;
-
-		/** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device
-		 *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,
-		 *  a USB endpoint). See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-		
-			uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */
-			uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */
-			uint8_t                   AssociatedOutputTerminal; /**< ID of associated output terminal, for physically grouped terminals
-			                                                     *   such as the speaker and microphone of a phone handset
-			                                                     */
-			uint8_t                   TotalChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */
-			uint16_t                  ChannelConfig; /**< CHANNEL_* masks indicating what channel layout is supported by this terminal */
-			
-			uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */
-			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
-		} USB_AudioInputTerminal_t;
-
-		/** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device
-		 *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,
-		 *  a USB endpoint). See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-		
-			uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */
-			uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */
-			uint8_t                   AssociatedInputTerminal; /**< ID of associated input terminal, for physically grouped terminals
-			                                                    *   such as the speaker and microphone of a phone handset
-			                                                    */
-			uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */
-			
-			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
-		} USB_AudioOutputTerminal_t;
-		
-		/** Type define for an Audio class specific streaming interface descriptor. This indicates to the host
-		 *  how audio streams within the device are formatted. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-			
-			uint8_t                   TerminalLink; /**< ID value of the output terminal this descriptor is describing */
-			
-			uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */
-			uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */
-		} USB_AudioInterface_AS_t;
-		
-		/** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,
-		 *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.
-		 */
-		typedef struct
-		{
-			uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */
-			uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */
-		} AudioSampleFreq_t;
-
-		/** Type define for an Audio class specific audio format descriptor. This is used to give the host full details
-		 *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used
-		 *  in the device's audio streams. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-
-			uint8_t                   FormatType; /**< Format of the audio stream, see Audio Device Formats specification */
-			uint8_t                   Channels; /**< Total number of discrete channels in the stream */
-			
-			uint8_t                   SubFrameSize; /**< Size in bytes of each channel's sample data in the stream */
-			uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */
-
-			uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */			
-			AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */
-		} USB_AudioFormat_t;
-		
-		/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint 
-		 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */
-
-			uint8_t                   Refresh; /**< Always set to zero */
-			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */
-		} USB_AudioStreamEndpoint_Std_t;
-					
-		/** Type define for an Audio class specific extended endpoint descriptor. This contains extra information
-		 *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio
-		 *  class specific extended endpoint descriptor. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-			
-			uint8_t                   Attributes; /**< Audio class specific endpoint attributes, such as ACCEPTS_SMALL_PACKETS */
-
-			uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */
-			uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */
-		} USB_AudioStreamEndpoint_Spc_t;	
-
 		/** Type define for the device configuration descriptor structure. This must be defined in the
 		 *  application code, as the configuration descriptor contains several sub-descriptors which
 		 *  vary between devices, and which describe the device's usage to the host.
diff --git a/Demos/Device/MIDI/Descriptors.h b/Demos/Device/MIDI/Descriptors.h
index 616acab86a76c87f5937628ad2d4213eb2f9b27e..d9b13398013dfe50bf10135689e043a870f1999d 100644
--- a/Demos/Device/MIDI/Descriptors.h
+++ b/Demos/Device/MIDI/Descriptors.h
@@ -38,129 +38,21 @@
 
 	/* Includes: */
 		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/Device/MIDI.h>
 
 		#include <avr/pgmspace.h>
 
 	/* Macros: */
-		/** Descriptor header constant to indicate a Audio class interface descriptor. */
-		#define DTYPE_AudioInterface        0x24
-
-		/** Descriptor header constant to indicate a Audio class endpoint descriptor. */
-		#define DTYPE_AudioEndpoint         0x25
-
-		/** Audio class descriptor subtype value for a Audio class specific header descriptor. */
-		#define DSUBTYPE_Header             0x01
-
-		/** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */
-		#define DSUBTYPE_InputJack          0x02
-
-		/** Audio class descriptor subtype value for a Audio class specific MIDI output jack descriptor. */
-		#define DSUBTYPE_OutputJack         0x03
-
-		/** Audio class descriptor subtype value for a general Audio class specific descriptor. */
-		#define DSUBTYPE_General            0x01
-
-		/** Audio class descriptor jack type value for an embedded (logical) MIDI input or output jack. */
-		#define JACKTYPE_EMBEDDED           0x01
+		/** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */
+		#define MIDI_STREAM_IN_EPNUM        2
 
-		/** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */
-		#define JACKTYPE_EXTERNAL           0x02
-		
 		/** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */
 		#define MIDI_STREAM_OUT_EPNUM       1
 
-		/** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */
-		#define MIDI_STREAM_IN_EPNUM        2
-
 		/** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */
 		#define MIDI_STREAM_EPSIZE          64
 		
 	/* Type Defines: */
-		/** Type define for an Audio class specific interface descriptor. This follows a regular interface descriptor to
-		 *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more
-		 *  details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-
-			uint16_t                  ACSpecification; /** Binary coded decimal value, indicating the supported Audio Class specification version */
-			uint16_t                  TotalLength; /** Total length of the Audio class specific control descriptors, including this descriptor */
-			
-			uint8_t                   InCollection; /** Total number of audio class interfaces within this device */
-			uint8_t                   InterfaceNumbers[1]; /** Interface numbers of each audio interface */
-		} USB_AudioInterface_AC_t;
-		
-		/** Type define for an Audio class specific MIDI streaming interface descriptor. This indicates to the host
-		 *  how MIDI the specification compliance of the device and the total length of the Audio class specific descriptors.
-		 *  See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-			
-			uint16_t                  AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */
-			uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */
-		} USB_AudioInterface_MIDI_AS_t;
-		
-		/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint 
-		 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */
-
-			uint8_t                   Refresh; /**< Always set to zero */
-			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */
-		} USB_AudioStreamEndpoint_Std_t;
-
-		/** Type define for an Audio class specific MIDI IN jack. This gives information to the host on a MIDI input, either
-		 *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-
-			uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values */
-			uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device */
-			
-			uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
-		} USB_MIDI_In_Jack_t;
-
-		/** Type define for an Audio class specific MIDI OUT jack. This gives information to the host on a MIDI output, either
-		 *  a physical output jack, or a logical jack (sending output data internally, or to the host via an endpoint).
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-
-			uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values */
-			uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device */
-			
-			uint8_t                   NumberOfPins; /**< Number of output channels within the jack, either physical or logical */
-			uint8_t                   SourceJackID[1]; /**< ID of each output pin's source data jack */
-			uint8_t                   SourcePinID[1]; /**< Pin number in the input jack of each output pin's source data */
-			
-			uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
-		} USB_MIDI_Out_Jack_t;
-		
-		/** Type define for an Audio class specific extended MIDI jack endpoint descriptor. This contains extra information
-		 *  on the usage of MIDI endpoints used to stream MIDI events in and out of the USB Audio device, and follows an Audio
-		 *  class specific extended MIDI endpoint descriptor. See the USB Audio specification for more details.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
-
-			uint8_t                   TotalEmbeddedJacks; /**< Total number of jacks inside this endpoint */
-			uint8_t                   AssociatedJackID[1]; /**< IDs of each jack inside the endpoint */
-		} USB_MIDI_Jack_Endpoint_t;
-
 		/** Type define for the device configuration descriptor structure. This must be defined in the
 		 *  application code, as the configuration descriptor contains several sub-descriptors which
 		 *  vary between devices, and which describe the device's usage to the host.
diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c
index b6b43df6a201b58119a2c3b59ab6b626a65e9e10..1fee34705ef850f1b25673f6f8eca81cb794b941 100644
--- a/Demos/Device/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
@@ -28,25 +28,34 @@
   this software.
 */
 
-/** \file
- *
- *  Main source file for the MIDI input demo. This file contains the main tasks of the demo and
- *  is responsible for the initial application hardware configuration.
- */
-
 #include "MIDI.h"
 
-/* Scheduler Task List */
-TASK_LIST
-{
-	{ .Task = USB_USBTask          , .TaskStatus = TASK_STOP },
-	{ .Task = USB_MIDI_Task        , .TaskStatus = TASK_STOP },
-};
+USB_ClassInfo_MIDI_t Keyboard_MIDI_Interface =
+	{
+		.InterfaceNumber       = 0,
+
+		.DataINEndpointNumber  = MIDI_STREAM_IN_EPNUM,
+		.DataINEndpointSize    = MIDI_STREAM_EPSIZE,
 
-/** Main program entry point. This routine configures the hardware required by the application, then
- *  starts the scheduler to run the application tasks.
- */
+		.DataOUTEndpointNumber = MIDI_STREAM_OUT_EPNUM,
+		.DataOUTEndpointSize   = MIDI_STREAM_EPSIZE,
+	};
+	
 int main(void)
+{
+	SetupHardware();
+
+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+	
+	for (;;)
+	{
+		CheckJoystickMovement();
+	
+		USB_USBTask();
+	}
+}
+
+void SetupHardware(void)
 {
 	/* Disable watchdog if enabled by bootloader/fuses */
 	MCUSR &= ~(1 << WDRF);
@@ -59,161 +68,85 @@ int main(void)
 	Joystick_Init();
 	LEDs_Init();
 	Buttons_Init();
-
-	/* Indicate USB not ready */
-	UpdateStatus(Status_USBNotReady);
-	
-	/* Initialize Scheduler so that it can be used */
-	Scheduler_Init();
-
-	/* Initialize USB Subsystem */
 	USB_Init();
-
-	/* Scheduling - routine never returns, so put this last in the main function */
-	Scheduler_Start();
-}
-
-/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */
-void EVENT_USB_Connect(void)
-{
-	/* Start USB management task */
-	Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
-
-	/* Indicate USB enumerating */
-	UpdateStatus(Status_USBEnumerating);
-}
-
-/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
- *  the status LEDs, disables the sample update and PWM output timers and stops the USB and MIDI management tasks.
- */
-void EVENT_USB_Disconnect(void)
-{
-	/* Stop running audio and USB management tasks */
-	Scheduler_SetTaskMode(USB_MIDI_Task, TASK_STOP);
-	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
-
-	/* Indicate USB not ready */
-	UpdateStatus(Status_USBNotReady);
-}
-
-/** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
- *  of the USB device after enumeration - the device endpoints are configured and the MIDI management task started.
- */
-void EVENT_USB_ConfigurationChanged(void)
-{
-	/* Setup MIDI stream endpoints */
-	Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK,
-		                       ENDPOINT_DIR_OUT, MIDI_STREAM_EPSIZE,
-	                           ENDPOINT_BANK_SINGLE);
-
-	Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK,
-		                       ENDPOINT_DIR_IN, MIDI_STREAM_EPSIZE,
-	                           ENDPOINT_BANK_SINGLE);
-
-	/* Indicate USB connected and ready */
-	UpdateStatus(Status_USBReady);
-
-	/* Start MIDI task */
-	Scheduler_SetTaskMode(USB_MIDI_Task, TASK_RUN);
 }
 
-/** Task to handle the generation of MIDI note change events in response to presses of the board joystick, and send them
- *  to the host.
- */
-TASK(USB_MIDI_Task)
+void CheckJoystickMovement(void)
 {
 	static uint8_t PrevJoystickStatus;
 
-	/* Select the MIDI IN stream */
-	Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);
-
-	/* Check if endpoint is ready to be written to */
-	if (Endpoint_IsINReady())
-	{
-		/* Get current joystick mask, XOR with previous to detect joystick changes */
-		uint8_t JoystickStatus  = Joystick_GetStatus();
-		uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);
+	uint8_t MIDICommand = 0;
+	uint8_t MIDIPitch;
+	
+	/* Get current joystick mask, XOR with previous to detect joystick changes */
+	uint8_t JoystickStatus  = Joystick_GetStatus();
+	uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);
 		
-		/* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */
-		uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));
-
-		if (JoystickChanges & JOY_LEFT)
-		  SendMIDINoteChange(0x3C, (JoystickStatus & JOY_LEFT), 0, Channel);
-
-		if (JoystickChanges & JOY_UP)
-		  SendMIDINoteChange(0x3D, (JoystickStatus & JOY_UP), 0, Channel);
-
-		if (JoystickChanges & JOY_RIGHT)
-		  SendMIDINoteChange(0x3E, (JoystickStatus & JOY_RIGHT), 0, Channel);
+	/* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */
+	uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));
 
-		if (JoystickChanges & JOY_DOWN)
-		  SendMIDINoteChange(0x3F, (JoystickStatus & JOY_DOWN), 0, Channel);
-
-		if (JoystickChanges & JOY_PRESS)
-		  SendMIDINoteChange(0x3B, (JoystickStatus & JOY_PRESS), 0, Channel);
-
-		/* Save previous joystick value for next joystick change detection */
-		PrevJoystickStatus = JoystickStatus;
+	if (JoystickChanges & JOY_LEFT)
+	{
+		MIDICommand = ((JoystickStatus & JOY_LEFT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+		MIDIPitch   = 0x3C;
 	}
 
-	/* Select the MIDI OUT stream */
-	Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPNUM);
-
-	/* Check if endpoint is ready to be read from, if so discard its (unused) data */
-	if (Endpoint_IsOUTReceived())
-	  Endpoint_ClearOUT();
-}
+	if (JoystickChanges & JOY_UP)
+	{
+		MIDICommand = ((JoystickStatus & JOY_UP)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+		MIDIPitch   = 0x3D;
+	}
 
-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
- *  log to a serial port, or anything else that is suitable for status updates.
- *
- *  \param CurrentStatus  Current status of the system, from the MIDI_StatusCodes_t enum
- */
-void UpdateStatus(uint8_t CurrentStatus)
-{
-	uint8_t LEDMask = LEDS_NO_LEDS;
+	if (JoystickChanges & JOY_RIGHT)
+	{
+		MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+		MIDIPitch   = 0x3E;
+	}
 	
-	/* Set the LED mask to the appropriate LED mask based on the given status code */
-	switch (CurrentStatus)
+	if (JoystickChanges & JOY_DOWN)
+	{
+		MIDICommand = ((JoystickStatus & JOY_DOWN)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+		MIDIPitch   = 0x3F;
+	}
+
+	if (JoystickChanges & JOY_PRESS)
 	{
-		case Status_USBNotReady:
-			LEDMask = (LEDS_LED1);
-			break;
-		case Status_USBEnumerating:
-			LEDMask = (LEDS_LED1 | LEDS_LED2);
-			break;
-		case Status_USBReady:
-			LEDMask = (LEDS_LED2 | LEDS_LED4);
-			break;
+		MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+		MIDIPitch   = 0x3B;
 	}
 	
-	/* Set the board LEDs to the new LED mask */
-	LEDs_SetAllLEDs(LEDMask);
+	if (MIDICommand)
+	{
+		USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)
+			{
+				.CableNumber = 0,
+				.Command     = MIDICommand,
+				
+				.Data1       = (MIDICommand << 4) | Channel,
+				.Data2       = MIDIPitch,
+				.Data3       = MIDI_STANDARD_VELOCITY,			
+			};
+			
+		USB_MIDI_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);
+	}
+
+	PrevJoystickStatus = JoystickStatus;
 }
 
-/** Sends a MIDI note change event (note on or off) to the MIDI output jack, on the given virtual cable ID and channel.
- *
- *  \param Pitch    Pitch of the note to turn on or off
- *  \param OnOff    Set to true if the note is on (being held down), or false otherwise
- *  \param CableID  ID of the virtual cable to send the note change to
- *  \param Channel  MIDI channel number to send the note change event to
- */
-void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel)
+void EVENT_USB_Connect(void)
 {
-	/* Wait until endpoint ready for more data */
-	while (!(Endpoint_IsReadWriteAllowed()));
-
-	/* Check if the message should be a Note On or Note Off command */
-	uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+}
 
-	/* Write the Packet Header to the endpoint */
-	Endpoint_Write_Byte((CableID << 4) | (Command >> 4));
+void EVENT_USB_Disconnect(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+}
 
-	/* Write the Note On/Off command with the specified channel, pitch and velocity */
-	Endpoint_Write_Byte(Command | Channel);
-	Endpoint_Write_Byte(Pitch);
-	Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);
+void EVENT_USB_ConfigurationChanged(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 	
-	/* Send the data in the endpoint to the host */
-	Endpoint_ClearIN();
+	if (!(USB_MIDI_ConfigureEndpoints(&Keyboard_MIDI_Interface)))
+	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
diff --git a/Demos/Device/MIDI/MIDI.h b/Demos/Device/MIDI/MIDI.h
index 635036ae85eeac25580f3d32e403e04eb49b8088..10d8d3366f57edc7e4e64c5d0579380277f5deb1 100644
--- a/Demos/Device/MIDI/MIDI.h
+++ b/Demos/Device/MIDI/MIDI.h
@@ -44,49 +44,27 @@
 
 		#include "Descriptors.h"
 				
-		#include <LUFA/Version.h>                            // Library Version Information
-		#include <LUFA/Drivers/USB/USB.h>                    // USB Functionality
-		#include <LUFA/Drivers/Board/Joystick.h>             // Joystick driver
-		#include <LUFA/Drivers/Board/LEDs.h>                 // LEDs driver
-		#include <LUFA/Drivers/Board/Buttons.h>              // Board Buttons driver
-		#include <LUFA/Scheduler/Scheduler.h>                // Simple scheduler for task management
+		#include <LUFA/Version.h>
+		#include <LUFA/Drivers/Board/LEDs.h>
+		#include <LUFA/Drivers/Board/Joystick.h>
+		#include <LUFA/Drivers/Board/Buttons.h>
+		#include <LUFA/Drivers/Peripheral/ADC.h>
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/Device/MIDI.h>
 
-   /* Macros: */
-		/** MIDI command for a note on (activation) event */
-		#define MIDI_COMMAND_NOTE_ON         0x90
-
-		/** MIDI command for a note off (deactivation) event */
-		#define MIDI_COMMAND_NOTE_OFF        0x80
-
-		/** Standard key press velocity value used for all note events, as no pressure sensor is mounted */
-		#define MIDI_STANDARD_VELOCITY       64
+	/* Macros: */
+		#define LEDMASK_USB_NOTREADY      LEDS_LED1
+		#define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)
+		#define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)
+		#define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)
+		
+	/* Function Prototypes: */
+		void SetupHardware(void);
+		void CheckJoystickMovement(void);
 		
-		/** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel
-		 *  addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.
-		 *
-		 *  \param channel  MIDI channel number to address
-		 */
-		#define MIDI_CHANNEL(channel)        (channel - 1)
-
-	/* Enums: */
-		/** Enum for the possible status codes for passing to the UpdateStatus() function. */
-		enum MIDI_StatusCodes_t
-		{
-			Status_USBNotReady    = 0, /**< USB is not ready (disconnected from a USB host) */
-			Status_USBEnumerating = 1, /**< USB interface is enumerating */
-			Status_USBReady       = 2, /**< USB interface is connected and ready */
-		};
-
-	/* Task Definitions: */
-		TASK(USB_MIDI_Task);
-
-   /* Function Prototypes: */
 		void EVENT_USB_Connect(void);
 		void EVENT_USB_Disconnect(void);
 		void EVENT_USB_ConfigurationChanged(void);
-
-		void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff,
-		                        const uint8_t CableID, const uint8_t Channel);		
-		void UpdateStatus(uint8_t CurrentStatus);
+		void EVENT_USB_UnhandledControlPacket(void);
 		
 #endif
diff --git a/Demos/Device/MIDI/makefile b/Demos/Device/MIDI/makefile
index 485cdc710dbb424bc11009cf1303c7113006e1a3..f850421733977268a0785adc454ee450860673aa 100644
--- a/Demos/Device/MIDI/makefile
+++ b/Demos/Device/MIDI/makefile
@@ -125,7 +125,6 @@ LUFA_PATH = ../../..
 # List C source files here. (C dependencies are automatically generated.)
 SRC = $(TARGET).c                                                 \
 	  Descriptors.c                                               \
-	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
@@ -136,7 +135,7 @@ SRC = $(TARGET).c                                                 \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \
-	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/MIDI.c           \
 
 
 # List C++ source files here. (C dependencies are automatically generated.)
diff --git a/LUFA.pnproj b/LUFA.pnproj
index ae38c0bb9609b4d0a6f58fadce282f84bd97c6d9..7bca259d8cbebb3de8d0b172eec5361532cc68a9 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-<Project name="LUFA"><Folder name="Demos"><Folder name="Device"><Folder name="AudioInput"><File path="Demos\Device\AudioInput\AudioInput.c"></File><File path="Demos\Device\AudioInput\AudioInput.h"></File><File path="Demos\Device\AudioInput\AudioInput.txt"></File><File path="Demos\Device\AudioInput\Descriptors.c"></File><File path="Demos\Device\AudioInput\Descriptors.h"></File><File path="Demos\Device\AudioInput\Doxygen.conf"></File><File path="Demos\Device\AudioInput\makefile"></File></Folder><Folder name="AudioOutput"><File path="Demos\Device\AudioOutput\AudioOutput.c"></File><File path="Demos\Device\AudioOutput\AudioOutput.h"></File><File path="Demos\Device\AudioOutput\AudioOutput.txt"></File><File path="Demos\Device\AudioOutput\Descriptors.c"></File><File path="Demos\Device\AudioOutput\Descriptors.h"></File><File path="Demos\Device\AudioOutput\Doxygen.conf"></File><File path="Demos\Device\AudioOutput\makefile"></File></Folder><Folder name="CDC"><File path="Demos\Device\CDC\CDC.c"></File><File path="Demos\Device\CDC\CDC.h"></File><File path="Demos\Device\CDC\CDC.txt"></File><File path="Demos\Device\CDC\Descriptors.c"></File><File path="Demos\Device\CDC\Descriptors.h"></File><File path="Demos\Device\CDC\Doxygen.conf"></File><File path="Demos\Device\CDC\LUFA CDC.inf"></File><File path="Demos\Device\CDC\makefile"></File></Folder><Folder name="DualCDC"><File path="Demos\Device\DualCDC\Descriptors.c"></File><File path="Demos\Device\DualCDC\Descriptors.h"></File><File path="Demos\Device\DualCDC\Doxygen.conf"></File><File path="Demos\Device\DualCDC\DualCDC.c"></File><File path="Demos\Device\DualCDC\DualCDC.h"></File><File path="Demos\Device\DualCDC\DualCDC.txt"></File><File path="Demos\Device\DualCDC\LUFA DualCDC.inf"></File><File path="Demos\Device\DualCDC\makefile"></File></Folder><Folder name="GenericHID"><File path="Demos\Device\GenericHID\Descriptors.c"></File><File path="Demos\Device\GenericHID\Descriptors.h"></File><File path="Demos\Device\GenericHID\GenericHID.c"></File><File path="Demos\Device\GenericHID\GenericHID.h"></File><File path="Demos\Device\GenericHID\makefile"></File><File path="Demos\Device\GenericHID\GenericHID.txt"></File><File path="Demos\Device\GenericHID\Doxygen.conf"></File></Folder><Folder name="Joystick"><File path="Demos\Device\Joystick\Descriptors.c"></File><File path="Demos\Device\Joystick\Descriptors.h"></File><File path="Demos\Device\Joystick\Doxygen.conf"></File><File path="Demos\Device\Joystick\Joystick.c"></File><File path="Demos\Device\Joystick\Joystick.h"></File><File path="Demos\Device\Joystick\Joystick.txt"></File><File path="Demos\Device\Joystick\makefile"></File></Folder><Folder name="Keyboard"><File path="Demos\Device\Keyboard\Descriptors.c"></File><File path="Demos\Device\Keyboard\Descriptors.h"></File><File path="Demos\Device\Keyboard\Doxygen.conf"></File><File path="Demos\Device\Keyboard\Keyboard.c"></File><File path="Demos\Device\Keyboard\Keyboard.h"></File><File path="Demos\Device\Keyboard\Keyboard.txt"></File><File path="Demos\Device\Keyboard\makefile"></File></Folder><Folder name="KeyboardMouse"><File path="Demos\Device\KeyboardMouse\Descriptors.c"></File><File path="Demos\Device\KeyboardMouse\Descriptors.h"></File><File path="Demos\Device\KeyboardMouse\Doxygen.conf"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.c"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.h"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.txt"></File><File path="Demos\Device\KeyboardMouse\makefile"></File></Folder><Folder name="MassStorage"><Folder name="Lib"><File path="Demos\Device\MassStorage\Lib\DataflashManager.c"></File><File path="Demos\Device\MassStorage\Lib\DataflashManager.h"></File><File path="Demos\Device\MassStorage\Lib\SCSI.c"></File><File path="Demos\Device\MassStorage\Lib\SCSI.h"></File><File path="Demos\Device\MassStorage\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Device\MassStorage\Descriptors.c"></File><File path="Demos\Device\MassStorage\Descriptors.h"></File><File path="Demos\Device\MassStorage\Doxygen.conf"></File><File path="Demos\Device\MassStorage\makefile"></File><File path="Demos\Device\MassStorage\MassStorage.c"></File><File path="Demos\Device\MassStorage\MassStorage.h"></File><File path="Demos\Device\MassStorage\MassStorage.txt"></File></Folder><Folder name="MIDI"><File path="Demos\Device\MIDI\Descriptors.c"></File><File path="Demos\Device\MIDI\Descriptors.h"></File><File path="Demos\Device\MIDI\Doxygen.conf"></File><File path="Demos\Device\MIDI\makefile"></File><File path="Demos\Device\MIDI\MIDI.c"></File><File path="Demos\Device\MIDI\MIDI.h"></File><File path="Demos\Device\MIDI\MIDI.txt"></File></Folder><Folder name="Mouse"><File path="Demos\Device\Mouse\Descriptors.c"></File><File path="Demos\Device\Mouse\Descriptors.h"></File><File path="Demos\Device\Mouse\Doxygen.conf"></File><File path="Demos\Device\Mouse\makefile"></File><File path="Demos\Device\Mouse\Mouse.c"></File><File path="Demos\Device\Mouse\Mouse.h"></File><File path="Demos\Device\Mouse\Mouse.txt"></File></Folder><Folder name="RNDISEthernet"><Folder name="Lib"><File path="Demos\Device\RNDISEthernet\Lib\Webserver.h"></File><File path="Demos\Device\RNDISEthernet\Lib\ARP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\ARP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\DHCP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\DHCP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\Ethernet.c"></File><File path="Demos\Device\RNDISEthernet\Lib\Ethernet.h"></File><File path="Demos\Device\RNDISEthernet\Lib\EthernetProtocols.h"></File><File path="Demos\Device\RNDISEthernet\Lib\ICMP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\ICMP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\IP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\IP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\ProtocolDecoders.c"></File><File path="Demos\Device\RNDISEthernet\Lib\ProtocolDecoders.h"></File><File path="Demos\Device\RNDISEthernet\Lib\TCP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\TCP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\UDP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\UDP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\Webserver.c"></File></Folder><File path="Demos\Device\RNDISEthernet\Descriptors.c"></File><File path="Demos\Device\RNDISEthernet\Descriptors.h"></File><File path="Demos\Device\RNDISEthernet\Doxygen.conf"></File><File path="Demos\Device\RNDISEthernet\LUFA RNDIS.inf"></File><File path="Demos\Device\RNDISEthernet\makefile"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.c"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.h"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.txt"></File></Folder><Folder name="USBtoSerial"><Folder name="Lib"><File path="Demos\Device\USBtoSerial\Lib\RingBuff.c"></File><File path="Demos\Device\USBtoSerial\Lib\RingBuff.h"></File></Folder><File path="Demos\Device\USBtoSerial\Descriptors.c"></File><File path="Demos\Device\USBtoSerial\Descriptors.h"></File><File path="Demos\Device\USBtoSerial\Doxygen.conf"></File><File path="Demos\Device\USBtoSerial\LUFA USBtoSerial.inf"></File><File path="Demos\Device\USBtoSerial\makefile"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.c"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.h"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.txt"></File></Folder><File path="Demos\Device\makefile"></File></Folder><Folder name="Host"><Folder name="CDCHost"><File path="Demos\Host\CDCHost\CDCHost.c"></File><File path="Demos\Host\CDCHost\CDCHost.h"></File><File path="Demos\Host\CDCHost\CDCHost.txt"></File><File path="Demos\Host\CDCHost\ConfigDescriptor.c"></File><File path="Demos\Host\CDCHost\ConfigDescriptor.h"></File><File path="Demos\Host\CDCHost\Doxygen.conf"></File><File path="Demos\Host\CDCHost\makefile"></File></Folder><Folder name="GenericHIDHost"><File path="Demos\Host\GenericHIDHost\ConfigDescriptor.c"></File><File path="Demos\Host\GenericHIDHost\ConfigDescriptor.h"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.c"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.h"></File><File path="Demos\Host\GenericHIDHost\makefile"></File><File path="Demos\Host\GenericHIDHost\Doxygen.conf"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.txt"></File></Folder><Folder name="KeyboardHost"><File path="Demos\Host\KeyboardHost\ConfigDescriptor.c"></File><File path="Demos\Host\KeyboardHost\ConfigDescriptor.h"></File><File path="Demos\Host\KeyboardHost\Doxygen.conf"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.c"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.h"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.txt"></File><File path="Demos\Host\KeyboardHost\makefile"></File></Folder><Folder name="KeyboardHostWithParser"><File path="Demos\Host\KeyboardHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\KeyboardHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\KeyboardHostWithParser\Doxygen.conf"></File><File path="Demos\Host\KeyboardHostWithParser\HIDReport.c"></File><File path="Demos\Host\KeyboardHostWithParser\HIDReport.h"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.c"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.h"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.txt"></File><File path="Demos\Host\KeyboardHostWithParser\makefile"></File></Folder><Folder name="MassStorageHost"><Folder name="Lib"><File path="Demos\Host\MassStorageHost\Lib\MassStoreCommands.c"></File><File path="Demos\Host\MassStorageHost\Lib\MassStoreCommands.h"></File><File path="Demos\Host\MassStorageHost\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Host\MassStorageHost\ConfigDescriptor.c"></File><File path="Demos\Host\MassStorageHost\ConfigDescriptor.h"></File><File path="Demos\Host\MassStorageHost\Doxygen.conf"></File><File path="Demos\Host\MassStorageHost\makefile"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.c"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.h"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.txt"></File></Folder><Folder name="MouseHost"><File path="Demos\Host\MouseHost\ConfigDescriptor.c"></File><File path="Demos\Host\MouseHost\ConfigDescriptor.h"></File><File path="Demos\Host\MouseHost\Doxygen.conf"></File><File path="Demos\Host\MouseHost\makefile"></File><File path="Demos\Host\MouseHost\MouseHost.c"></File><File path="Demos\Host\MouseHost\MouseHost.h"></File><File path="Demos\Host\MouseHost\MouseHost.txt"></File></Folder><Folder name="MouseHostWithParser"><File path="Demos\Host\MouseHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\MouseHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\MouseHostWithParser\Doxygen.conf"></File><File path="Demos\Host\MouseHostWithParser\HIDReport.c"></File><File path="Demos\Host\MouseHostWithParser\HIDReport.h"></File><File path="Demos\Host\MouseHostWithParser\makefile"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.c"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.h"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.txt"></File></Folder><Folder name="StillImageHost"><Folder name="Lib"><File path="Demos\Host\StillImageHost\Lib\PIMACodes.h"></File><File path="Demos\Host\StillImageHost\Lib\StillImageCommands.c"></File><File path="Demos\Host\StillImageHost\Lib\StillImageCommands.h"></File></Folder><File path="Demos\Host\StillImageHost\ConfigDescriptor.c"></File><File path="Demos\Host\StillImageHost\ConfigDescriptor.h"></File><File path="Demos\Host\StillImageHost\Doxygen.conf"></File><File path="Demos\Host\StillImageHost\makefile"></File><File path="Demos\Host\StillImageHost\StillImageHost.c"></File><File path="Demos\Host\StillImageHost\StillImageHost.h"></File><File path="Demos\Host\StillImageHost\StillImageHost.txt"></File></Folder><File path="Demos\Host\makefile"></File></Folder><Folder name="OTG"><Folder name="TestApp"><File path="Demos\OTG\TestApp\Descriptors.c"></File><File path="Demos\OTG\TestApp\Descriptors.h"></File><File path="Demos\OTG\TestApp\Doxygen.conf"></File><File path="Demos\OTG\TestApp\makefile"></File><File path="Demos\OTG\TestApp\TestApp.c"></File><File path="Demos\OTG\TestApp\TestApp.h"></File><File path="Demos\OTG\TestApp\TestApp.txt"></File><File path="Demos\OTG\TestApp\TestEvents.c"></File><File path="Demos\OTG\TestApp\TestEvents.h"></File></Folder><File path="Demos\OTG\makefile"></File></Folder><File path="Demos\makefile"></File></Folder><Folder name="LUFA"><Folder name="Common"><File path="LUFA\Common\Common.h"></File><File path="LUFA\Common\FunctionAttributes.h"></File><File path="LUFA\Common\BoardTypes.h"></File></Folder><Folder name="Drivers"><Folder name="USB"><Folder name="LowLevel"><File path="LUFA\Drivers\USB\LowLevel\HostChapter9.h"></File><File path="LUFA\Drivers\USB\LowLevel\LowLevel.c"></File><File path="LUFA\Drivers\USB\LowLevel\LowLevel.h"></File><File path="LUFA\Drivers\USB\LowLevel\Pipe.c"></File><File path="LUFA\Drivers\USB\LowLevel\Pipe.h"></File><File path="LUFA\Drivers\USB\LowLevel\DevChapter9.c"></File><File path="LUFA\Drivers\USB\LowLevel\DevChapter9.h"></File><File path="LUFA\Drivers\USB\LowLevel\Device.h"></File><File path="LUFA\Drivers\USB\LowLevel\Endpoint.c"></File><File path="LUFA\Drivers\USB\LowLevel\Endpoint.h"></File><File path="LUFA\Drivers\USB\LowLevel\Host.c"></File><File path="LUFA\Drivers\USB\LowLevel\Host.h"></File><File path="LUFA\Drivers\USB\LowLevel\HostChapter9.c"></File><File path="LUFA\Drivers\USB\LowLevel\OTG.h"></File></Folder><Folder name="HighLevel"><File path="LUFA\Drivers\USB\HighLevel\USBTask.h"></File><File path="LUFA\Drivers\USB\HighLevel\Events.c"></File><File path="LUFA\Drivers\USB\HighLevel\Events.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBInterrupt.c"></File><File path="LUFA\Drivers\USB\HighLevel\USBInterrupt.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBTask.c"></File><File path="LUFA\Drivers\USB\HighLevel\StdDescriptors.h"></File><File path="LUFA\Drivers\USB\HighLevel\StdRequestType.h"></File><File path="LUFA\Drivers\USB\HighLevel\StreamCallbacks.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBMode.h"></File><File path="LUFA\Drivers\USB\HighLevel\ConfigDescriptor.c"></File><File path="LUFA\Drivers\USB\HighLevel\ConfigDescriptor.h"></File></Folder><Folder name="Class"><Folder name="Device"><File path="LUFA\Drivers\USB\Class\Device\HID.c"></File><File path="LUFA\Drivers\USB\Class\Device\HID.h"></File><File path="LUFA\Drivers\USB\Class\Device\CDC.c"></File><File path="LUFA\Drivers\USB\Class\Device\CDC.h"></File><File path="LUFA\Drivers\USB\Class\Device\RNDIS.c"></File><File path="LUFA\Drivers\USB\Class\Device\RNDIS.h"></File><File path="LUFA\Drivers\USB\Class\Device\RNDISConstants.h"></File><File path="LUFA\Drivers\USB\Class\Device\MassStorage.c"></File><File path="LUFA\Drivers\USB\Class\Device\MassStorage.h"></File><File path="LUFA\Drivers\USB\Class\Device\Audio.c"></File><File path="LUFA\Drivers\USB\Class\Device\Audio.h"></File></Folder><Folder name="Host"><File path="LUFA\Drivers\USB\Class\Host\HIDParser.c"></File><File path="LUFA\Drivers\USB\Class\Host\HIDParser.h"></File><File path="LUFA\Drivers\USB\Class\Host\HIDReportData.h"></File></Folder></Folder><File path="LUFA\Drivers\USB\USB.h"></File></Folder><Folder name="Misc"><File path="LUFA\Drivers\Misc\TerminalCodes.h"></File></Folder><Folder name="Board"><Folder name="USBKEY"><File path="LUFA\Drivers\Board\USBKEY\Dataflash.h"></File><File path="LUFA\Drivers\Board\USBKEY\Joystick.h"></File><File path="LUFA\Drivers\Board\USBKEY\AT45DB642D.h"></File><File path="LUFA\Drivers\Board\USBKEY\LEDs.h"></File><File path="LUFA\Drivers\Board\USBKEY\Buttons.h"></File></Folder><Folder name="STK526"><File path="LUFA\Drivers\Board\STK526\Dataflash.h"></File><File path="LUFA\Drivers\Board\STK526\Joystick.h"></File><File path="LUFA\Drivers\Board\STK526\AT45DB642D.h"></File><File path="LUFA\Drivers\Board\STK526\LEDs.h"></File><File path="LUFA\Drivers\Board\STK526\Buttons.h"></File></Folder><Folder name="STK525"><File path="LUFA\Drivers\Board\STK525\Dataflash.h"></File><File path="LUFA\Drivers\Board\STK525\Joystick.h"></File><File path="LUFA\Drivers\Board\STK525\AT45DB321C.h"></File><File path="LUFA\Drivers\Board\STK525\LEDs.h"></File><File path="LUFA\Drivers\Board\STK525\Buttons.h"></File></Folder><Folder name="RZUSBSTICK"><File path="LUFA\Drivers\Board\RZUSBSTICK\LEDs.h"></File></Folder><Folder name="ATAVRUSBRF01"><File path="LUFA\Drivers\Board\ATAVRUSBRF01\LEDs.h"></File><File path="LUFA\Drivers\Board\ATAVRUSBRF01\Buttons.h"></File></Folder><File path="LUFA\Drivers\Board\Temperature.h"></File><File path="LUFA\Drivers\Board\Dataflash.h"></File><File path="LUFA\Drivers\Board\Joystick.h"></File><File path="LUFA\Drivers\Board\Temperature.c"></File><File path="LUFA\Drivers\Board\LEDs.h"></File><File path="LUFA\Drivers\Board\Buttons.h"></File></Folder><Folder name="Peripheral"><Folder name="AT90USBXXX67"><File path="LUFA\Drivers\Peripheral\AT90USBXXX67\ADC.h"></File></Folder><File path="LUFA\Drivers\Peripheral\ADC.h"></File><File path="LUFA\Drivers\Peripheral\Serial.c"></File><File path="LUFA\Drivers\Peripheral\Serial.h"></File><File path="LUFA\Drivers\Peripheral\SPI.h"></File><File path="LUFA\Drivers\Peripheral\SerialStream.c"></File><File path="LUFA\Drivers\Peripheral\SerialStream.h"></File></Folder></Folder><Folder name="DriverStubs"><File path="LUFA\DriverStubs\Dataflash.h"></File><File path="LUFA\DriverStubs\Joystick.h"></File><File path="LUFA\DriverStubs\LEDs.h"></File><File path="LUFA\DriverStubs\Buttons.h"></File></Folder><File path="LUFA\makefile"></File><File path="LUFA\Version.h"></File><File path="LUFA\BuildingLinkableLibraries.txt"></File><File path="LUFA\ChangeLog.txt"></File><File path="LUFA\CompileTimeTokens.txt"></File><File path="LUFA\DirectorySummaries.txt"></File><File path="LUFA\Doxygen.conf"></File><File path="LUFA\GettingStarted.txt"></File><File path="LUFA\Groups.txt"></File><File path="LUFA\LUFAPoweredProjects.txt"></File><File path="LUFA\MainPage.txt"></File><File path="LUFA\MigrationInformation.txt"></File><File path="LUFA\VIDAndPIDValues.txt"></File><File path="LUFA\WritingBoardDrivers.txt"></File></Folder><Folder name="Projects"><Folder name="MagStripe"><Folder name="Lib"><File path="Projects\Magstripe\Lib\CircularBitBuffer.c"></File><File path="Projects\Magstripe\Lib\CircularBitBuffer.h"></File><File path="Projects\Magstripe\Lib\MagstripeHW.h"></File></Folder><File path="Projects\Magstripe\Descriptors.c"></File><File path="Projects\Magstripe\Descriptors.h"></File><File path="Projects\Magstripe\Magstripe.c"></File><File path="Projects\Magstripe\Magstripe.h"></File><File path="Projects\Magstripe\makefile"></File><File path="Projects\Magstripe\Magstripe.txt"></File><File path="Projects\Magstripe\Doxygen.conf"></File></Folder><File path="Projects\makefile"></File></Folder><Folder name="Bootloaders"><Folder name="DFU"><File path="Bootloaders\DFU\BootloaderDFU.c"></File><File path="Bootloaders\DFU\BootloaderDFU.h"></File><File path="Bootloaders\DFU\Descriptors.c"></File><File path="Bootloaders\DFU\Descriptors.h"></File><File path="Bootloaders\DFU\makefile"></File><File path="Bootloaders\DFU\BootloaderDFU.txt"></File><File path="Bootloaders\DFU\Doxygen.conf"></File></Folder><Folder name="CDC"><File path="Bootloaders\CDC\BootloaderCDC.c"></File><File path="Bootloaders\CDC\BootloaderCDC.h"></File><File path="Bootloaders\CDC\Descriptors.c"></File><File path="Bootloaders\CDC\Descriptors.h"></File><File path="Bootloaders\CDC\makefile"></File><File path="Bootloaders\CDC\LUFA CDC Bootloader.inf"></File><File path="Bootloaders\CDC\Doxygen.conf"></File><File path="Bootloaders\CDC\BootloaderCDC.txt"></File></Folder><Folder name="TeensyHID"><File path="Bootloaders\TeensyHID\Descriptors.c"></File><File path="Bootloaders\TeensyHID\Descriptors.h"></File><File path="Bootloaders\TeensyHID\makefile"></File><File path="Bootloaders\TeensyHID\TeensyHID.c"></File><File path="Bootloaders\TeensyHID\TeensyHID.h"></File><File path="Bootloaders\TeensyHID\TeensyHID.txt"></File></Folder><File path="Bootloaders\makefile"></File></Folder><File path="makefile"></File></Project>
\ No newline at end of file
+<Project name="LUFA"><Folder name="Demos"><Folder name="Device"><Folder name="AudioInput"><File path="Demos\Device\AudioInput\AudioInput.c"></File><File path="Demos\Device\AudioInput\AudioInput.h"></File><File path="Demos\Device\AudioInput\AudioInput.txt"></File><File path="Demos\Device\AudioInput\Descriptors.c"></File><File path="Demos\Device\AudioInput\Descriptors.h"></File><File path="Demos\Device\AudioInput\Doxygen.conf"></File><File path="Demos\Device\AudioInput\makefile"></File></Folder><Folder name="AudioOutput"><File path="Demos\Device\AudioOutput\AudioOutput.c"></File><File path="Demos\Device\AudioOutput\AudioOutput.h"></File><File path="Demos\Device\AudioOutput\AudioOutput.txt"></File><File path="Demos\Device\AudioOutput\Descriptors.c"></File><File path="Demos\Device\AudioOutput\Descriptors.h"></File><File path="Demos\Device\AudioOutput\Doxygen.conf"></File><File path="Demos\Device\AudioOutput\makefile"></File></Folder><Folder name="CDC"><File path="Demos\Device\CDC\CDC.c"></File><File path="Demos\Device\CDC\CDC.h"></File><File path="Demos\Device\CDC\CDC.txt"></File><File path="Demos\Device\CDC\Descriptors.c"></File><File path="Demos\Device\CDC\Descriptors.h"></File><File path="Demos\Device\CDC\Doxygen.conf"></File><File path="Demos\Device\CDC\LUFA CDC.inf"></File><File path="Demos\Device\CDC\makefile"></File></Folder><Folder name="DualCDC"><File path="Demos\Device\DualCDC\Descriptors.c"></File><File path="Demos\Device\DualCDC\Descriptors.h"></File><File path="Demos\Device\DualCDC\Doxygen.conf"></File><File path="Demos\Device\DualCDC\DualCDC.c"></File><File path="Demos\Device\DualCDC\DualCDC.h"></File><File path="Demos\Device\DualCDC\DualCDC.txt"></File><File path="Demos\Device\DualCDC\LUFA DualCDC.inf"></File><File path="Demos\Device\DualCDC\makefile"></File></Folder><Folder name="GenericHID"><File path="Demos\Device\GenericHID\Descriptors.c"></File><File path="Demos\Device\GenericHID\Descriptors.h"></File><File path="Demos\Device\GenericHID\GenericHID.c"></File><File path="Demos\Device\GenericHID\GenericHID.h"></File><File path="Demos\Device\GenericHID\makefile"></File><File path="Demos\Device\GenericHID\GenericHID.txt"></File><File path="Demos\Device\GenericHID\Doxygen.conf"></File></Folder><Folder name="Joystick"><File path="Demos\Device\Joystick\Descriptors.c"></File><File path="Demos\Device\Joystick\Descriptors.h"></File><File path="Demos\Device\Joystick\Doxygen.conf"></File><File path="Demos\Device\Joystick\Joystick.c"></File><File path="Demos\Device\Joystick\Joystick.h"></File><File path="Demos\Device\Joystick\Joystick.txt"></File><File path="Demos\Device\Joystick\makefile"></File></Folder><Folder name="Keyboard"><File path="Demos\Device\Keyboard\Descriptors.c"></File><File path="Demos\Device\Keyboard\Descriptors.h"></File><File path="Demos\Device\Keyboard\Doxygen.conf"></File><File path="Demos\Device\Keyboard\Keyboard.c"></File><File path="Demos\Device\Keyboard\Keyboard.h"></File><File path="Demos\Device\Keyboard\Keyboard.txt"></File><File path="Demos\Device\Keyboard\makefile"></File></Folder><Folder name="KeyboardMouse"><File path="Demos\Device\KeyboardMouse\Descriptors.c"></File><File path="Demos\Device\KeyboardMouse\Descriptors.h"></File><File path="Demos\Device\KeyboardMouse\Doxygen.conf"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.c"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.h"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.txt"></File><File path="Demos\Device\KeyboardMouse\makefile"></File></Folder><Folder name="MassStorage"><Folder name="Lib"><File path="Demos\Device\MassStorage\Lib\DataflashManager.c"></File><File path="Demos\Device\MassStorage\Lib\DataflashManager.h"></File><File path="Demos\Device\MassStorage\Lib\SCSI.c"></File><File path="Demos\Device\MassStorage\Lib\SCSI.h"></File><File path="Demos\Device\MassStorage\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Device\MassStorage\Descriptors.c"></File><File path="Demos\Device\MassStorage\Descriptors.h"></File><File path="Demos\Device\MassStorage\Doxygen.conf"></File><File path="Demos\Device\MassStorage\makefile"></File><File path="Demos\Device\MassStorage\MassStorage.c"></File><File path="Demos\Device\MassStorage\MassStorage.h"></File><File path="Demos\Device\MassStorage\MassStorage.txt"></File></Folder><Folder name="MIDI"><File path="Demos\Device\MIDI\Descriptors.c"></File><File path="Demos\Device\MIDI\Descriptors.h"></File><File path="Demos\Device\MIDI\Doxygen.conf"></File><File path="Demos\Device\MIDI\makefile"></File><File path="Demos\Device\MIDI\MIDI.c"></File><File path="Demos\Device\MIDI\MIDI.h"></File><File path="Demos\Device\MIDI\MIDI.txt"></File></Folder><Folder name="Mouse"><File path="Demos\Device\Mouse\Descriptors.c"></File><File path="Demos\Device\Mouse\Descriptors.h"></File><File path="Demos\Device\Mouse\Doxygen.conf"></File><File path="Demos\Device\Mouse\makefile"></File><File path="Demos\Device\Mouse\Mouse.c"></File><File path="Demos\Device\Mouse\Mouse.h"></File><File path="Demos\Device\Mouse\Mouse.txt"></File></Folder><Folder name="RNDISEthernet"><Folder name="Lib"><File path="Demos\Device\RNDISEthernet\Lib\Webserver.h"></File><File path="Demos\Device\RNDISEthernet\Lib\ARP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\ARP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\DHCP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\DHCP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\Ethernet.c"></File><File path="Demos\Device\RNDISEthernet\Lib\Ethernet.h"></File><File path="Demos\Device\RNDISEthernet\Lib\EthernetProtocols.h"></File><File path="Demos\Device\RNDISEthernet\Lib\ICMP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\ICMP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\IP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\IP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\ProtocolDecoders.c"></File><File path="Demos\Device\RNDISEthernet\Lib\ProtocolDecoders.h"></File><File path="Demos\Device\RNDISEthernet\Lib\TCP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\TCP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\UDP.c"></File><File path="Demos\Device\RNDISEthernet\Lib\UDP.h"></File><File path="Demos\Device\RNDISEthernet\Lib\Webserver.c"></File></Folder><File path="Demos\Device\RNDISEthernet\Descriptors.c"></File><File path="Demos\Device\RNDISEthernet\Descriptors.h"></File><File path="Demos\Device\RNDISEthernet\Doxygen.conf"></File><File path="Demos\Device\RNDISEthernet\LUFA RNDIS.inf"></File><File path="Demos\Device\RNDISEthernet\makefile"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.c"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.h"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.txt"></File></Folder><Folder name="USBtoSerial"><Folder name="Lib"><File path="Demos\Device\USBtoSerial\Lib\RingBuff.c"></File><File path="Demos\Device\USBtoSerial\Lib\RingBuff.h"></File></Folder><File path="Demos\Device\USBtoSerial\Descriptors.c"></File><File path="Demos\Device\USBtoSerial\Descriptors.h"></File><File path="Demos\Device\USBtoSerial\Doxygen.conf"></File><File path="Demos\Device\USBtoSerial\LUFA USBtoSerial.inf"></File><File path="Demos\Device\USBtoSerial\makefile"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.c"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.h"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.txt"></File></Folder><File path="Demos\Device\makefile"></File></Folder><Folder name="Host"><Folder name="CDCHost"><File path="Demos\Host\CDCHost\CDCHost.c"></File><File path="Demos\Host\CDCHost\CDCHost.h"></File><File path="Demos\Host\CDCHost\CDCHost.txt"></File><File path="Demos\Host\CDCHost\ConfigDescriptor.c"></File><File path="Demos\Host\CDCHost\ConfigDescriptor.h"></File><File path="Demos\Host\CDCHost\Doxygen.conf"></File><File path="Demos\Host\CDCHost\makefile"></File></Folder><Folder name="GenericHIDHost"><File path="Demos\Host\GenericHIDHost\ConfigDescriptor.c"></File><File path="Demos\Host\GenericHIDHost\ConfigDescriptor.h"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.c"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.h"></File><File path="Demos\Host\GenericHIDHost\makefile"></File><File path="Demos\Host\GenericHIDHost\Doxygen.conf"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.txt"></File></Folder><Folder name="KeyboardHost"><File path="Demos\Host\KeyboardHost\ConfigDescriptor.c"></File><File path="Demos\Host\KeyboardHost\ConfigDescriptor.h"></File><File path="Demos\Host\KeyboardHost\Doxygen.conf"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.c"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.h"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.txt"></File><File path="Demos\Host\KeyboardHost\makefile"></File></Folder><Folder name="KeyboardHostWithParser"><File path="Demos\Host\KeyboardHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\KeyboardHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\KeyboardHostWithParser\Doxygen.conf"></File><File path="Demos\Host\KeyboardHostWithParser\HIDReport.c"></File><File path="Demos\Host\KeyboardHostWithParser\HIDReport.h"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.c"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.h"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.txt"></File><File path="Demos\Host\KeyboardHostWithParser\makefile"></File></Folder><Folder name="MassStorageHost"><Folder name="Lib"><File path="Demos\Host\MassStorageHost\Lib\MassStoreCommands.c"></File><File path="Demos\Host\MassStorageHost\Lib\MassStoreCommands.h"></File><File path="Demos\Host\MassStorageHost\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Host\MassStorageHost\ConfigDescriptor.c"></File><File path="Demos\Host\MassStorageHost\ConfigDescriptor.h"></File><File path="Demos\Host\MassStorageHost\Doxygen.conf"></File><File path="Demos\Host\MassStorageHost\makefile"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.c"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.h"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.txt"></File></Folder><Folder name="MouseHost"><File path="Demos\Host\MouseHost\ConfigDescriptor.c"></File><File path="Demos\Host\MouseHost\ConfigDescriptor.h"></File><File path="Demos\Host\MouseHost\Doxygen.conf"></File><File path="Demos\Host\MouseHost\makefile"></File><File path="Demos\Host\MouseHost\MouseHost.c"></File><File path="Demos\Host\MouseHost\MouseHost.h"></File><File path="Demos\Host\MouseHost\MouseHost.txt"></File></Folder><Folder name="MouseHostWithParser"><File path="Demos\Host\MouseHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\MouseHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\MouseHostWithParser\Doxygen.conf"></File><File path="Demos\Host\MouseHostWithParser\HIDReport.c"></File><File path="Demos\Host\MouseHostWithParser\HIDReport.h"></File><File path="Demos\Host\MouseHostWithParser\makefile"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.c"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.h"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.txt"></File></Folder><Folder name="StillImageHost"><Folder name="Lib"><File path="Demos\Host\StillImageHost\Lib\PIMACodes.h"></File><File path="Demos\Host\StillImageHost\Lib\StillImageCommands.c"></File><File path="Demos\Host\StillImageHost\Lib\StillImageCommands.h"></File></Folder><File path="Demos\Host\StillImageHost\ConfigDescriptor.c"></File><File path="Demos\Host\StillImageHost\ConfigDescriptor.h"></File><File path="Demos\Host\StillImageHost\Doxygen.conf"></File><File path="Demos\Host\StillImageHost\makefile"></File><File path="Demos\Host\StillImageHost\StillImageHost.c"></File><File path="Demos\Host\StillImageHost\StillImageHost.h"></File><File path="Demos\Host\StillImageHost\StillImageHost.txt"></File></Folder><File path="Demos\Host\makefile"></File></Folder><Folder name="OTG"><Folder name="TestApp"><File path="Demos\OTG\TestApp\Descriptors.c"></File><File path="Demos\OTG\TestApp\Descriptors.h"></File><File path="Demos\OTG\TestApp\Doxygen.conf"></File><File path="Demos\OTG\TestApp\makefile"></File><File path="Demos\OTG\TestApp\TestApp.c"></File><File path="Demos\OTG\TestApp\TestApp.h"></File><File path="Demos\OTG\TestApp\TestApp.txt"></File><File path="Demos\OTG\TestApp\TestEvents.c"></File><File path="Demos\OTG\TestApp\TestEvents.h"></File></Folder><File path="Demos\OTG\makefile"></File></Folder><File path="Demos\makefile"></File></Folder><Folder name="LUFA"><Folder name="Common"><File path="LUFA\Common\Common.h"></File><File path="LUFA\Common\FunctionAttributes.h"></File><File path="LUFA\Common\BoardTypes.h"></File></Folder><Folder name="Drivers"><Folder name="USB"><Folder name="LowLevel"><File path="LUFA\Drivers\USB\LowLevel\HostChapter9.h"></File><File path="LUFA\Drivers\USB\LowLevel\LowLevel.c"></File><File path="LUFA\Drivers\USB\LowLevel\LowLevel.h"></File><File path="LUFA\Drivers\USB\LowLevel\Pipe.c"></File><File path="LUFA\Drivers\USB\LowLevel\Pipe.h"></File><File path="LUFA\Drivers\USB\LowLevel\DevChapter9.c"></File><File path="LUFA\Drivers\USB\LowLevel\DevChapter9.h"></File><File path="LUFA\Drivers\USB\LowLevel\Device.h"></File><File path="LUFA\Drivers\USB\LowLevel\Endpoint.c"></File><File path="LUFA\Drivers\USB\LowLevel\Endpoint.h"></File><File path="LUFA\Drivers\USB\LowLevel\Host.c"></File><File path="LUFA\Drivers\USB\LowLevel\Host.h"></File><File path="LUFA\Drivers\USB\LowLevel\HostChapter9.c"></File><File path="LUFA\Drivers\USB\LowLevel\OTG.h"></File></Folder><Folder name="HighLevel"><File path="LUFA\Drivers\USB\HighLevel\USBTask.h"></File><File path="LUFA\Drivers\USB\HighLevel\Events.c"></File><File path="LUFA\Drivers\USB\HighLevel\Events.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBInterrupt.c"></File><File path="LUFA\Drivers\USB\HighLevel\USBInterrupt.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBTask.c"></File><File path="LUFA\Drivers\USB\HighLevel\StdDescriptors.h"></File><File path="LUFA\Drivers\USB\HighLevel\StdRequestType.h"></File><File path="LUFA\Drivers\USB\HighLevel\StreamCallbacks.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBMode.h"></File><File path="LUFA\Drivers\USB\HighLevel\ConfigDescriptor.c"></File><File path="LUFA\Drivers\USB\HighLevel\ConfigDescriptor.h"></File></Folder><Folder name="Class"><Folder name="Device"><File path="LUFA\Drivers\USB\Class\Device\HID.c"></File><File path="LUFA\Drivers\USB\Class\Device\HID.h"></File><File path="LUFA\Drivers\USB\Class\Device\CDC.c"></File><File path="LUFA\Drivers\USB\Class\Device\CDC.h"></File><File path="LUFA\Drivers\USB\Class\Device\RNDIS.c"></File><File path="LUFA\Drivers\USB\Class\Device\RNDIS.h"></File><File path="LUFA\Drivers\USB\Class\Device\RNDISConstants.h"></File><File path="LUFA\Drivers\USB\Class\Device\MassStorage.c"></File><File path="LUFA\Drivers\USB\Class\Device\MassStorage.h"></File><File path="LUFA\Drivers\USB\Class\Device\Audio.c"></File><File path="LUFA\Drivers\USB\Class\Device\Audio.h"></File><File path="LUFA\Drivers\USB\Class\Device\MIDI.c"></File><File path="LUFA\Drivers\USB\Class\Device\MIDI.h"></File></Folder><Folder name="Host"><File path="LUFA\Drivers\USB\Class\Host\HIDParser.c"></File><File path="LUFA\Drivers\USB\Class\Host\HIDParser.h"></File><File path="LUFA\Drivers\USB\Class\Host\HIDReportData.h"></File></Folder></Folder><File path="LUFA\Drivers\USB\USB.h"></File></Folder><Folder name="Misc"><File path="LUFA\Drivers\Misc\TerminalCodes.h"></File></Folder><Folder name="Board"><Folder name="USBKEY"><File path="LUFA\Drivers\Board\USBKEY\Dataflash.h"></File><File path="LUFA\Drivers\Board\USBKEY\Joystick.h"></File><File path="LUFA\Drivers\Board\USBKEY\AT45DB642D.h"></File><File path="LUFA\Drivers\Board\USBKEY\LEDs.h"></File><File path="LUFA\Drivers\Board\USBKEY\Buttons.h"></File></Folder><Folder name="STK526"><File path="LUFA\Drivers\Board\STK526\Dataflash.h"></File><File path="LUFA\Drivers\Board\STK526\Joystick.h"></File><File path="LUFA\Drivers\Board\STK526\AT45DB642D.h"></File><File path="LUFA\Drivers\Board\STK526\LEDs.h"></File><File path="LUFA\Drivers\Board\STK526\Buttons.h"></File></Folder><Folder name="STK525"><File path="LUFA\Drivers\Board\STK525\Dataflash.h"></File><File path="LUFA\Drivers\Board\STK525\Joystick.h"></File><File path="LUFA\Drivers\Board\STK525\AT45DB321C.h"></File><File path="LUFA\Drivers\Board\STK525\LEDs.h"></File><File path="LUFA\Drivers\Board\STK525\Buttons.h"></File></Folder><Folder name="RZUSBSTICK"><File path="LUFA\Drivers\Board\RZUSBSTICK\LEDs.h"></File></Folder><Folder name="ATAVRUSBRF01"><File path="LUFA\Drivers\Board\ATAVRUSBRF01\LEDs.h"></File><File path="LUFA\Drivers\Board\ATAVRUSBRF01\Buttons.h"></File></Folder><File path="LUFA\Drivers\Board\Temperature.h"></File><File path="LUFA\Drivers\Board\Dataflash.h"></File><File path="LUFA\Drivers\Board\Joystick.h"></File><File path="LUFA\Drivers\Board\Temperature.c"></File><File path="LUFA\Drivers\Board\LEDs.h"></File><File path="LUFA\Drivers\Board\Buttons.h"></File></Folder><Folder name="Peripheral"><Folder name="AT90USBXXX67"><File path="LUFA\Drivers\Peripheral\AT90USBXXX67\ADC.h"></File></Folder><File path="LUFA\Drivers\Peripheral\ADC.h"></File><File path="LUFA\Drivers\Peripheral\Serial.c"></File><File path="LUFA\Drivers\Peripheral\Serial.h"></File><File path="LUFA\Drivers\Peripheral\SPI.h"></File><File path="LUFA\Drivers\Peripheral\SerialStream.c"></File><File path="LUFA\Drivers\Peripheral\SerialStream.h"></File></Folder></Folder><Folder name="DriverStubs"><File path="LUFA\DriverStubs\Dataflash.h"></File><File path="LUFA\DriverStubs\Joystick.h"></File><File path="LUFA\DriverStubs\LEDs.h"></File><File path="LUFA\DriverStubs\Buttons.h"></File></Folder><File path="LUFA\makefile"></File><File path="LUFA\Version.h"></File><File path="LUFA\BuildingLinkableLibraries.txt"></File><File path="LUFA\ChangeLog.txt"></File><File path="LUFA\CompileTimeTokens.txt"></File><File path="LUFA\DirectorySummaries.txt"></File><File path="LUFA\Doxygen.conf"></File><File path="LUFA\GettingStarted.txt"></File><File path="LUFA\Groups.txt"></File><File path="LUFA\LUFAPoweredProjects.txt"></File><File path="LUFA\MainPage.txt"></File><File path="LUFA\MigrationInformation.txt"></File><File path="LUFA\VIDAndPIDValues.txt"></File><File path="LUFA\WritingBoardDrivers.txt"></File></Folder><Folder name="Projects"><Folder name="MagStripe"><Folder name="Lib"><File path="Projects\Magstripe\Lib\CircularBitBuffer.c"></File><File path="Projects\Magstripe\Lib\CircularBitBuffer.h"></File><File path="Projects\Magstripe\Lib\MagstripeHW.h"></File></Folder><File path="Projects\Magstripe\Descriptors.c"></File><File path="Projects\Magstripe\Descriptors.h"></File><File path="Projects\Magstripe\Magstripe.c"></File><File path="Projects\Magstripe\Magstripe.h"></File><File path="Projects\Magstripe\makefile"></File><File path="Projects\Magstripe\Magstripe.txt"></File><File path="Projects\Magstripe\Doxygen.conf"></File></Folder><File path="Projects\makefile"></File></Folder><Folder name="Bootloaders"><Folder name="DFU"><File path="Bootloaders\DFU\BootloaderDFU.c"></File><File path="Bootloaders\DFU\BootloaderDFU.h"></File><File path="Bootloaders\DFU\Descriptors.c"></File><File path="Bootloaders\DFU\Descriptors.h"></File><File path="Bootloaders\DFU\makefile"></File><File path="Bootloaders\DFU\BootloaderDFU.txt"></File><File path="Bootloaders\DFU\Doxygen.conf"></File></Folder><Folder name="CDC"><File path="Bootloaders\CDC\BootloaderCDC.c"></File><File path="Bootloaders\CDC\BootloaderCDC.h"></File><File path="Bootloaders\CDC\Descriptors.c"></File><File path="Bootloaders\CDC\Descriptors.h"></File><File path="Bootloaders\CDC\makefile"></File><File path="Bootloaders\CDC\LUFA CDC Bootloader.inf"></File><File path="Bootloaders\CDC\Doxygen.conf"></File><File path="Bootloaders\CDC\BootloaderCDC.txt"></File></Folder><Folder name="TeensyHID"><File path="Bootloaders\TeensyHID\Descriptors.c"></File><File path="Bootloaders\TeensyHID\Descriptors.h"></File><File path="Bootloaders\TeensyHID\makefile"></File><File path="Bootloaders\TeensyHID\TeensyHID.c"></File><File path="Bootloaders\TeensyHID\TeensyHID.h"></File><File path="Bootloaders\TeensyHID\TeensyHID.txt"></File></Folder><File path="Bootloaders\makefile"></File></Folder><File path="makefile"></File></Project>
\ No newline at end of file
diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index b0800ba0f626aa9ebfd7f509a910c000dc98a2bf..d9162ff2d2a55b005e19bf9ba1879953495e68ae 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -35,8 +35,8 @@ void USB_Audio_ProcessControlPacket(USB_ClassInfo_Audio_t* AudioInterfaceInfo)
 	if (!(Endpoint_IsSETUPReceived()))
 	  return;
 	  
-//	if (USB_ControlRequest.wIndex != AudioInterfaceInfo->InterfaceNumber)
-//	  return;
+	if (USB_ControlRequest.wIndex != AudioInterfaceInfo->InterfaceNumber)
+	  return;
 
 	switch (USB_ControlRequest.bRequest)
 	{
diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h
index aa7b4069c60a5352e2986191dd6504a4e5af7040..0ea74864a4910f8d4a8e51bf83ba3d9dca0f6c87 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -37,10 +37,244 @@
 		#include <string.h>
 
 	/* Macros: */
+		/** Descriptor header constant to indicate a Audio class interface descriptor. */
+		#define DTYPE_AudioInterface         0x24
 
-	/* Enums: */
+		/** Descriptor header constant to indicate a Audio class endpoint descriptor. */
+		#define DTYPE_AudioEndpoint          0x25
 
+		/** Audio class descriptor subtype value for a Audio class specific header descriptor. */
+		#define DSUBTYPE_Header              0x01
+
+		/** Audio class descriptor subtype value for an Output Terminal Audio class specific descriptor. */
+		#define DSUBTYPE_InputTerminal       0x02
+
+		/** Audio class descriptor subtype value for an Input Terminal Audio class specific descriptor. */
+		#define DSUBTYPE_OutputTerminal      0x03
+
+		/** Audio class descriptor subtype value for a Feature Unit Audio class specific descriptor. */
+		#define DSUBTYPE_FeatureUnit         0x06
+
+		/** Audio class descriptor subtype value for a general Audio class specific descriptor. */
+		#define DSUBTYPE_General             0x01
+
+		/** Audio class descriptor subtype value for an Audio class specific descriptor indicating the format of an audio stream. */
+		#define DSUBTYPE_Format              0x02
+		
+		//@{
+		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
+
+		#define CHANNEL_LEFT_FRONT           (1 << 0)
+		#define CHANNEL_RIGHT_FRONT          (1 << 1)
+		#define CHANNEL_CENTER_FRONT         (1 << 2)
+		#define CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)
+		#define CHANNEL_LEFT_SURROUND        (1 << 4)
+		#define CHANNEL_RIGHT_SURROUND       (1 << 5)
+		#define CHANNEL_LEFT_OF_CENTER       (1 << 6)
+		#define CHANNEL_RIGHT_OF_CENTER      (1 << 7)
+		#define CHANNEL_SURROUND             (1 << 8)
+		#define CHANNEL_SIDE_LEFT            (1 << 9)
+		#define CHANNEL_SIDE_RIGHT           (1 << 10)
+		#define CHANNEL_TOP                  (1 << 11)
+		//@}
+
+		//@{
+		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
+
+		#define FEATURE_MUTE                 (1 << 0)
+		#define FEATURE_VOLUME               (1 << 1)
+		#define FEATURE_BASS                 (1 << 2)
+		#define FEATURE_MID                  (1 << 3)
+		#define FEATURE_TREBLE               (1 << 4)
+		#define FEATURE_GRAPHIC_EQUALIZER    (1 << 5)
+		#define FEATURE_AUTOMATIC_GAIN       (1 << 6)
+		#define FEATURE_DELAY                (1 << 7)
+		#define FEATURE_BASS_BOOST           (1 << 8)
+		#define FEATURE_BASS_LOUDNESS        (1 << 9)
+		//@}
+
+		//@{
+		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
+		
+		#define TERMINAL_UNDEFINED           0x0100
+		#define TERMINAL_STREAMING           0x0101
+		#define TERMINAL_VENDOR              0x01FF
+		#define TERMINAL_IN_UNDEFINED        0x0200
+		#define TERMINAL_IN_MIC              0x0201
+		#define TERMINAL_IN_DESKTOP_MIC      0x0202
+		#define TERMINAL_IN_PERSONAL_MIC     0x0203
+		#define TERMINAL_IN_OMNIDIR_MIC      0x0204
+		#define TERMINAL_IN_MIC_ARRAY        0x0205
+		#define TERMINAL_IN_PROCESSING_MIC   0x0206
+		#define TERMINAL_IN_OUT_UNDEFINED    0x0300
+		#define TERMINAL_OUT_SPEAKER         0x0301
+		#define TERMINAL_OUT_HEADPHONES      0x0302
+		#define TERMINAL_OUT_HEAD_MOUNTED    0x0303
+		#define TERMINAL_OUT_DESKTOP         0x0304
+		#define TERMINAL_OUT_ROOM            0x0305
+		#define TERMINAL_OUT_COMMUNICATION   0x0306
+		#define TERMINAL_OUT_LOWFREQ         0x0307
+		//@}
+
+		/** Convenience macro, to fill a 24-bit AudioSampleFreq_t structure with the given sample rate as a 24-bit number.
+		 *
+		 *  \param freq  Required audio sampling frequency in HZ
+		 */
+		#define SAMPLE_FREQ(freq)  {LowWord: ((uint32_t)freq & 0x00FFFF), HighByte: (((uint32_t)freq >> 16) & 0x0000FF)}
+		
+		/** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint
+		 *  accepts only filled endpoint packets of audio samples.
+		 */
+		#define EP_ACCEPTS_ONLY_FULL_PACKETS (1 << 7)
+
+		/** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint
+		 *  will accept partially filled endpoint packets of audio samples.
+		 */
+		#define EP_ACCEPTS_SMALL_PACKETS     (0 << 7)
+		
 	/* Type Defines: */
+		/** Type define for an Audio class specific interface descriptor. This follows a regular interface descriptor to
+		 *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more
+		 *  details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+
+			uint16_t                  ACSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */
+			uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */
+			
+			uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */
+			uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */
+		} USB_AudioInterface_AC_t;
+		
+		/** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features
+		 *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio
+		 *  specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+			
+			uint8_t                   UnitID; /**< ID value of this feature unit - must be a unique value within the device */
+			uint8_t                   SourceID; /**< Source ID value of the audio source input into this feature unit */
+			
+			uint8_t                   ControlSize; /**< Size of each element in the ChanelControlls array */
+			uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */
+			
+			uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
+		} USB_AudioFeatureUnit_t;
+
+		/** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device
+		 *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,
+		 *  a USB endpoint). See the USB Audio specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+		
+			uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */
+			uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */
+			uint8_t                   AssociatedOutputTerminal; /**< ID of associated output terminal, for physically grouped terminals
+			                                                     *   such as the speaker and microphone of a phone handset
+			                                                     */
+			uint8_t                   TotalChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */
+			uint16_t                  ChannelConfig; /**< CHANNEL_* masks indicating what channel layout is supported by this terminal */
+			
+			uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */
+			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
+		} USB_AudioInputTerminal_t;
+
+		/** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device
+		 *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,
+		 *  a USB endpoint). See the USB Audio specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+		
+			uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */
+			uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */
+			uint8_t                   AssociatedInputTerminal; /**< ID of associated input terminal, for physically grouped terminals
+			                                                    *   such as the speaker and microphone of a phone handset
+			                                                    */
+			uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */
+			
+			uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
+		} USB_AudioOutputTerminal_t;
+		
+		/** Type define for an Audio class specific streaming interface descriptor. This indicates to the host
+		 *  how audio streams within the device are formatted. See the USB Audio specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+			
+			uint8_t                   TerminalLink; /**< ID value of the output terminal this descriptor is describing */
+			
+			uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */
+			uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */
+		} USB_AudioInterface_AS_t;
+		
+		/** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,
+		 *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.
+		 */
+		typedef struct
+		{
+			uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */
+			uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */
+		} AudioSampleFreq_t;
+
+		/** Type define for an Audio class specific audio format descriptor. This is used to give the host full details
+		 *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used
+		 *  in the device's audio streams. See the USB Audio specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+
+			uint8_t                   FormatType; /**< Format of the audio stream, see Audio Device Formats specification */
+			uint8_t                   Channels; /**< Total number of discrete channels in the stream */
+			
+			uint8_t                   SubFrameSize; /**< Size in bytes of each channel's sample data in the stream */
+			uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */
+
+			uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */			
+			AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */
+		} USB_AudioFormat_t;
+		
+		/** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint 
+		 *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */
+
+			uint8_t                   Refresh; /**< Always set to zero */
+			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */
+		} USB_AudioStreamEndpoint_Std_t;
+					
+		/** Type define for an Audio class specific extended endpoint descriptor. This contains extra information
+		 *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio
+		 *  class specific extended endpoint descriptor. See the USB Audio specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+			
+			uint8_t                   Attributes; /**< Audio class specific endpoint attributes, such as ACCEPTS_SMALL_PACKETS */
+
+			uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */
+			uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */
+		} USB_AudioStreamEndpoint_Spc_t;	
+
 		typedef struct
 		{
 			uint8_t  InterfaceNumber;
diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index 8acaac7a1c9e125f6a30b380254f5e348de6fd22..dcb58dc40fc96e6fcfc2bffa7d90bfda78f4309c 100644
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -136,6 +136,9 @@ void USB_CDC_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint1
 
 void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)
 {
+	if (!(USB_IsConnected))
+	  return;
+
 	Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);
 
 	if (!(Endpoint_IsReadWriteAllowed()))
diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
new file mode 100644
index 0000000000000000000000000000000000000000..9b4cd4b0403cfc2f192e81c00a01d89f70be6089
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -0,0 +1,104 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2009.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, provided that the above copyright notice appear in all
+  copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#include "MIDI.h"
+
+bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)
+{
+	if (MIDIInterfaceInfo->DataINEndpointNumber)
+	{
+		if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,
+										 ENDPOINT_DIR_IN, MIDIInterfaceInfo->DataINEndpointSize,
+										 ENDPOINT_BANK_SINGLE)))
+		{
+			return false;
+		}
+	}
+
+	if (MIDIInterfaceInfo->DataOUTEndpointNumber)
+	{
+		if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,
+										 ENDPOINT_DIR_OUT, MIDIInterfaceInfo->DataOUTEndpointSize,
+										 ENDPOINT_BANK_SINGLE)))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+void USB_MIDI_SendNoteChange(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, const uint8_t Pitch, const bool OnOff,
+                             const uint8_t CableID, const uint8_t Channel)
+{
+	if (!(USB_IsConnected))
+	  return;
+	
+	Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);
+	while (!(Endpoint_IsReadWriteAllowed()));
+
+	uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);
+
+	Endpoint_Write_Byte((CableID << 4) | (Command >> 4));
+
+	Endpoint_Write_Byte(Command | Channel);
+	Endpoint_Write_Byte(Pitch);
+	Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);
+	
+	Endpoint_ClearIN();
+}
+
+void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)
+{
+	if (!(USB_IsConnected))
+	  return;
+	
+	Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);
+	while (!(Endpoint_IsReadWriteAllowed()));
+
+	Endpoint_Write_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);
+	Endpoint_ClearIN();
+}
+
+bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)
+{
+	if (!(USB_IsConnected))
+	  return false;
+	
+	Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber);
+
+	if (!(Endpoint_IsReadWriteAllowed()))
+	  return false;
+
+	Endpoint_Read_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);
+	Endpoint_ClearOUT();
+	
+	return true;
+}
diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
new file mode 100644
index 0000000000000000000000000000000000000000..17823938c0dde6217c55d60db9b8f43942c1b0fe
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -0,0 +1,158 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2009.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, and distribute this software
+  and its documentation for any purpose and without fee is hereby
+  granted, provided that the above copyright notice appear in all
+  copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#ifndef _MIDI_CLASS_H_
+#define _MIDI_CLASS_H_
+
+	/* Includes: */
+		#include "../../USB.h"
+		#include "Audio.h"
+
+		#include <string.h>
+
+	/* Macros: */
+		/** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */
+		#define DSUBTYPE_InputJack          0x02
+
+		/** Audio class descriptor subtype value for a Audio class specific MIDI output jack descriptor. */
+		#define DSUBTYPE_OutputJack         0x03
+		
+		/** Audio class descriptor jack type value for an embedded (logical) MIDI input or output jack. */
+		#define JACKTYPE_EMBEDDED           0x01
+
+		/** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */
+		#define JACKTYPE_EXTERNAL           0x02
+
+		/** MIDI command for a note on (activation) event */
+		#define MIDI_COMMAND_NOTE_ON        0x09
+
+		/** MIDI command for a note off (deactivation) event */
+		#define MIDI_COMMAND_NOTE_OFF       0x08
+
+		/** Standard key press velocity value used for all note events, as no pressure sensor is mounted */
+		#define MIDI_STANDARD_VELOCITY      64
+		
+		/** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel
+		 *  addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.
+		 *
+		 *  \param channel  MIDI channel number to address
+		 */
+		#define MIDI_CHANNEL(channel)        (channel - 1)
+		
+	/* Type Defines: */
+		/** Type define for an Audio class specific MIDI streaming interface descriptor. This indicates to the host
+		 *  how MIDI the specification compliance of the device and the total length of the Audio class specific descriptors.
+		 *  See the USB Audio specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+			
+			uint16_t                  AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */
+			uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */
+		} USB_AudioInterface_MIDI_AS_t;
+		
+		/** Type define for an Audio class specific MIDI IN jack. This gives information to the host on a MIDI input, either
+		 *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+
+			uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values */
+			uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device */
+			
+			uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
+		} USB_MIDI_In_Jack_t;
+
+		/** Type define for an Audio class specific MIDI OUT jack. This gives information to the host on a MIDI output, either
+		 *  a physical output jack, or a logical jack (sending output data internally, or to the host via an endpoint).
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+
+			uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values */
+			uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device */
+			
+			uint8_t                   NumberOfPins; /**< Number of output channels within the jack, either physical or logical */
+			uint8_t                   SourceJackID[1]; /**< ID of each output pin's source data jack */
+			uint8_t                   SourcePinID[1]; /**< Pin number in the input jack of each output pin's source data */
+			
+			uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device */
+		} USB_MIDI_Out_Jack_t;
+		
+		/** Type define for an Audio class specific extended MIDI jack endpoint descriptor. This contains extra information
+		 *  on the usage of MIDI endpoints used to stream MIDI events in and out of the USB Audio device, and follows an Audio
+		 *  class specific extended MIDI endpoint descriptor. See the USB Audio specification for more details.
+		 */
+		typedef struct
+		{
+			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */
+			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */
+
+			uint8_t                   TotalEmbeddedJacks; /**< Total number of jacks inside this endpoint */
+			uint8_t                   AssociatedJackID[1]; /**< IDs of each jack inside the endpoint */
+		} USB_MIDI_Jack_Endpoint_t;
+
+		typedef struct
+		{
+			unsigned char Command     : 4;
+			unsigned char CableNumber : 4;
+			
+			uint8_t Data1;
+			uint8_t Data2;
+			uint8_t Data3;			
+		} USB_MIDI_EventPacket_t;
+
+		typedef struct
+		{
+			uint8_t  InterfaceNumber;
+
+			uint8_t  DataINEndpointNumber;
+			uint16_t DataINEndpointSize;
+
+			uint8_t  DataOUTEndpointNumber;
+			uint16_t DataOUTEndpointSize;
+
+			bool     InterfaceEnabled;
+		} USB_ClassInfo_MIDI_t;
+		
+	/* Function Prototypes: */
+		bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);
+		void USB_MIDI_USBTask(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);
+
+		void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);
+		bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);
+
+#endif
diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.h b/LUFA/Drivers/USB/Class/Device/RNDIS.h
index 73622a4dc0927e438224c7de071f7064bc7b684f..708f57d34dea0055eb83e4385bf5158eeaef07c5 100644
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Device/RNDIS.h
@@ -252,9 +252,8 @@
 			                                     void* SetData, uint16_t SetSize);	
 		#endif
 
-		void     USB_RNDIS_USBTask(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);
-		bool     USB_RNDIS_ConfigureEndpoints(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);
-		void     USB_RNDIS_ProcessControlPacket(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);
-		void     USB_RNDIS_USBTask(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);
+		void USB_RNDIS_USBTask(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);
+		bool USB_RNDIS_ConfigureEndpoints(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);
+		void USB_RNDIS_ProcessControlPacket(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);
 		
 #endif