Add MIDI class driver, update MIDI device demo to use the new USB class driver. All...

diff --git a/Demos/Device/AudioInput/Descriptors.h b/Demos/Device/AudioInput/Descriptors.h
index c2b4b05..0da8952 100644 (file)
--- a/Demos/Device/AudioInput/Descriptors.h
+++ b/Demos/Device/AudioInput/Descriptors.h
@@ -38,105 +38,11 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r

+               #include <LUFA/Drivers/USB/Class/Device/Audio.h>\r

 \r
                #include <avr/pgmspace.h>\r
 \r
        /* Macros: */\r
 \r
                #include <avr/pgmspace.h>\r
 \r
        /* Macros: */\r

-               /** Descriptor header constant to indicate a Audio class interface descriptor. */\r
-               #define DTYPE_AudioInterface         0x24\r
-\r
-               /** Descriptor header constant to indicate a Audio class endpoint descriptor. */\r
-               #define DTYPE_AudioEndpoint          0x25\r
-\r
-               /** Audio class descriptor subtype value for a Audio class specific header descriptor. */\r
-               #define DSUBTYPE_Header              0x01\r
-\r
-               /** Audio class descriptor subtype value for an Output Terminal Audio class specific descriptor. */\r
-               #define DSUBTYPE_InputTerminal       0x02\r
-\r
-               /** Audio class descriptor subtype value for an Input Terminal Audio class specific descriptor. */\r
-               #define DSUBTYPE_OutputTerminal      0x03\r
-\r
-               /** Audio class descriptor subtype value for a Feature Unit Audio class specific descriptor. */\r
-               #define DSUBTYPE_FeatureUnit         0x06\r
-\r
-               /** Audio class descriptor subtype value for a general Audio class specific descriptor. */\r
-               #define DSUBTYPE_General             0x01\r
-\r
-               /** Audio class descriptor subtype value for an Audio class specific descriptor indicating the format of an audio stream. */\r
-               #define DSUBTYPE_Format              0x02\r
-               \r
-               //@{\r
-               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r
-\r
-               #define CHANNEL_LEFT_FRONT           (1 << 0)\r
-               #define CHANNEL_RIGHT_FRONT          (1 << 1)\r
-               #define CHANNEL_CENTER_FRONT         (1 << 2)\r
-               #define CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)\r
-               #define CHANNEL_LEFT_SURROUND        (1 << 4)\r
-               #define CHANNEL_RIGHT_SURROUND       (1 << 5)\r
-               #define CHANNEL_LEFT_OF_CENTER       (1 << 6)\r
-               #define CHANNEL_RIGHT_OF_CENTER      (1 << 7)\r
-               #define CHANNEL_SURROUND             (1 << 8)\r
-               #define CHANNEL_SIDE_LEFT            (1 << 9)\r
-               #define CHANNEL_SIDE_RIGHT           (1 << 10)\r
-               #define CHANNEL_TOP                  (1 << 11)\r
-               //@}\r
-\r
-               //@{\r
-               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r
-\r
-               #define FEATURE_MUTE                 (1 << 0)\r
-               #define FEATURE_VOLUME               (1 << 1)\r
-               #define FEATURE_BASS                 (1 << 2)\r
-               #define FEATURE_MID                  (1 << 3)\r
-               #define FEATURE_TREBLE               (1 << 4)\r
-               #define FEATURE_GRAPHIC_EQUALIZER    (1 << 5)\r
-               #define FEATURE_AUTOMATIC_GAIN       (1 << 6)\r
-               #define FEATURE_DELAY                (1 << 7)\r
-               #define FEATURE_BASS_BOOST           (1 << 8)\r
-               #define FEATURE_BASS_LOUDNESS        (1 << 9)\r
-               //@}\r
-\r
-               //@{\r
-               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */\r
-               \r
-               #define TERMINAL_UNDEFINED           0x0100\r
-               #define TERMINAL_STREAMING           0x0101\r
-               #define TERMINAL_VENDOR              0x01FF\r
-               #define TERMINAL_IN_UNDEFINED        0x0200\r
-               #define TERMINAL_IN_MIC              0x0201\r
-               #define TERMINAL_IN_DESKTOP_MIC      0x0202\r
-               #define TERMINAL_IN_PERSONAL_MIC     0x0203\r
-               #define TERMINAL_IN_OMNIDIR_MIC      0x0204\r
-               #define TERMINAL_IN_MIC_ARRAY        0x0205\r
-               #define TERMINAL_IN_PROCESSING_MIC   0x0206\r
-               #define TERMINAL_IN_OUT_UNDEFINED    0x0300\r
-               #define TERMINAL_OUT_SPEAKER         0x0301\r
-               #define TERMINAL_OUT_HEADPHONES      0x0302\r
-               #define TERMINAL_OUT_HEAD_MOUNTED    0x0303\r
-               #define TERMINAL_OUT_DESKTOP         0x0304\r
-               #define TERMINAL_OUT_ROOM            0x0305\r
-               #define TERMINAL_OUT_COMMUNICATION   0x0306\r
-               #define TERMINAL_OUT_LOWFREQ         0x0307\r
-               //@}\r
-\r
-               /** Convenience macro, to fill a 24-bit AudioSampleFreq_t structure with the given sample rate as a 24-bit number.\r
-                *\r
-                *  \param freq  Required audio sampling frequency in HZ\r
-                */\r
-               #define SAMPLE_FREQ(freq)  {LowWord: ((uint32_t)freq & 0x00FFFF), HighByte: (((uint32_t)freq >> 16) & 0x0000FF)}\r
-               \r
-               /** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint\r
-                *  accepts only filled endpoint packets of audio samples.\r
-                */\r
-               #define EP_ACCEPTS_ONLY_FULL_PACKETS (1 << 7)\r
-\r
-               /** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint\r
-                *  will accept partially filled endpoint packets of audio samples.\r
-                */\r
-               #define EP_ACCEPTS_SMALL_PACKETS     (0 << 7)\r
-\r

                #if defined(USB_FULL_CONTROLLER) || defined(__DOXYGEN__)\r
                        /** Endpoint number of the Audio isochronous streaming data endpoint. */\r
                        #define AUDIO_STREAM_EPNUM       1\r
                #if defined(USB_FULL_CONTROLLER) || defined(__DOXYGEN__)\r
                        /** Endpoint number of the Audio isochronous streaming data endpoint. */\r
                        #define AUDIO_STREAM_EPNUM       1\r


@@ -154,148 +60,6 @@
                #define AUDIO_SAMPLE_FREQUENCY       48000\r
                \r
        /* Type Defines: */\r
                #define AUDIO_SAMPLE_FREQUENCY       48000\r
                \r
        /* Type Defines: */\r

