Added Doxygen documentation to the Audio class driver. Added new modules for each...

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index 529cac4..8c14253 100644 (file)
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -5,9 +5,8 @@
  */\r
    \r
 ========== TODO: ===========\r
  */\r
    \r
 ========== TODO: ===========\r

-       - Document new class drivers\r
+       - Document new class drivers (in progress)\r

        - Add standardized descriptor names to class driver structures, controlled by USE_NONSTANDARD_DESCRIPTOR_NAMES\r
        - Add standardized descriptor names to class driver structures, controlled by USE_NONSTANDARD_DESCRIPTOR_NAMES\r

-       - Disable JTAG in demos\r

        - Convert Host mode demos to class drivers\r
        - Remake AVRStudio projects to reflect file structure changes\r
 ============================\r
        - Convert Host mode demos to class drivers\r
        - Remake AVRStudio projects to reflect file structure changes\r
 ============================\r

diff --git a/LUFA/DirectorySummaries.txt b/LUFA/DirectorySummaries.txt
index 3fae9c1..13cdc3e 100644 (file)
--- a/LUFA/DirectorySummaries.txt
+++ b/LUFA/DirectorySummaries.txt
@@ -61,6 +61,16 @@
  *  but provide a standard and library-maintained way of implementing functionality from some of the defined USB classes without extensive\r
  *  development effort. Is is recommended that these drivers be used where possible to reduce maintenance of user applications.\r
  *\r
  *  but provide a standard and library-maintained way of implementing functionality from some of the defined USB classes without extensive\r
  *  development effort. Is is recommended that these drivers be used where possible to reduce maintenance of user applications.\r
  *\r