-               /** Type define for an Audio class specific interface descriptor. This follows a regular interface descriptor to\r
-                *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more\r
-                *  details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-\r
-                       uint16_t                  ACSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */\r
-                       uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */\r
-                       \r
-                       uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */\r
-                       uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */\r
-               } USB_AudioInterface_AC_t;\r
-               \r
-               /** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features\r
-                *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio\r
-                *  specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-                       \r
-                       uint8_t                   UnitID; /**< ID value of this feature unit - must be a unique value within the device */\r
-                       uint8_t                   SourceID; /**< Source ID value of the audio source input into this feature unit */\r
-                       \r
-                       uint8_t                   ControlSize; /**< Size of each element in the ChanelControlls array */\r
-                       uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */\r
-                       \r
-                       uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
-               } USB_AudioFeatureUnit_t;\r
-\r
-               /** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device\r
-                *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,\r
-                *  a USB endpoint). See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-               \r
-                       uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */\r
-                       uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */\r
-                       uint8_t                   AssociatedOutputTerminal; /**< ID of associated output terminal, for physically grouped terminals\r
-                                                                            *   such as the speaker and microphone of a phone handset\r
-                                                                            */\r
-                       uint8_t                   TotalChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */\r
-                       uint16_t                  ChannelConfig; /**< CHANNEL_* masks indicating what channel layout is supported by this terminal */\r
-                       \r
-                       uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */\r
-                       uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
-               } USB_AudioInputTerminal_t;\r
-\r
-               /** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device\r
-                *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,\r
-                *  a USB endpoint). See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-               \r
-                       uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */\r
-                       uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */\r
-                       uint8_t                   AssociatedInputTerminal; /**< ID of associated input terminal, for physically grouped terminals\r
-                                                                           *   such as the speaker and microphone of a phone handset\r
-                                                                           */\r
-                       uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */\r
-                       \r
-                       uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
-               } USB_AudioOutputTerminal_t;\r
-               \r
-               /** Type define for an Audio class specific streaming interface descriptor. This indicates to the host\r
-                *  how audio streams within the device are formatted. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-                       \r
-                       uint8_t                   TerminalLink; /**< ID value of the output terminal this descriptor is describing */\r
-                       \r
-                       uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */\r
-                       uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */\r
-               } USB_AudioInterface_AS_t;\r
-               \r
-               /** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,\r
-                *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.\r
-                */\r
-               typedef struct\r
-               {\r
-                       uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */\r
-                       uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */\r
-               } AudioSampleFreq_t;\r
-\r
-               /** Type define for an Audio class specific audio format descriptor. This is used to give the host full details\r
-                *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used\r
-                *  in the device's audio streams. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-\r
-                       uint8_t                   FormatType; /**< Format of the audio stream, see Audio Device Formats specification */\r
-                       uint8_t                   Channels; /**< Total number of discrete channels in the stream */\r
-                       \r
-                       uint8_t                   SubFrameSize; /**< Size in bytes of each channel's sample data in the stream */\r
-                       uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */\r
-\r
-                       uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */                       \r
-                       AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */\r
-               } USB_AudioFormat_t;\r
-               \r
-               /** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint \r
-                *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */\r
-\r
-                       uint8_t                   Refresh; /**< Always set to zero */\r
-                       uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */\r
-               } USB_AudioStreamEndpoint_Std_t;\r
-                                       \r
-               /** Type define for an Audio class specific extended endpoint descriptor. This contains extra information\r
-                *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio\r
-                *  class specific extended endpoint descriptor. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-                       \r
-                       uint8_t                   Attributes; /**< Audio class specific endpoint attributes, such as ACCEPTS_SMALL_PACKETS */\r
-\r
-                       uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */\r
-                       uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */\r
-               } USB_AudioStreamEndpoint_Spc_t;\r
-               \r

                /** Type define for the device configuration descriptor structure. This must be defined in the\r
                 *  application code, as the configuration descriptor contains several sub-descriptors which\r
                 *  vary between devices, and which describe the device's usage to the host.\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r
                 *  application code, as the configuration descriptor contains several sub-descriptors which\r
                 *  vary between devices, and which describe the device's usage to the host.\r

diff --git a/Demos/Device/AudioOutput/Descriptors.h b/Demos/Device/AudioOutput/Descriptors.h
index e114571..1f03f64 100644 (file)
--- a/Demos/Device/AudioOutput/Descriptors.h
+++ b/Demos/Device/AudioOutput/Descriptors.h
@@ -38,105 +38,11 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r

+               #include <LUFA/Drivers/USB/Class/Device/Audio.h>\r

 \r
                #include <avr/pgmspace.h>\r
 \r
        /* Macros: */\r
 \r
                #include <avr/pgmspace.h>\r
 \r
        /* Macros: */\r

-               /** Descriptor header constant to indicate a Audio class interface descriptor. */\r
-               #define DTYPE_AudioInterface         0x24\r
-\r
-               /** Descriptor header constant to indicate a Audio class endpoint descriptor. */\r
-               #define DTYPE_AudioEndpoint          0x25\r
-\r
-               /** Audio class descriptor subtype value for a Audio class specific header descriptor. */\r
-               #define DSUBTYPE_Header              0x01\r
-\r
-               /** Audio class descriptor subtype value for an Output Terminal Audio class specific descriptor. */\r
-               #define DSUBTYPE_InputTerminal       0x02\r
-\r
-               /** Audio class descriptor subtype value for an Input Terminal Audio class specific descriptor. */\r
-               #define DSUBTYPE_OutputTerminal      0x03\r
-\r
-               /** Audio class descriptor subtype value for a Feature Unit Audio class specific descriptor. */\r
-               #define DSUBTYPE_FeatureUnit         0x06\r
-\r
-               /** Audio class descriptor subtype value for a general Audio class specific descriptor. */\r
-               #define DSUBTYPE_General             0x01\r
-\r
-               /** Audio class descriptor subtype value for an Audio class specific descriptor indicating the format of an audio stream. */\r
-               #define DSUBTYPE_Format              0x02\r
-               \r
-               //@{\r
-               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r
-\r
-               #define CHANNEL_LEFT_FRONT           (1 << 0)\r
-               #define CHANNEL_RIGHT_FRONT          (1 << 1)\r
-               #define CHANNEL_CENTER_FRONT         (1 << 2)\r
-               #define CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)\r
-               #define CHANNEL_LEFT_SURROUND        (1 << 4)\r
-               #define CHANNEL_RIGHT_SURROUND       (1 << 5)\r
-               #define CHANNEL_LEFT_OF_CENTER       (1 << 6)\r
-               #define CHANNEL_RIGHT_OF_CENTER      (1 << 7)\r
-               #define CHANNEL_SURROUND             (1 << 8)\r
-               #define CHANNEL_SIDE_LEFT            (1 << 9)\r
-               #define CHANNEL_SIDE_RIGHT           (1 << 10)\r
-               #define CHANNEL_TOP                  (1 << 11)\r
-               //@}\r
-\r
-               //@{\r
-               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r
-\r
-               #define FEATURE_MUTE                 (1 << 0)\r
-               #define FEATURE_VOLUME               (1 << 1)\r
-               #define FEATURE_BASS                 (1 << 2)\r
-               #define FEATURE_MID                  (1 << 3)\r
-               #define FEATURE_TREBLE               (1 << 4)\r
-               #define FEATURE_GRAPHIC_EQUALIZER    (1 << 5)\r
-               #define FEATURE_AUTOMATIC_GAIN       (1 << 6)\r
-               #define FEATURE_DELAY                (1 << 7)\r
-               #define FEATURE_BASS_BOOST           (1 << 8)\r
-               #define FEATURE_BASS_LOUDNESS        (1 << 9)\r
-               //@}\r
-\r
-               //@{\r
-               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */\r
-               \r
-               #define TERMINAL_UNDEFINED           0x0100\r
-               #define TERMINAL_STREAMING           0x0101\r
-               #define TERMINAL_VENDOR              0x01FF\r
-               #define TERMINAL_IN_UNDEFINED        0x0200\r
-               #define TERMINAL_IN_MIC              0x0201\r
-               #define TERMINAL_IN_DESKTOP_MIC      0x0202\r
-               #define TERMINAL_IN_PERSONAL_MIC     0x0203\r
-               #define TERMINAL_IN_OMNIDIR_MIC      0x0204\r
-               #define TERMINAL_IN_MIC_ARRAY        0x0205\r
-               #define TERMINAL_IN_PROCESSING_MIC   0x0206\r
-               #define TERMINAL_IN_OUT_UNDEFINED    0x0300\r
-               #define TERMINAL_OUT_SPEAKER         0x0301\r
-               #define TERMINAL_OUT_HEADPHONES      0x0302\r
-               #define TERMINAL_OUT_HEAD_MOUNTED    0x0303\r
-               #define TERMINAL_OUT_DESKTOP         0x0304\r
-               #define TERMINAL_OUT_ROOM            0x0305\r
-               #define TERMINAL_OUT_COMMUNICATION   0x0306\r
-               #define TERMINAL_OUT_LOWFREQ         0x0307\r
-               //@}\r
-\r
-               /** Convenience macro, to fill a 24-bit AudioSampleFreq_t structure with the given sample rate as a 24-bit number.\r
-                *\r
-                *  \param freq  Required audio sampling frequency in HZ\r
-                */\r
-               #define SAMPLE_FREQ(freq)  {LowWord: ((uint32_t)freq & 0x00FFFF), HighByte: (((uint32_t)freq >> 16) & 0x0000FF)}\r
-               \r
-               /** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint\r
-                *  accepts only filled endpoint packets of audio samples.\r
-                */\r
-               #define EP_ACCEPTS_ONLY_FULL_PACKETS (1 << 7)\r
-\r
-               /** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint\r
-                *  will accept partially filled endpoint packets of audio samples.\r
-                */\r
-               #define EP_ACCEPTS_SMALL_PACKETS     (0 << 7)\r
-\r

                #if defined(USB_FULL_CONTROLLER) || defined(__DOXYGEN__)\r
                        /** Endpoint number of the Audio isochronous streaming data endpoint. */\r
                        #define AUDIO_STREAM_EPNUM       1\r
                #if defined(USB_FULL_CONTROLLER) || defined(__DOXYGEN__)\r
                        /** Endpoint number of the Audio isochronous streaming data endpoint. */\r
                        #define AUDIO_STREAM_EPNUM       1\r


@@ -154,148 +60,6 @@
                #define AUDIO_SAMPLE_FREQUENCY       48000\r
                \r
        /* Type Defines: */\r
                #define AUDIO_SAMPLE_FREQUENCY       48000\r
                \r
        /* Type Defines: */\r

-               /** Type define for an Audio class specific interface descriptor. This follows a regular interface descriptor to\r
-                *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more\r
-                *  details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-\r
-                       uint16_t                  ACSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */\r
-                       uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */\r
-                       \r
-                       uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */\r
-                       uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */\r
-               } USB_AudioInterface_AC_t;\r
-               \r
-               /** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features\r
-                *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio\r
-                *  specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-                       \r
-                       uint8_t                   UnitID; /**< ID value of this feature unit - must be a unique value within the device */\r
-                       uint8_t                   SourceID; /**< Source ID value of the audio source input into this feature unit */\r
-                       \r
-                       uint8_t                   ControlSize; /**< Size of each element in the ChanelControlls array */\r
-                       uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */\r
-                       \r
-                       uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
-               } USB_AudioFeatureUnit_t;\r
-\r
-               /** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device\r
-                *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,\r
-                *  a USB endpoint). See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-               \r
-                       uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */\r
-                       uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */\r
-                       uint8_t                   AssociatedOutputTerminal; /**< ID of associated output terminal, for physically grouped terminals\r
-                                                                            *   such as the speaker and microphone of a phone handset\r
-                                                                            */\r
-                       uint8_t                   TotalChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */\r
-                       uint16_t                  ChannelConfig; /**< CHANNEL_* masks indicating what channel layout is supported by this terminal */\r
-                       \r
-                       uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */\r
-                       uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
-               } USB_AudioInputTerminal_t;\r
-\r
-               /** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device\r
-                *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,\r
-                *  a USB endpoint). See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-               \r
-                       uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */\r
-                       uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */\r
-                       uint8_t                   AssociatedInputTerminal; /**< ID of associated input terminal, for physically grouped terminals\r
-                                                                           *   such as the speaker and microphone of a phone handset\r
-                                                                           */\r
-                       uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */\r
-                       \r
-                       uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
-               } USB_AudioOutputTerminal_t;\r
-               \r
-               /** Type define for an Audio class specific streaming interface descriptor. This indicates to the host\r
-                *  how audio streams within the device are formatted. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-                       \r
-                       uint8_t                   TerminalLink; /**< ID value of the output terminal this descriptor is describing */\r
-                       \r
-                       uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */\r
-                       uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */\r
-               } USB_AudioInterface_AS_t;\r
-               \r
-               /** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,\r
-                *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.\r
-                */\r
-               typedef struct\r
-               {\r
-                       uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */\r
-                       uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */\r
-               } AudioSampleFreq_t;\r
-\r
-               /** Type define for an Audio class specific audio format descriptor. This is used to give the host full details\r
-                *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used\r
-                *  in the device's audio streams. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-\r
-                       uint8_t                   FormatType; /**< Format of the audio stream, see Audio Device Formats specification */\r
-                       uint8_t                   Channels; /**< Total number of discrete channels in the stream */\r
-                       \r
-                       uint8_t                   SubFrameSize; /**< Size in bytes of each channel's sample data in the stream */\r
-                       uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */\r
-\r
-                       uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */                       \r
-                       AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */\r
-               } USB_AudioFormat_t;\r
-               \r
-               /** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint \r
-                *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */\r
-\r
-                       uint8_t                   Refresh; /**< Always set to zero */\r
-                       uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */\r
-               } USB_AudioStreamEndpoint_Std_t;\r
-                                       \r
-               /** Type define for an Audio class specific extended endpoint descriptor. This contains extra information\r
-                *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio\r
-                *  class specific extended endpoint descriptor. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-                       \r
-                       uint8_t                   Attributes; /**< Audio class specific endpoint attributes, such as ACCEPTS_SMALL_PACKETS */\r
-\r
-                       uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */\r
-                       uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */\r
-               } USB_AudioStreamEndpoint_Spc_t;        \r
-\r

                /** Type define for the device configuration descriptor structure. This must be defined in the\r
                 *  application code, as the configuration descriptor contains several sub-descriptors which\r
                 *  vary between devices, and which describe the device's usage to the host.\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r
                 *  application code, as the configuration descriptor contains several sub-descriptors which\r
                 *  vary between devices, and which describe the device's usage to the host.\r

diff --git a/Demos/Device/MIDI/Descriptors.h b/Demos/Device/MIDI/Descriptors.h
index 616acab..d9b1339 100644 (file)
--- a/Demos/Device/MIDI/Descriptors.h
+++ b/Demos/Device/MIDI/Descriptors.h
@@ -38,129 +38,21 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r

+               #include <LUFA/Drivers/USB/Class/Device/MIDI.h>\r

 \r
                #include <avr/pgmspace.h>\r
 \r
        /* Macros: */\r
 \r
                #include <avr/pgmspace.h>\r
 \r
        /* Macros: */\r

-               /** Descriptor header constant to indicate a Audio class interface descriptor. */\r
-               #define DTYPE_AudioInterface        0x24\r
-\r
-               /** Descriptor header constant to indicate a Audio class endpoint descriptor. */\r
-               #define DTYPE_AudioEndpoint         0x25\r
-\r
-               /** Audio class descriptor subtype value for a Audio class specific header descriptor. */\r
-               #define DSUBTYPE_Header             0x01\r
-\r
-               /** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */\r
-               #define DSUBTYPE_InputJack          0x02\r
-\r
-               /** Audio class descriptor subtype value for a Audio class specific MIDI output jack descriptor. */\r
-               #define DSUBTYPE_OutputJack         0x03\r
-\r
-               /** Audio class descriptor subtype value for a general Audio class specific descriptor. */\r
-               #define DSUBTYPE_General            0x01\r
-\r
-               /** Audio class descriptor jack type value for an embedded (logical) MIDI input or output jack. */\r
-               #define JACKTYPE_EMBEDDED           0x01\r
+               /** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */\r
+               #define MIDI_STREAM_IN_EPNUM        2\r

 \r
 \r

-               /** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */\r
-               #define JACKTYPE_EXTERNAL           0x02\r
-               \r

                /** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */\r
                #define MIDI_STREAM_OUT_EPNUM       1\r
 \r
                /** Endpoint number of the MIDI streaming data OUT endpoint, for host-to-device data transfers. */\r
                #define MIDI_STREAM_OUT_EPNUM       1\r
 \r