+ *  \dir Drivers/USB/Class/Device\r
+ *  \brief USB Device Class helper driver files.\r
+ *  \r
+ *  Device mode drivers for the standard USB classes.\r
+ *\r
+ *  \dir Drivers/USB/Class/Host\r
+ *  \brief USB Host Class helper driver files.\r
+ *  \r
+ *  Host mode drivers for the standard USB classes.\r
+ *\r

  *  \dir Drivers/Board\r
  *  \brief Board hardware driver files.\r
  *  \r
  *  \dir Drivers/Board\r
  *  \brief Board hardware driver files.\r
  *  \r

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h
index f92b9ab..cbb6d79 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -28,6 +28,20 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+/** \ingroup Group_USBDeviceClassDrivers\r
+ *  @defgroup Group_USBClassAudioDevice Audio Device Class Driver - LUFA/Drivers/Class/Device/Audio.h\r
+ *\r
+ *  \section Sec_Dependencies Module Source Dependencies\r
+ *  The following files must be built with any user project that uses this module:\r
+ *    - LUFA/Drivers/USB/Class/Device/Audio.c\r
+ *\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the management of USB Audio Class interfaces\r
+ *  within a USB device.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef _AUDIO_CLASS_H_\r
 #define _AUDIO_CLASS_H_\r
 \r
 #ifndef _AUDIO_CLASS_H_\r
 #define _AUDIO_CLASS_H_\r
 \r


@@ -66,60 +80,127 @@
                /** 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
                /** 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
                /** 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_LEFT_FRONT           (1 << 0)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_RIGHT_FRONT          (1 << 1)\r
                #define CHANNEL_RIGHT_FRONT          (1 << 1)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_CENTER_FRONT         (1 << 2)\r
                #define CHANNEL_CENTER_FRONT         (1 << 2)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)\r
                #define CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_LEFT_SURROUND        (1 << 4)\r
                #define CHANNEL_LEFT_SURROUND        (1 << 4)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_RIGHT_SURROUND       (1 << 5)\r
                #define CHANNEL_RIGHT_SURROUND       (1 << 5)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_LEFT_OF_CENTER       (1 << 6)\r
                #define CHANNEL_LEFT_OF_CENTER       (1 << 6)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_RIGHT_OF_CENTER      (1 << 7)\r
                #define CHANNEL_RIGHT_OF_CENTER      (1 << 7)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_SURROUND             (1 << 8)\r
                #define CHANNEL_SURROUND             (1 << 8)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_SIDE_LEFT            (1 << 9)\r
                #define CHANNEL_SIDE_LEFT            (1 << 9)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_SIDE_RIGHT           (1 << 10)\r
                #define CHANNEL_SIDE_RIGHT           (1 << 10)\r

+\r
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\r

                #define CHANNEL_TOP                  (1 << 11)\r
                #define CHANNEL_TOP                  (1 << 11)\r

-               //@}\r

 \r
 \r

-               //@{\r

                /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\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_MUTE                 (1 << 0)\r

+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_VOLUME               (1 << 1)\r
                #define FEATURE_VOLUME               (1 << 1)\r

+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_BASS                 (1 << 2)\r
                #define FEATURE_BASS                 (1 << 2)\r

+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_MID                  (1 << 3)\r
                #define FEATURE_MID                  (1 << 3)\r

+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_TREBLE               (1 << 4)\r
                #define FEATURE_TREBLE               (1 << 4)\r

+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_GRAPHIC_EQUALIZER    (1 << 5)\r
                #define FEATURE_GRAPHIC_EQUALIZER    (1 << 5)\r

+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r
+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_AUTOMATIC_GAIN       (1 << 6)\r
                #define FEATURE_AUTOMATIC_GAIN       (1 << 6)\r

+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_DELAY                (1 << 7)\r
                #define FEATURE_DELAY                (1 << 7)\r

+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_BASS_BOOST           (1 << 8)\r
                #define FEATURE_BASS_BOOST           (1 << 8)\r

+
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\r

                #define FEATURE_BASS_LOUDNESS        (1 << 9)\r
                #define FEATURE_BASS_LOUDNESS        (1 << 9)\r

-               //@}\r

 \r
 \r

-               //@{\r
-               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */\r
-               \r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_UNDEFINED           0x0100\r
                #define TERMINAL_UNDEFINED           0x0100\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_STREAMING           0x0101\r
                #define TERMINAL_STREAMING           0x0101\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_VENDOR              0x01FF\r
                #define TERMINAL_VENDOR              0x01FF\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_IN_UNDEFINED        0x0200\r
                #define TERMINAL_IN_UNDEFINED        0x0200\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_IN_MIC              0x0201\r
                #define TERMINAL_IN_MIC              0x0201\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_IN_DESKTOP_MIC      0x0202\r
                #define TERMINAL_IN_DESKTOP_MIC      0x0202\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_IN_PERSONAL_MIC     0x0203\r
                #define TERMINAL_IN_PERSONAL_MIC     0x0203\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_IN_OMNIDIR_MIC      0x0204\r
                #define TERMINAL_IN_OMNIDIR_MIC      0x0204\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_IN_MIC_ARRAY        0x0205\r
                #define TERMINAL_IN_MIC_ARRAY        0x0205\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_IN_PROCESSING_MIC   0x0206\r
                #define TERMINAL_IN_PROCESSING_MIC   0x0206\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_IN_OUT_UNDEFINED    0x0300\r
                #define TERMINAL_IN_OUT_UNDEFINED    0x0300\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_OUT_SPEAKER         0x0301\r
                #define TERMINAL_OUT_SPEAKER         0x0301\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_OUT_HEADPHONES      0x0302\r
                #define TERMINAL_OUT_HEADPHONES      0x0302\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_OUT_HEAD_MOUNTED    0x0303\r
                #define TERMINAL_OUT_HEAD_MOUNTED    0x0303\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_OUT_DESKTOP         0x0304\r
                #define TERMINAL_OUT_DESKTOP         0x0304\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_OUT_ROOM            0x0305\r
                #define TERMINAL_OUT_ROOM            0x0305\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_OUT_COMMUNICATION   0x0306\r
                #define TERMINAL_OUT_COMMUNICATION   0x0306\r

+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \r

                #define TERMINAL_OUT_LOWFREQ         0x0307\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
 \r
                /** Convenience macro, to fill a 24-bit AudioSampleFreq_t structure with the given sample rate as a 24-bit number.\r
                 *\r


@@ -280,31 +361,118 @@
                        uint16_t                  LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry */\r
                } USB_AudioStreamEndpoint_Spc_t;        \r
 \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 an Audio Class interface configuration and state structure. This structure should be used for each Audio\r