-               /** Endpoint number of the MIDI streaming data IN endpoint, for device-to-host data transfers. */\r
-               #define MIDI_STREAM_IN_EPNUM        2\r
-\r

                /** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */\r
                #define MIDI_STREAM_EPSIZE          64\r
                \r
        /* Type Defines: */\r
                /** Endpoint size in bytes of the Audio isochronous streaming data IN and OUT endpoints. */\r
                #define MIDI_STREAM_EPSIZE          64\r
                \r
        /* Type Defines: */\r

-               /** Type define for an Audio class specific interface descriptor. This follows a regular interface descriptor to\r
-                *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more\r
-                *  details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-\r
-                       uint16_t                  ACSpecification; /** Binary coded decimal value, indicating the supported Audio Class specification version */\r
-                       uint16_t                  TotalLength; /** Total length of the Audio class specific control descriptors, including this descriptor */\r
-                       \r
-                       uint8_t                   InCollection; /** Total number of audio class interfaces within this device */\r
-                       uint8_t                   InterfaceNumbers[1]; /** Interface numbers of each audio interface */\r
-               } USB_AudioInterface_AC_t;\r
-               \r
-               /** Type define for an Audio class specific MIDI streaming interface descriptor. This indicates to the host\r
-                *  how MIDI the specification compliance of the device and the total length of the Audio class specific descriptors.\r
-                *  See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-                       \r
-                       uint16_t                  AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */\r
-                       uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */\r
-               } USB_AudioInterface_MIDI_AS_t;\r
-               \r
-               /** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint \r
-                *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */\r
-\r
-                       uint8_t                   Refresh; /**< Always set to zero */\r
-                       uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */\r
-               } USB_AudioStreamEndpoint_Std_t;\r
-\r
-               /** Type define for an Audio class specific MIDI IN jack. This gives information to the host on a MIDI input, either\r
-                *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-\r
-                       uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values */\r
-                       uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device */\r
-                       \r
-                       uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
-               } USB_MIDI_In_Jack_t;\r
-\r
-               /** Type define for an Audio class specific MIDI OUT jack. This gives information to the host on a MIDI output, either\r
-                *  a physical output jack, or a logical jack (sending output data internally, or to the host via an endpoint).\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-\r
-                       uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values */\r
-                       uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device */\r
-                       \r
-                       uint8_t                   NumberOfPins; /**< Number of output channels within the jack, either physical or logical */\r
-                       uint8_t                   SourceJackID[1]; /**< ID of each output pin's source data jack */\r
-                       uint8_t                   SourcePinID[1]; /**< Pin number in the input jack of each output pin's source data */\r
-                       \r
-                       uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
-               } USB_MIDI_Out_Jack_t;\r
-               \r
-               /** Type define for an Audio class specific extended MIDI jack endpoint descriptor. This contains extra information\r
-                *  on the usage of MIDI endpoints used to stream MIDI events in and out of the USB Audio device, and follows an Audio\r
-                *  class specific extended MIDI endpoint descriptor. See the USB Audio specification for more details.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
-                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
-\r
-                       uint8_t                   TotalEmbeddedJacks; /**< Total number of jacks inside this endpoint */\r
-                       uint8_t                   AssociatedJackID[1]; /**< IDs of each jack inside the endpoint */\r
-               } USB_MIDI_Jack_Endpoint_t;\r
-\r

                /** Type define for the device configuration descriptor structure. This must be defined in the\r
                 *  application code, as the configuration descriptor contains several sub-descriptors which\r
                 *  vary between devices, and which describe the device's usage to the host.\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r
                 *  application code, as the configuration descriptor contains several sub-descriptors which\r
                 *  vary between devices, and which describe the device's usage to the host.\r

diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c
index b6b43df..1fee347 100644 (file)
--- a/Demos/Device/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
@@ -28,26 +28,35 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

-/** \file\r
- *\r
- *  Main source file for the MIDI input demo. This file contains the main tasks of the demo and\r
- *  is responsible for the initial application hardware configuration.\r
- */\r
-\r

 #include "MIDI.h"\r
 \r
 #include "MIDI.h"\r
 \r

-/* Scheduler Task List */\r
-TASK_LIST\r
-{\r
-       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
-       { .Task = USB_MIDI_Task        , .TaskStatus = TASK_STOP },\r
-};\r
+USB_ClassInfo_MIDI_t Keyboard_MIDI_Interface =\r
+       {\r
+               .InterfaceNumber       = 0,\r
+\r
+               .DataINEndpointNumber  = MIDI_STREAM_IN_EPNUM,\r
+               .DataINEndpointSize    = MIDI_STREAM_EPSIZE,\r

 \r
 \r

-/** Main program entry point. This routine configures the hardware required by the application, then\r
- *  starts the scheduler to run the application tasks.\r
- */\r
+               .DataOUTEndpointNumber = MIDI_STREAM_OUT_EPNUM,\r
+               .DataOUTEndpointSize   = MIDI_STREAM_EPSIZE,\r
+       };\r
+       \r

 int main(void)\r
 {\r
 int main(void)\r
 {\r

+       SetupHardware();\r
+\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+       \r
+       for (;;)\r
+       {\r
+               CheckJoystickMovement();\r
+       \r
+               USB_USBTask();\r
+       }\r
+}\r
+\r
+void SetupHardware(void)\r
+{\r

        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r


@@ -59,161 +68,85 @@ int main(void)
        Joystick_Init();\r
        LEDs_Init();\r
        Buttons_Init();\r
        Joystick_Init();\r
        LEDs_Init();\r
        Buttons_Init();\r

-\r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
-       \r
-       /* Initialize Scheduler so that it can be used */\r
-       Scheduler_Init();\r
-\r
-       /* Initialize USB Subsystem */\r

        USB_Init();\r
        USB_Init();\r

-\r
-       /* Scheduling - routine never returns, so put this last in the main function */\r
-       Scheduler_Start();\r
-}\r
-\r
-/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */\r
-void EVENT_USB_Connect(void)\r
-{\r
-       /* Start USB management task */\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
-\r
-       /* Indicate USB enumerating */\r
-       UpdateStatus(Status_USBEnumerating);\r
-}\r
-\r
-/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
- *  the status LEDs, disables the sample update and PWM output timers and stops the USB and MIDI management tasks.\r
- */\r
-void EVENT_USB_Disconnect(void)\r
-{\r
-       /* Stop running audio and USB management tasks */\r
-       Scheduler_SetTaskMode(USB_MIDI_Task, TASK_STOP);\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
-\r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
-}\r
-\r
-/** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
- *  of the USB device after enumeration - the device endpoints are configured and the MIDI management task started.\r
- */\r
-void EVENT_USB_ConfigurationChanged(void)\r
-{\r
-       /* Setup MIDI stream endpoints */\r
-       Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_OUT, MIDI_STREAM_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
-\r
-       Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_IN, MIDI_STREAM_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
-\r
-       /* Indicate USB connected and ready */\r
-       UpdateStatus(Status_USBReady);\r
-\r
-       /* Start MIDI task */\r
-       Scheduler_SetTaskMode(USB_MIDI_Task, TASK_RUN);\r

 }\r
 \r
 }\r
 \r

-/** Task to handle the generation of MIDI note change events in response to presses of the board joystick, and send them\r
- *  to the host.\r
- */\r
-TASK(USB_MIDI_Task)\r
+void CheckJoystickMovement(void)\r

 {\r
        static uint8_t PrevJoystickStatus;\r
 \r
 {\r
        static uint8_t PrevJoystickStatus;\r
 \r

-       /* Select the MIDI IN stream */\r
-       Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
-\r
-       /* Check if endpoint is ready to be written to */\r
-       if (Endpoint_IsINReady())\r
-       {\r
-               /* Get current joystick mask, XOR with previous to detect joystick changes */\r
-               uint8_t JoystickStatus  = Joystick_GetStatus();\r
-               uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r
+       uint8_t MIDICommand = 0;\r
+       uint8_t MIDIPitch;\r
+       \r
+       /* Get current joystick mask, XOR with previous to detect joystick changes */\r
+       uint8_t JoystickStatus  = Joystick_GetStatus();\r
+       uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus);\r

                \r
                \r

-               /* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */\r
-               uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));\r
-\r
-               if (JoystickChanges & JOY_LEFT)\r
-                 SendMIDINoteChange(0x3C, (JoystickStatus & JOY_LEFT), 0, Channel);\r
-\r
-               if (JoystickChanges & JOY_UP)\r
-                 SendMIDINoteChange(0x3D, (JoystickStatus & JOY_UP), 0, Channel);\r
-\r
-               if (JoystickChanges & JOY_RIGHT)\r
-                 SendMIDINoteChange(0x3E, (JoystickStatus & JOY_RIGHT), 0, Channel);\r
+       /* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */\r
+       uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1));\r

 \r
 \r

-               if (JoystickChanges & JOY_DOWN)\r
-                 SendMIDINoteChange(0x3F, (JoystickStatus & JOY_DOWN), 0, Channel);\r
-\r
-               if (JoystickChanges & JOY_PRESS)\r
-                 SendMIDINoteChange(0x3B, (JoystickStatus & JOY_PRESS), 0, Channel);\r
-\r
-               /* Save previous joystick value for next joystick change detection */\r
-               PrevJoystickStatus = JoystickStatus;\r
+       if (JoystickChanges & JOY_LEFT)\r
+       {\r
+               MIDICommand = ((JoystickStatus & JOY_LEFT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3C;\r

        }\r
 \r
        }\r
 \r

-       /* Select the MIDI OUT stream */\r
-       Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPNUM);\r
-\r
-       /* Check if endpoint is ready to be read from, if so discard its (unused) data */\r
-       if (Endpoint_IsOUTReceived())\r
-         Endpoint_ClearOUT();\r
-}\r
+       if (JoystickChanges & JOY_UP)\r
+       {\r
+               MIDICommand = ((JoystickStatus & JOY_UP)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3D;\r
+       }\r

 \r
 \r

-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r
- *  log to a serial port, or anything else that is suitable for status updates.\r
- *\r
- *  \param CurrentStatus  Current status of the system, from the MIDI_StatusCodes_t enum\r
- */\r
-void UpdateStatus(uint8_t CurrentStatus)\r
-{\r
-       uint8_t LEDMask = LEDS_NO_LEDS;\r
+       if (JoystickChanges & JOY_RIGHT)\r
+       {\r
+               MIDICommand = ((JoystickStatus & JOY_RIGHT)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3E;\r
+       }\r

        \r
        \r

-       /* Set the LED mask to the appropriate LED mask based on the given status code */\r
-       switch (CurrentStatus)\r
+       if (JoystickChanges & JOY_DOWN)\r
+       {\r
+               MIDICommand = ((JoystickStatus & JOY_DOWN)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3F;\r
+       }\r
+\r
+       if (JoystickChanges & JOY_PRESS)\r

        {\r
        {\r

-               case Status_USBNotReady:\r
-                       LEDMask = (LEDS_LED1);\r
-                       break;\r
-               case Status_USBEnumerating:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-                       break;\r
-               case Status_USBReady:\r
-                       LEDMask = (LEDS_LED2 | LEDS_LED4);\r
-                       break;\r
+               MIDICommand = ((JoystickStatus & JOY_PRESS)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+               MIDIPitch   = 0x3B;\r

        }\r
        \r
        }\r
        \r

-       /* Set the board LEDs to the new LED mask */\r
-       LEDs_SetAllLEDs(LEDMask);\r
+       if (MIDICommand)\r
+       {\r
+               USB_MIDI_EventPacket_t MIDIEvent = (USB_MIDI_EventPacket_t)\r
+                       {\r
+                               .CableNumber = 0,\r
+                               .Command     = MIDICommand,\r
+                               \r
+                               .Data1       = (MIDICommand << 4) | Channel,\r
+                               .Data2       = MIDIPitch,\r
+                               .Data3       = MIDI_STANDARD_VELOCITY,                  \r
+                       };\r
+                       \r
+               USB_MIDI_SendEventPacket(&Keyboard_MIDI_Interface, &MIDIEvent);\r
+       }\r
+\r
+       PrevJoystickStatus = JoystickStatus;\r

 }\r
 \r
 }\r
 \r

-/** Sends a MIDI note change event (note on or off) to the MIDI output jack, on the given virtual cable ID and channel.\r
- *\r
- *  \param Pitch    Pitch of the note to turn on or off\r
- *  \param OnOff    Set to true if the note is on (being held down), or false otherwise\r
- *  \param CableID  ID of the virtual cable to send the note change to\r
- *  \param Channel  MIDI channel number to send the note change event to\r
- */\r
-void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel)\r
+void EVENT_USB_Connect(void)\r

 {\r
 {\r

-       /* Wait until endpoint ready for more data */\r
-       while (!(Endpoint_IsReadWriteAllowed()));\r
-\r
-       /* Check if the message should be a Note On or Note Off command */\r
-       uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
+}\r

 \r
 \r

-       /* Write the Packet Header to the endpoint */\r
-       Endpoint_Write_Byte((CableID << 4) | (Command >> 4));\r
+void EVENT_USB_Disconnect(void)\r
+{\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+}\r

 \r
 \r

-       /* Write the Note On/Off command with the specified channel, pitch and velocity */\r
-       Endpoint_Write_Byte(Command | Channel);\r
-       Endpoint_Write_Byte(Pitch);\r
-       Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
+void EVENT_USB_ConfigurationChanged(void)\r
+{\r
+       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

        \r
        \r

-       /* Send the data in the endpoint to the host */\r
-       Endpoint_ClearIN();\r
+       if (!(USB_MIDI_ConfigureEndpoints(&Keyboard_MIDI_Interface)))\r
+         LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

 }\r
 }\r

diff --git a/Demos/Device/MIDI/MIDI.h b/Demos/Device/MIDI/MIDI.h
index 635036a..10d8d33 100644 (file)
--- a/Demos/Device/MIDI/MIDI.h
+++ b/Demos/Device/MIDI/MIDI.h
@@ -44,49 +44,27 @@
 \r
                #include "Descriptors.h"\r
                                \r
 \r
                #include "Descriptors.h"\r
                                \r

-               #include <LUFA/Version.h>                            // Library Version Information\r
-               #include <LUFA/Drivers/USB/USB.h>                    // USB Functionality\r
-               #include <LUFA/Drivers/Board/Joystick.h>             // Joystick driver\r
-               #include <LUFA/Drivers/Board/LEDs.h>                 // LEDs driver\r
-               #include <LUFA/Drivers/Board/Buttons.h>              // Board Buttons driver\r
-               #include <LUFA/Scheduler/Scheduler.h>                // Simple scheduler for task management\r
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               #include <LUFA/Drivers/Board/Joystick.h>\r
+               #include <LUFA/Drivers/Board/Buttons.h>\r
+               #include <LUFA/Drivers/Peripheral/ADC.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/USB/Class/Device/MIDI.h>\r

 \r
 \r

-   /* Macros: */\r
-               /** MIDI command for a note on (activation) event */\r
-               #define MIDI_COMMAND_NOTE_ON         0x90\r
-\r
-               /** MIDI command for a note off (deactivation) event */\r
-               #define MIDI_COMMAND_NOTE_OFF        0x80\r
-\r
-               /** Standard key press velocity value used for all note events, as no pressure sensor is mounted */\r
-               #define MIDI_STANDARD_VELOCITY       64\r
+       /* Macros: */\r
+               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
+               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
+               \r
+       /* Function Prototypes: */\r
+               void SetupHardware(void);\r
+               void CheckJoystickMovement(void);\r

                \r
                \r

-               /** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel\r
-                *  addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.\r
-                *\r
-                *  \param channel  MIDI channel number to address\r
-                */\r
-               #define MIDI_CHANNEL(channel)        (channel - 1)\r
-\r
-       /* Enums: */\r
-               /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
-               enum MIDI_StatusCodes_t\r
-               {\r
-                       Status_USBNotReady    = 0, /**< USB is not ready (disconnected from a USB host) */\r
-                       Status_USBEnumerating = 1, /**< USB interface is enumerating */\r
-                       Status_USBReady       = 2, /**< USB interface is connected and ready */\r
-               };\r
-\r
-       /* Task Definitions: */\r
-               TASK(USB_MIDI_Task);\r
-\r
-   /* Function Prototypes: */\r

                void EVENT_USB_Connect(void);\r
                void EVENT_USB_Disconnect(void);\r
                void EVENT_USB_ConfigurationChanged(void);\r
                void EVENT_USB_Connect(void);\r
                void EVENT_USB_Disconnect(void);\r
                void EVENT_USB_ConfigurationChanged(void);\r

-\r
-               void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff,\r
-                                       const uint8_t CableID, const uint8_t Channel);          \r
-               void UpdateStatus(uint8_t CurrentStatus);\r
+               void EVENT_USB_UnhandledControlPacket(void);\r

                \r
 #endif\r
                \r
 #endif\r

diff --git a/Demos/Device/MIDI/makefile b/Demos/Device/MIDI/makefile
index 485cdc7..f850421 100644 (file)
--- 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.)\r
 SRC = $(TARGET).c                                                 \\r
          Descriptors.c                                               \\r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          Descriptors.c                                               \\r