+                *  Class unit within the device, and passed (per-interface) to the Audio Class driver functions so that each Audio interface\r
+                *  has seperate state and configuration data and can be controlled seperately.\r
+                */\r

                typedef struct\r
                {\r
                typedef struct\r
                {\r

-                       uint8_t  StreamingInterfaceNumber;\r
+                       uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this structure controls */\r

 \r
 \r

-                       uint8_t  DataINEndpointNumber;\r
-                       uint16_t DataINEndpointSize;\r
+                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the incomming Audio Streaming data, if available (zero if unused) */\r
+                       uint16_t DataINEndpointSize; /**< Size in bytes of the incomming Audio Streaming data endpoint, if available (zero if unused) */\r

 \r
 \r

-                       uint8_t  DataOUTEndpointNumber;\r
-                       uint16_t DataOUTEndpointSize;\r
+                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the outgoing Audio Streaming data, if available (zero if unused) */\r
+                       uint16_t DataOUTEndpointSize; /**< Size in bytes of the outgoing Audio Streaming data endpoint, if available (zero if unused) */\r

 \r
 \r

-                       bool     InterfaceEnabled;\r
+                       bool     InterfaceEnabled; /**< Set and cleared by the class driver to indicate if the host has enabled the streaming endpoints\r
+                                                   *   of the Audio Streaming interface\r
+                                                   */\r

                } USB_ClassInfo_Audio_t;\r
                \r
        /* Function Prototypes: */\r
                } USB_ClassInfo_Audio_t;\r
                \r
        /* Function Prototypes: */\r