-         $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \\r

          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r


@@ -136,7 +135,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r

-         $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/MIDI.c           \\r

 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/LUFA.pnproj b/LUFA.pnproj
index ae38c0b..7bca259 100644 (file)
--- 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 b0800ba..d9162ff 100644 (file)
--- 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()))\r
          return;\r
          \r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r

-//     if (USB_ControlRequest.wIndex != AudioInterfaceInfo->InterfaceNumber)\r
-//       return;\r
+       if (USB_ControlRequest.wIndex != AudioInterfaceInfo->InterfaceNumber)\r
+         return;\r

 \r
        switch (USB_ControlRequest.bRequest)\r
        {\r
 \r
        switch (USB_ControlRequest.bRequest)\r
        {\r

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h
index aa7b406..0ea7486 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -37,10 +37,244 @@
                #include <string.h>\r
 \r
        /* Macros: */\r
                #include <string.h>\r
 \r
        /* Macros: */\r

+               /** Descriptor header constant to indicate a Audio class interface descriptor. */\r
+               #define DTYPE_AudioInterface         0x24\r

 \r
 \r

-       /* Enums: */\r
+               /** Descriptor header constant to indicate a Audio class endpoint descriptor. */\r
+               #define DTYPE_AudioEndpoint          0x25\r

 \r
 \r

+               /** Audio class descriptor subtype value for a Audio class specific header descriptor. */\r
+               #define DSUBTYPE_Header              0x01\r
+\r
+               /** Audio class descriptor subtype value for an Output Terminal Audio class specific descriptor. */\r
+               #define DSUBTYPE_InputTerminal       0x02\r
+\r
+               /** Audio class descriptor subtype value for an Input Terminal Audio class specific descriptor. */\r
+               #define DSUBTYPE_OutputTerminal      0x03\r
+\r
+               /** Audio class descriptor subtype value for a Feature Unit Audio class specific descriptor. */\r
+               #define DSUBTYPE_FeatureUnit         0x06\r
+\r
+               /** Audio class descriptor subtype value for a general Audio class specific descriptor. */\r
+               #define DSUBTYPE_General             0x01\r
+\r
+               /** Audio class descriptor subtype value for an Audio class specific descriptor indicating the format of an audio stream. */\r
+               #define DSUBTYPE_Format              0x02\r
+               \r
+               //@{\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r
+\r
+               #define CHANNEL_LEFT_FRONT           (1 << 0)\r
+               #define CHANNEL_RIGHT_FRONT          (1 << 1)\r
+               #define CHANNEL_CENTER_FRONT         (1 << 2)\r
+               #define CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)\r
+               #define CHANNEL_LEFT_SURROUND        (1 << 4)\r
+               #define CHANNEL_RIGHT_SURROUND       (1 << 5)\r
+               #define CHANNEL_LEFT_OF_CENTER       (1 << 6)\r
+               #define CHANNEL_RIGHT_OF_CENTER      (1 << 7)\r
+               #define CHANNEL_SURROUND             (1 << 8)\r
+               #define CHANNEL_SIDE_LEFT            (1 << 9)\r
+               #define CHANNEL_SIDE_RIGHT           (1 << 10)\r
+               #define CHANNEL_TOP                  (1 << 11)\r
+               //@}\r
+\r
+               //@{\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r
+\r
+               #define FEATURE_MUTE                 (1 << 0)\r
+               #define FEATURE_VOLUME               (1 << 1)\r
+               #define FEATURE_BASS                 (1 << 2)\r
+               #define FEATURE_MID                  (1 << 3)\r
+               #define FEATURE_TREBLE               (1 << 4)\r
+               #define FEATURE_GRAPHIC_EQUALIZER    (1 << 5)\r
+               #define FEATURE_AUTOMATIC_GAIN       (1 << 6)\r
+               #define FEATURE_DELAY                (1 << 7)\r
+               #define FEATURE_BASS_BOOST           (1 << 8)\r
+               #define FEATURE_BASS_LOUDNESS        (1 << 9)\r
+               //@}\r
+\r
+               //@{\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */\r
+               \r
+               #define TERMINAL_UNDEFINED           0x0100\r
+               #define TERMINAL_STREAMING           0x0101\r
+               #define TERMINAL_VENDOR              0x01FF\r
+               #define TERMINAL_IN_UNDEFINED        0x0200\r
+               #define TERMINAL_IN_MIC              0x0201\r
+               #define TERMINAL_IN_DESKTOP_MIC      0x0202\r
+               #define TERMINAL_IN_PERSONAL_MIC     0x0203\r
+               #define TERMINAL_IN_OMNIDIR_MIC      0x0204\r
+               #define TERMINAL_IN_MIC_ARRAY        0x0205\r
+               #define TERMINAL_IN_PROCESSING_MIC   0x0206\r
+               #define TERMINAL_IN_OUT_UNDEFINED    0x0300\r
+               #define TERMINAL_OUT_SPEAKER         0x0301\r
+               #define TERMINAL_OUT_HEADPHONES      0x0302\r
+               #define TERMINAL_OUT_HEAD_MOUNTED    0x0303\r
+               #define TERMINAL_OUT_DESKTOP         0x0304\r
+               #define TERMINAL_OUT_ROOM            0x0305\r
+               #define TERMINAL_OUT_COMMUNICATION   0x0306\r
+               #define TERMINAL_OUT_LOWFREQ         0x0307\r
+               //@}\r
+\r
+               /** Convenience macro, to fill a 24-bit AudioSampleFreq_t structure with the given sample rate as a 24-bit number.\r
+                *\r
+                *  \param freq  Required audio sampling frequency in HZ\r
+                */\r
+               #define SAMPLE_FREQ(freq)  {LowWord: ((uint32_t)freq & 0x00FFFF), HighByte: (((uint32_t)freq >> 16) & 0x0000FF)}\r
+               \r
+               /** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint\r
+                *  accepts only filled endpoint packets of audio samples.\r
+                */\r
+               #define EP_ACCEPTS_ONLY_FULL_PACKETS (1 << 7)\r
+\r
+               /** Mask for the attributes parameter of an Audio class specific Endpoint descriptor, indicating that the endpoint\r
+                *  will accept partially filled endpoint packets of audio samples.\r
+                */\r
+               #define EP_ACCEPTS_SMALL_PACKETS     (0 << 7)\r
+               \r

        /* Type Defines: */\r
        /* Type Defines: */\r

+               /** Type define for an Audio class specific interface descriptor. This follows a regular interface descriptor to\r
+                *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more\r
+                *  details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+\r
+                       uint16_t                  ACSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */\r
+                       uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */\r
+                       \r
+                       uint8_t                   InCollection; /**< Total number of audio class interfaces within this device */\r
+                       uint8_t                   InterfaceNumbers[1]; /**< Interface numbers of each audio interface */\r
+               } USB_AudioInterface_AC_t;\r
+               \r
+               /** Type define for an Audio class specific Feature Unit descriptor. This indicates to the host what features\r
+                *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio\r
+                *  specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+                       \r
+                       uint8_t                   UnitID; /**< ID value of this feature unit - must be a unique value within the device */\r
+                       uint8_t                   SourceID; /**< Source ID value of the audio source input into this feature unit */\r
+                       \r
+                       uint8_t                   ControlSize; /**< Size of each element in the ChanelControlls array */\r
+                       uint8_t                   ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel */\r
+                       \r
+                       uint8_t                   FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
+               } USB_AudioFeatureUnit_t;\r
+\r
+               /** Type define for an Audio class specific input terminal descriptor. This indicates to the host that the device\r
+                *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,\r
+                *  a USB endpoint). See the USB Audio specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+               \r
+                       uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */\r
+                       uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */\r
+                       uint8_t                   AssociatedOutputTerminal; /**< ID of associated output terminal, for physically grouped terminals\r
+                                                                            *   such as the speaker and microphone of a phone handset\r
+                                                                            */\r
+                       uint8_t                   TotalChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */\r
+                       uint16_t                  ChannelConfig; /**< CHANNEL_* masks indicating what channel layout is supported by this terminal */\r
+                       \r
+                       uint8_t                   ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device */\r
+                       uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
+               } USB_AudioInputTerminal_t;\r
+\r
+               /** Type define for an Audio class specific output terminal descriptor. This indicates to the host that the device\r
+                *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,\r
+                *  a USB endpoint). See the USB Audio specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+               \r
+                       uint8_t                   TerminalID; /**< ID value of this terminal unit - must be a unique value within the device */\r
+                       uint16_t                  TerminalType; /**< Type of terminal, a TERMINAL_* mask */\r
+                       uint8_t                   AssociatedInputTerminal; /**< ID of associated input terminal, for physically grouped terminals\r
+                                                                           *   such as the speaker and microphone of a phone handset\r
+                                                                           */\r
+                       uint8_t                   SourceID; /**< ID value of the unit this terminal's audio is sourced from */\r
+                       \r
+                       uint8_t                   TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
+               } USB_AudioOutputTerminal_t;\r
+               \r
+               /** Type define for an Audio class specific streaming interface descriptor. This indicates to the host\r
+                *  how audio streams within the device are formatted. See the USB Audio specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+                       \r
+                       uint8_t                   TerminalLink; /**< ID value of the output terminal this descriptor is describing */\r
+                       \r
+                       uint8_t                   FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output */\r
+                       uint16_t                  AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification */\r
+               } USB_AudioInterface_AS_t;\r
+               \r
+               /** Type define for a 24bit audio sample frequency structure. GCC does not contain a built in 24bit datatype,\r
+                *  this this structure is used to build up the value instead. Fill this structure with the SAMPLE_FREQ() macro.\r
+                */\r
+               typedef struct\r
+               {\r
+                       uint16_t                  LowWord; /**< Low 16 bits of the 24-bit value */\r
+                       uint8_t                   HighByte; /**< Upper 8 bits of the 24-bit value */\r
+               } AudioSampleFreq_t;\r
+\r
+               /** Type define for an Audio class specific audio format descriptor. This is used to give the host full details\r
+                *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used\r
+                *  in the device's audio streams. See the USB Audio specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+\r
+                       uint8_t                   FormatType; /**< Format of the audio stream, see Audio Device Formats specification */\r
+                       uint8_t                   Channels; /**< Total number of discrete channels in the stream */\r
+                       \r
+                       uint8_t                   SubFrameSize; /**< Size in bytes of each channel's sample data in the stream */\r
+                       uint8_t                   BitResolution; /**< Bits of resolution of each channel's samples in the stream */\r
+\r
+                       uint8_t                   SampleFrequencyType; /**< Total number of sample frequencies supported by the device */                       \r
+                       AudioSampleFreq_t         SampleFrequencies[1]; /**< Sample frequencies supported by the device */\r
+               } USB_AudioFormat_t;\r
+               \r
+               /** Type define for an Audio class specific endpoint descriptor. This contains a regular endpoint \r
+                *  descriptor with a few Audio-class specific extensions. See the USB Audio specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint */\r
+\r
+                       uint8_t                   Refresh; /**< Always set to zero */\r
+                       uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronisation information to, if needed (zero otherwise) */\r
+               } USB_AudioStreamEndpoint_Std_t;\r
+                                       \r
+               /** Type define for an Audio class specific extended endpoint descriptor. This contains extra information\r
+                *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio\r
+                *  class specific extended endpoint descriptor. See the USB Audio specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+                       \r
+                       uint8_t                   Attributes; /**< Audio class specific endpoint attributes, such as ACCEPTS_SMALL_PACKETS */\r
+\r
+                       uint8_t                   LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification */\r
+                       uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */\r
+               } USB_AudioStreamEndpoint_Spc_t;        \r
+\r

                typedef struct\r
                {\r
                        uint8_t  InterfaceNumber;\r
                typedef struct\r
                {\r
                        uint8_t  InterfaceNumber;\r

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index 8acaac7..dcb58dc 100644 (file)
--- 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
 \r
 void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)\r
 {\r
 \r
 void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)\r
 {\r

+       if (!(USB_IsConnected))\r
+         return;\r
+\r

        Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);\r
 \r
        if (!(Endpoint_IsReadWriteAllowed()))\r
        Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);\r
 \r
        if (!(Endpoint_IsReadWriteAllowed()))\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