+               /** Configures the endpoints of a given Audio interface, ready for use. This should be linked to the library\r
+                *  \ref EVENT_USB_ConfigurationChanged() event so that the endpoints are configured when the configuration containing the\r
+                *  given Audio interface is selected.\r
+                *\r
+                *  \param AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                *\r
+                *  \return Boolean true if the endpoints were sucessfully configured, false otherwise\r
+                */\r

                bool     USB_Audio_ConfigureEndpoints(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r
                bool     USB_Audio_ConfigureEndpoints(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r

+\r
+               /** Processes incomming control requests from the host, that are directed to the given Audio class interface. This should be\r
+                *  linked to the library \ref EVENT_USB_UnhandledControlPacket() event.\r
+                *\r
+                *  \param AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                */\r

                void     USB_Audio_ProcessControlPacket(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r
                void     USB_Audio_ProcessControlPacket(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r

+\r
+               /** General management task for a given Audio class interface, required for the correct operation of the interface. This should\r
+                *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().\r
+                *\r
+                *  \param AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                */\r

                void     USB_Audio_USBTask(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r
                \r
                void     USB_Audio_USBTask(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r
                \r

+               /** Reads the next 8-bit audio sample from the current audio interface.\r
+                *\r
+                *  \note This should be preceeded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that\r
+                *        the correct endpoint is selected and ready for data.\r
+                *\r
+                *  \return  Signed 8-bit audio sample from the audio interface\r
+                */\r

                int8_t   USB_Audio_ReadSample8(void);\r
                int8_t   USB_Audio_ReadSample8(void);\r

+\r
+               /** Reads the next 16-bit audio sample from the current audio interface.\r
+                *\r
+                *  \note This should be preceeded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that\r
+                *        the correct endpoint is selected and ready for data.\r
+                *\r
+                *  \return  Signed 16-bit audio sample from the audio interface\r
+                */\r

                int16_t  USB_Audio_ReadSample16(void);\r
                int16_t  USB_Audio_ReadSample16(void);\r

+\r
+               /** Reads the next 24-bit audio sample from the current audio interface.\r
+                *\r
+                *  \note This should be preceeded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that\r
+                *        the correct endpoint is selected and ready for data.\r
+                *\r
+                *  \return  Signed 24-bit audio sample from the audio interface\r
+                */\r

                int32_t  USB_Audio_ReadSample24(void);\r
                int32_t  USB_Audio_ReadSample24(void);\r

+\r
+               /** Writes the next 8-bit audio sample to the current audio interface.\r
+                *\r
+                *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r
+                *        the correct endpoint is selected and ready for data.\r
+                *\r
+                *  \param Sample  Signed 8-bit audio sample\r
+                */\r

                void     USB_Audio_WriteSample8(int8_t Sample);\r
                void     USB_Audio_WriteSample8(int8_t Sample);\r

+\r
+               /** Writes the next 16-bit audio sample to the current audio interface.\r
+                *\r
+                *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r
+                *        the correct endpoint is selected and ready for data.\r
+                *\r
+                *  \param Sample  Signed 16-bit audio sample\r
+                */\r

                void     USB_Audio_WriteSample16(int16_t Sample);\r
                void     USB_Audio_WriteSample16(int16_t Sample);\r

+\r
+               /** Writes the next 24-bit audio sample to the current audio interface.\r
+                *\r
+                *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r
+                *        the correct endpoint is selected and ready for data.\r
+                *\r
+                *  \param Sample  Signed 24-bit audio sample\r
+                */\r

                void     USB_Audio_WriteSample24(int32_t Sample);\r
                void     USB_Audio_WriteSample24(int32_t Sample);\r

+\r
+               /** Determines if the given audio interface is ready for a sample to be read from it.\r
+                *\r
+                *  \param AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                *\r
+                *  \return Boolean true if the given Audio interface has a sample to be read, false otherwise\r
+                */\r

                bool     USB_Audio_IsSampleReceived(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r
                bool     USB_Audio_IsSampleReceived(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r

+\r
+               /** Determines if the given audio interface is ready to accept the next sample to be written to it.\r
+                *\r
+                *  \param AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                *\r
+                *  \return Boolean true if the given Audio interface is ready to accept the next sample, false otherwise\r
+                */\r

                bool     USB_Audio_IsReadyForNextSample(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r
 \r
        /* Disable C linkage for C++ Compilers: */\r
                bool     USB_Audio_IsReadyForNextSample(USB_ClassInfo_Audio_t* AudioInterfaceInfo);\r
 \r
        /* Disable C linkage for C++ Compilers: */\r


@@ -313,3 +481,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDC.h
index b1d7c6d..ae069fa 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.h
+++ b/LUFA/Drivers/USB/Class/Device/CDC.h
@@ -28,6 +28,20 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+/** \ingroup Group_USBDeviceClassDrivers\r
+ *  @defgroup Group_USBClassCDCDevice CDC Device Class Driver - LUFA/Drivers/Class/Device/CDC.h\r
+ *\r
+ *  \section Sec_Dependencies Module Source Dependencies\r
+ *  The following files must be built with any user project that uses this module:\r
+ *    - LUFA/Drivers/USB/Class/Device/CDC.c\r
+ *\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the management of USB CDC Class interfaces\r
+ *  within a USB device, for the implementation of CDC-ACM virtual serial ports.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef _CDC_CLASS_H_\r
 #define _CDC_CLASS_H_\r
 \r
 #ifndef _CDC_CLASS_H_\r
 #define _CDC_CLASS_H_\r
 \r


@@ -195,3 +209,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HID.h
index 9a2f803..9a56304 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.h
+++ b/LUFA/Drivers/USB/Class/Device/HID.h
@@ -28,6 +28,20 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+/** \ingroup Group_USBDeviceClassDrivers\r
+ *  @defgroup Group_USBClassHIDDevice HID Device Class Driver - LUFA/Drivers/Class/Device/HID.h\r
+ *\r
+ *  \section Sec_Dependencies Module Source Dependencies\r
+ *  The following files must be built with any user project that uses this module:\r
+ *    - LUFA/Drivers/USB/Class/Device/HID.c\r
+ *\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the management of USB HID Class interfaces\r
+ *  within a USB device.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef _HID_CLASS_H_\r
 #define _HID_CLASS_H_\r
 \r
 #ifndef _HID_CLASS_H_\r
 #define _HID_CLASS_H_\r
 \r


@@ -122,3 +136,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
index d158722..b2294d8 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -28,6 +28,21 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+/** \ingroup Group_USBDeviceClassDrivers\r
+ *  @defgroup Group_USBClassMIDIDevice MIDI Device Class Driver - LUFA/Drivers/Class/Device/MIDI.h\r
+ *\r
+ *  \section Sec_Dependencies Module Source Dependencies\r
+ *  The following files must be built with any user project that uses this module:\r
+ *    - LUFA/Drivers/USB/Class/Device/MIDI.c\r
+ *\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the management of USB MIDI Class interfaces\r
+ *  within a USB device. Note that the MIDI class is actually a special case of the regular Audio class,\r
+ *  thus this module depends on structure definitions from the \ref Group_USBClassAudioDevice class driver module.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef _MIDI_CLASS_H_\r
 #define _MIDI_CLASS_H_\r
 \r
 #ifndef _MIDI_CLASS_H_\r
 #define _MIDI_CLASS_H_\r
 \r


@@ -167,3 +182,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.h b/LUFA/Drivers/USB/Class/Device/MassStorage.h
index cf2b574..d8da15c 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.h
@@ -28,6 +28,20 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+/** \ingroup Group_USBDeviceClassDrivers\r
+ *  @defgroup Group_USBClassMSDevice Mass Storage Device Class Driver - LUFA/Drivers/Class/Device/MassStorage.h\r
+ *\r
+ *  \section Sec_Dependencies Module Source Dependencies\r
+ *  The following files must be built with any user project that uses this module:\r
+ *    - LUFA/Drivers/USB/Class/Device/MassStorage.c\r
+ *\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the management of USB Mass Storage Class interfaces\r
+ *  within a USB device.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef _MS_CLASS_H_\r
 #define _MS_CLASS_H_\r
 \r
 #ifndef _MS_CLASS_H_\r
 #define _MS_CLASS_H_\r
 \r


@@ -132,3 +146,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.h b/LUFA/Drivers/USB/Class/Device/RNDIS.h
index 09d48c3..a8c8db9 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Device/RNDIS.h
@@ -28,6 +28,20 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+/** \ingroup Group_USBDeviceClassDrivers\r
+ *  @defgroup Group_USBClassRNDISDevice RNDIS Device Class Driver - LUFA/Drivers/Class/Device/RNDIS.h\r
+ *\r
+ *  \section Sec_Dependencies Module Source Dependencies\r
+ *  The following files must be built with any user project that uses this module:\r
+ *    - LUFA/Drivers/USB/Class/Device/HID.c\r
+ *\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the management of USB RNDIS Ethernet\r
+ *  interfaces within a USB device.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef _RNDIS_CLASS_H_\r
 #define _RNDIS_CLASS_H_\r
 \r
 #ifndef _RNDIS_CLASS_H_\r
 #define _RNDIS_CLASS_H_\r
 \r


@@ -267,3 +281,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index 3c8f062..d0837a8 100644 (file)
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -54,6 +54,33 @@
  *  Functions, macros, variables, enums and types related to the management of USB communications.\r
  */\r
 \r
  *  Functions, macros, variables, enums and types related to the management of USB communications.\r
  */\r
 \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_USBClassDrivers USB Class Drivers\r
+ *\r
+ *  Drivers for both host and device mode of the standard USB classes, for rapid application development.\r
+ *  Class drivers give a framework which sits on top of the low level library API, allowing for standard\r
+ *  USB classes to be implemented in a project with minimal user code. These drivers can be used in\r
+ *  conjunction with the library low level APIs to implement interfaces both via the class drivers and via\r
+ *  the standard library APIs.\r
+ *\r
+ *  Multiple device mode class drivers can be used within a project, including multiple instances of the\r
+ *  same class driver.\r
+ */\r
+ \r
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBDeviceClassDrivers Device Class Drivers\r
+ *\r
+ *  Device mode drivers for the standard USB classes. These drivers all implement one of the standard USB\r
+ *  classes, allowing for the class to be easily implemented in a user project.\r
+ */\r
+ \r
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBHostClassDrivers Host Class Drivers\r
+ *\r
+ *  Host mode drivers for the standard USB classes. These drivers all implement one of the standard USB\r
+ *  classes, allowing for the class to be easily implemented in a user project.\r
+ */\r
+ \r

 #ifndef __USB_H__\r
 #define __USB_H__\r
 \r
 #ifndef __USB_H__\r
 #define __USB_H__\r
 \r

diff --git a/LUFA/Groups.txt b/LUFA/Groups.txt
index f479b51..530ce28 100644 (file)
--- a/LUFA/Groups.txt
+++ b/LUFA/Groups.txt
@@ -17,4 +17,4 @@
 /** @defgroup Group_MiscDrivers Miscellaneous Drivers\r
  *\r
  *  Miscellaneous driver Functions, macros, variables, enums and types.\r
 /** @defgroup Group_MiscDrivers Miscellaneous Drivers\r
  *\r
  *  Miscellaneous driver Functions, macros, variables, enums and types.\r

- */
\ No newline at end of file
+ */\r