new file mode 100644 (file)
index 0000000..9b4cd4b
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -0,0 +1,104 @@
+/*\r
+             LUFA Library\r
+     Copyright (C) Dean Camera, 2009.\r
+              \r
+  dean [at] fourwalledcubicle [dot] com\r
+      www.fourwalledcubicle.com\r
+*/\r
+\r
+/*\r
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, and distribute this software\r
+  and its documentation for any purpose and without fee is hereby\r
+  granted, provided that the above copyright notice appear in all\r
+  copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting\r
+  documentation, and that the name of the author not be used in\r
+  advertising or publicity pertaining to distribution of the\r
+  software without specific, written prior permission.\r
+\r
+  The author disclaim all warranties with regard to this\r
+  software, including all implied warranties of merchantability\r
+  and fitness.  In no event shall the author be liable for any\r
+  special, indirect or consequential damages or any damages\r
+  whatsoever resulting from loss of use, data or profits, whether\r
+  in an action of contract, negligence or other tortious action,\r
+  arising out of or in connection with the use or performance of\r
+  this software.\r
+*/\r
+\r
+#include "MIDI.h"\r
+\r
+bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
+{\r
+       if (MIDIInterfaceInfo->DataINEndpointNumber)\r
+       {\r
+               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,\r
+                                                                                ENDPOINT_DIR_IN, MIDIInterfaceInfo->DataINEndpointSize,\r
+                                                                                ENDPOINT_BANK_SINGLE)))\r
+               {\r
+                       return false;\r
+               }\r
+       }\r
+\r
+       if (MIDIInterfaceInfo->DataOUTEndpointNumber)\r
+       {\r
+               if (!(Endpoint_ConfigureEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,\r
+                                                                                ENDPOINT_DIR_OUT, MIDIInterfaceInfo->DataOUTEndpointSize,\r
+                                                                                ENDPOINT_BANK_SINGLE)))\r
+               {\r
+                       return false;\r
+               }\r
+       }\r
+\r
+       return true;\r
+}\r
+\r
+void USB_MIDI_SendNoteChange(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, const uint8_t Pitch, const bool OnOff,\r
+                             const uint8_t CableID, const uint8_t Channel)\r
+{\r
+       if (!(USB_IsConnected))\r
+         return;\r
+       \r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
+       while (!(Endpoint_IsReadWriteAllowed()));\r
+\r
+       uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
+\r
+       Endpoint_Write_Byte((CableID << 4) | (Command >> 4));\r
+\r
+       Endpoint_Write_Byte(Command | Channel);\r
+       Endpoint_Write_Byte(Pitch);\r
+       Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
+       \r
+       Endpoint_ClearIN();\r
+}\r
+\r
+void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+{\r
+       if (!(USB_IsConnected))\r
+         return;\r
+       \r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataINEndpointNumber);\r
+       while (!(Endpoint_IsReadWriteAllowed()));\r
+\r
+       Endpoint_Write_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event)\r
+{\r
+       if (!(USB_IsConnected))\r
+         return false;\r
+       \r
+       Endpoint_SelectEndpoint(MIDIInterfaceInfo->DataOUTEndpointNumber);\r
+\r
+       if (!(Endpoint_IsReadWriteAllowed()))\r
+         return false;\r
+\r
+       Endpoint_Read_Stream_LE(Event, sizeof(USB_MIDI_EventPacket_t), NO_STREAM_CALLBACK);\r
+       Endpoint_ClearOUT();\r
+       \r
+       return true;\r
+}\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
new file mode 100644 (file)
index 0000000..1782393
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -0,0 +1,158 @@
+/*\r
+             LUFA Library\r
+     Copyright (C) Dean Camera, 2009.\r
+              \r
+  dean [at] fourwalledcubicle [dot] com\r
+      www.fourwalledcubicle.com\r
+*/\r
+\r
+/*\r
+  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, and distribute this software\r
+  and its documentation for any purpose and without fee is hereby\r
+  granted, provided that the above copyright notice appear in all\r
+  copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting\r
+  documentation, and that the name of the author not be used in\r
+  advertising or publicity pertaining to distribution of the\r
+  software without specific, written prior permission.\r
+\r
+  The author disclaim all warranties with regard to this\r
+  software, including all implied warranties of merchantability\r
+  and fitness.  In no event shall the author be liable for any\r
+  special, indirect or consequential damages or any damages\r
+  whatsoever resulting from loss of use, data or profits, whether\r
+  in an action of contract, negligence or other tortious action,\r
+  arising out of or in connection with the use or performance of\r
+  this software.\r
+*/\r
+\r
+#ifndef _MIDI_CLASS_H_\r
+#define _MIDI_CLASS_H_\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               #include "Audio.h"\r
+\r
+               #include <string.h>\r
+\r
+       /* Macros: */\r
+               /** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */\r
+               #define DSUBTYPE_InputJack          0x02\r
+\r
+               /** Audio class descriptor subtype value for a Audio class specific MIDI output jack descriptor. */\r
+               #define DSUBTYPE_OutputJack         0x03\r
+               \r
+               /** Audio class descriptor jack type value for an embedded (logical) MIDI input or output jack. */\r
+               #define JACKTYPE_EMBEDDED           0x01\r
+\r
+               /** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */\r
+               #define JACKTYPE_EXTERNAL           0x02\r
+\r
+               /** MIDI command for a note on (activation) event */\r
+               #define MIDI_COMMAND_NOTE_ON        0x09\r
+\r
+               /** MIDI command for a note off (deactivation) event */\r
+               #define MIDI_COMMAND_NOTE_OFF       0x08\r
+\r
+               /** Standard key press velocity value used for all note events, as no pressure sensor is mounted */\r
+               #define MIDI_STANDARD_VELOCITY      64\r
+               \r
+               /** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel\r
+                *  addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.\r
+                *\r
+                *  \param channel  MIDI channel number to address\r
+                */\r
+               #define MIDI_CHANNEL(channel)        (channel - 1)\r
+               \r
+       /* Type Defines: */\r
+               /** Type define for an Audio class specific MIDI streaming interface descriptor. This indicates to the host\r
+                *  how MIDI the specification compliance of the device and the total length of the Audio class specific descriptors.\r
+                *  See the USB Audio specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+                       \r
+                       uint16_t                  AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class specification version */\r
+                       uint16_t                  TotalLength; /**< Total length of the Audio class specific descriptors, including this descriptor */\r
+               } USB_AudioInterface_MIDI_AS_t;\r
+               \r
+               /** Type define for an Audio class specific MIDI IN jack. This gives information to the host on a MIDI input, either\r
+                *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+\r
+                       uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values */\r
+                       uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device */\r
+                       \r
+                       uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
+               } USB_MIDI_In_Jack_t;\r
+\r
+               /** Type define for an Audio class specific MIDI OUT jack. This gives information to the host on a MIDI output, either\r
+                *  a physical output jack, or a logical jack (sending output data internally, or to the host via an endpoint).\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+\r
+                       uint8_t                   JackType; /**< Type of jack, one of the JACKTYPE_* mask values */\r
+                       uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device */\r
+                       \r
+                       uint8_t                   NumberOfPins; /**< Number of output channels within the jack, either physical or logical */\r
+                       uint8_t                   SourceJackID[1]; /**< ID of each output pin's source data jack */\r
+                       uint8_t                   SourcePinID[1]; /**< Pin number in the input jack of each output pin's source data */\r
+                       \r
+                       uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device */\r
+               } USB_MIDI_Out_Jack_t;\r
+               \r
+               /** Type define for an Audio class specific extended MIDI jack endpoint descriptor. This contains extra information\r
+                *  on the usage of MIDI endpoints used to stream MIDI events in and out of the USB Audio device, and follows an Audio\r
+                *  class specific extended MIDI endpoint descriptor. See the USB Audio specification for more details.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length */\r
+                       uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class specific descriptors */\r
+\r
+                       uint8_t                   TotalEmbeddedJacks; /**< Total number of jacks inside this endpoint */\r
+                       uint8_t                   AssociatedJackID[1]; /**< IDs of each jack inside the endpoint */\r
+               } USB_MIDI_Jack_Endpoint_t;\r
+\r
+               typedef struct\r
+               {\r
+                       unsigned char Command     : 4;\r
+                       unsigned char CableNumber : 4;\r
+                       \r
+                       uint8_t Data1;\r
+                       uint8_t Data2;\r
+                       uint8_t Data3;                  \r
+               } USB_MIDI_EventPacket_t;\r
+\r
+               typedef struct\r
+               {\r
+                       uint8_t  InterfaceNumber;\r
+\r
+                       uint8_t  DataINEndpointNumber;\r
+                       uint16_t DataINEndpointSize;\r
+\r
+                       uint8_t  DataOUTEndpointNumber;\r
+                       uint16_t DataOUTEndpointSize;\r
+\r
+                       bool     InterfaceEnabled;\r
+               } USB_ClassInfo_MIDI_t;\r
+               \r
+       /* Function Prototypes: */\r
+               bool USB_MIDI_ConfigureEndpoints(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);\r
+               void USB_MIDI_USBTask(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo);\r
+\r
+               void USB_MIDI_SendEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
+               bool USB_MIDI_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB_MIDI_EventPacket_t* Event);\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.h b/LUFA/Drivers/USB/Class/Device/RNDIS.h
index 73622a4..708f57d 100644 (file)
--- 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);  \r
                #endif\r
 \r
                                                             void* SetData, uint16_t SetSize);  \r
                #endif\r
 \r

-               void     USB_RNDIS_USBTask(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);\r
-               bool     USB_RNDIS_ConfigureEndpoints(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);\r
-               void     USB_RNDIS_ProcessControlPacket(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);\r
-               void     USB_RNDIS_USBTask(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);\r
+               void USB_RNDIS_USBTask(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);\r
+               bool USB_RNDIS_ConfigureEndpoints(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);\r
+               void USB_RNDIS_ProcessControlPacket(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);\r

                \r
 #endif\r
                \r
 #endif\r