Add host mode USB Class driver stubs, add beginnings of a CDC host class driver.

Split out common defines/types from class drivers into a seperate common class driver directory.

Make central USB Class driver dispatch headers, used for both device and host modes.

diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.h b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
index 1c67ac5..d0e8db6 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.h
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
@@ -48,7 +48,7 @@
                #include <LUFA/Drivers/Board/Joystick.h>\r
                #include <LUFA/Drivers/Peripheral/ADC.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/Audio.h>\r
+               #include <LUFA/Drivers/USB/Class/Audio.h>\r
 \r
        /* Macros: */\r
                /** ADC channel number for the microphone input. */\r

diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.h b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
index 12bf07f..302437f 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
@@ -38,7 +38,7 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/Audio.h>\r
+               #include <LUFA/Drivers/USB/Class/Audio.h>\r
 \r
                #include <avr/pgmspace.h>\r
 \r

diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile
index b5b2713..99d1e94 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/makefile
+++ b/Demos/Device/ClassDriver/AudioInput/makefile
@@ -136,6 +136,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/Audio.c          \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/Audio.c            \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
index b09fed5..ecc4e6f 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
@@ -48,7 +48,7 @@
                #include <LUFA/Drivers/Board/Joystick.h>\r
                #include <LUFA/Drivers/Peripheral/ADC.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/Audio.h>\r
+               #include <LUFA/Drivers/USB/Class/Audio.h>\r
        \r
        /* Macros: */\r
                #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r

diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
index 149b5ed..1ee63ef 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
@@ -38,7 +38,7 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/Audio.h>\r
+               #include <LUFA/Drivers/USB/Class/Audio.h>\r
 \r
                #include <avr/pgmspace.h>\r
 \r

diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile
index b6f48d4..9c3639f 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/makefile
+++ b/Demos/Device/ClassDriver/AudioOutput/makefile
@@ -136,6 +136,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/Audio.c          \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/Audio.c            \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/CDC/CDC.h b/Demos/Device/ClassDriver/CDC/CDC.h
index 23072d6..255cd86 100644 (file)
--- a/Demos/Device/ClassDriver/CDC/CDC.h
+++ b/Demos/Device/ClassDriver/CDC/CDC.h
@@ -48,7 +48,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Joystick.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/CDC.h>\r
+               #include <LUFA/Drivers/USB/Class/CDC.h>\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

diff --git a/Demos/Device/ClassDriver/CDC/Descriptors.h b/Demos/Device/ClassDriver/CDC/Descriptors.h
index caea188..33ceab9 100644 (file)
--- a/Demos/Device/ClassDriver/CDC/Descriptors.h
+++ b/Demos/Device/ClassDriver/CDC/Descriptors.h
@@ -40,7 +40,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/CDC.h>\r
+               #include <LUFA/Drivers/USB/Class/CDC.h>\r
 \r
        /* Macros: */\r
                /** Endpoint number of the CDC device-to-host notification IN endpoint. */\r

diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile
index a244f1f..22846c9 100644 (file)
--- a/Demos/Device/ClassDriver/CDC/makefile
+++ b/Demos/Device/ClassDriver/CDC/makefile
@@ -136,6 +136,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/CDC.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/CDC.c              \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/DualCDC/Descriptors.h b/Demos/Device/ClassDriver/DualCDC/Descriptors.h
index 023cdc5..49befad 100644 (file)
--- a/Demos/Device/ClassDriver/DualCDC/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualCDC/Descriptors.h
@@ -40,7 +40,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/CDC.h>\r
+               #include <LUFA/Drivers/USB/Class/CDC.h>\r
 \r
        /* Macros: */\r
                /** Endpoint number of the first CDC interface's device-to-host notification IN endpoint. */\r

diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.h b/Demos/Device/ClassDriver/DualCDC/DualCDC.h
index 93b785d..0f1a764 100644 (file)
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.h
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.h
@@ -48,7 +48,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Joystick.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/CDC.h>\r
+               #include <LUFA/Drivers/USB/Class/CDC.h>\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile
index 7a8fba3..cf3689b 100644 (file)
--- a/Demos/Device/ClassDriver/DualCDC/makefile
+++ b/Demos/Device/ClassDriver/DualCDC/makefile
@@ -136,6 +136,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/CDC.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/CDC.c              \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.h b/Demos/Device/ClassDriver/GenericHID/Descriptors.h
index 01db53e..8d613b1 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.h
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.h
@@ -40,7 +40,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /** Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.h b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
index cfb9df8..d40fbb1 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.h
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
@@ -49,7 +49,7 @@
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile
index 292484a..64d70b3 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/makefile
+++ b/Demos/Device/ClassDriver/GenericHID/makefile
@@ -136,6 +136,8 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.h b/Demos/Device/ClassDriver/Joystick/Descriptors.h
index c6926ac..963ed1b 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.h
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.h
@@ -40,7 +40,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.h b/Demos/Device/ClassDriver/Joystick/Joystick.h
index 16c6abb..e3bcaa6 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Joystick.h
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.h
@@ -49,7 +49,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Buttons.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the joystick HID report structure, for creating and sending HID reports to the host PC.\r

diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile
index 0c21bc4..e39676c 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/makefile
+++ b/Demos/Device/ClassDriver/Joystick/makefile
@@ -136,6 +136,8 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.h b/Demos/Device/ClassDriver/Keyboard/Descriptors.h
index 40b358c..6ed05e1 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Descriptors.h
+++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.h
@@ -41,7 +41,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.h b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
index c24adfb..74802fd 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.h
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
@@ -52,7 +52,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Buttons.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the keyboard HID report structure, for creating and sending HID reports to the host PC.\r

diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile
index 5377e6d..40b60fa 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/makefile
+++ b/Demos/Device/ClassDriver/Keyboard/makefile
@@ -136,6 +136,8 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
index 6f1c53a..514e8c0 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
@@ -41,7 +41,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
index ae69d3d..5f16697 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
@@ -46,7 +46,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Buttons.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile
index 6bfa2a9..4c1ce74 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/makefile
+++ b/Demos/Device/ClassDriver/KeyboardMouse/makefile
@@ -136,6 +136,8 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h
index d9b1339..6702cc4 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h
@@ -38,7 +38,7 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/MIDI.h>\r
+               #include <LUFA/Drivers/USB/Class/MIDI.h>\r
 \r
                #include <avr/pgmspace.h>\r
 \r

diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.h b/Demos/Device/ClassDriver/MIDI/MIDI.h
index 913b318..bc90382 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/MIDI.h
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.h
@@ -50,7 +50,7 @@
                #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
+               #include <LUFA/Drivers/USB/Class/MIDI.h>\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile
index c5a13c1..734253e 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/makefile
+++ b/Demos/Device/ClassDriver/MIDI/makefile
@@ -136,6 +136,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/MIDI.c           \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/MIDI.c             \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
index b828051..8cf1907 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
@@ -64,8 +64,10 @@
                #define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)\r
                \r
        /* Function Prototypes: */\r
-               void DataflashManager_WriteBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks);\r
-               void DataflashManager_ReadBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks);\r
+               void DataflashManager_WriteBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint32_t BlockAddress,\r
+                                                 uint16_t TotalBlocks);\r
+               void DataflashManager_ReadBlocks(USB_ClassInfo_MS_t* MSInterfaceInfo, const uint32_t BlockAddress,\r
+                                                uint16_t TotalBlocks);\r
                void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,\r
                                                      uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);\r
                void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks,\r

diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h
index 3fd751d..8c3e104 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h
@@ -41,7 +41,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/MassStorage.h>\r
+               #include <LUFA/Drivers/USB/Class/MassStorage.h>\r
 \r
                #include "MassStorage.h"\r
                #include "Descriptors.h"\r

diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.h b/Demos/Device/ClassDriver/MassStorage/MassStorage.h
index afc67df..d9c298e 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.h
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.h
@@ -51,7 +51,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Buttons.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/MassStorage.h>
+               #include <LUFA/Drivers/USB/Class/MassStorage.h>
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index 8b7f944..24b7e03 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/makefile
+++ b/Demos/Device/ClassDriver/MassStorage/makefile
@@ -138,6 +138,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/MassStorage.c    \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/MassStorage.c      \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.h b/Demos/Device/ClassDriver/Mouse/Descriptors.h
index ef3215c..5d0babb 100644 (file)
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.h
@@ -40,7 +40,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r

diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.h b/Demos/Device/ClassDriver/Mouse/Mouse.h
index a643700..6576cbe 100644 (file)
--- a/Demos/Device/ClassDriver/Mouse/Mouse.h
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.h
@@ -51,7 +51,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Buttons.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the mouse HID report structure, for creating and sending HID reports to the host PC.\r

diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile
index 2ad7d6a..27252b9 100644 (file)
--- a/Demos/Device/ClassDriver/Mouse/makefile
+++ b/Demos/Device/ClassDriver/Mouse/makefile
@@ -136,7 +136,10 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
- \r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
+\r
+\r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r
 \r

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
index b300252..0708268 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
@@ -40,7 +40,7 @@
                #include <avr/io.h>\r
                #include <string.h>\r
                \r
-               #include <LUFA/Drivers/USB/Class/Device/RNDIS.h>\r
+               #include <LUFA/Drivers/USB/Class/RNDIS.h>\r
 \r
                #include "EthernetProtocols.h"\r
                #include "ProtocolDecoders.h"\r

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h
index 6db021d..c5503e2 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h
@@ -55,7 +55,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/Board/Joystick.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/RNDIS.h>\r
+               #include <LUFA/Drivers/USB/Class/RNDIS.h>\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

diff --git a/Demos/Device/ClassDriver/USBtoSerial/Descriptors.h b/Demos/Device/ClassDriver/USBtoSerial/Descriptors.h
index 9e372e3..730acc6 100644 (file)
--- a/Demos/Device/ClassDriver/USBtoSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/USBtoSerial/Descriptors.h
@@ -40,7 +40,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/CDC.h>\r
+               #include <LUFA/Drivers/USB/Class/CDC.h>\r
 \r
        /* Macros: */\r
                /** Endpoint number of the CDC device-to-host notification IN endpoint. */\r

diff --git a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.h b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.h
index d463582..8aa29b6 100644 (file)
--- a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.h
@@ -51,7 +51,7 @@
                #include <LUFA/Drivers/Board/Joystick.h>\r
                #include <LUFA/Drivers/Peripheral/Serial.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/CDC.h>\r
+               #include <LUFA/Drivers/USB/Class/CDC.h>\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

diff --git a/Demos/Device/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile
index 9c47e16..3c00897 100644 (file)
--- a/Demos/Device/ClassDriver/USBtoSerial/makefile
+++ b/Demos/Device/ClassDriver/USBtoSerial/makefile
@@ -137,6 +137,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/CDC.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/CDC.c              \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.c b/Demos/Host/ClassDriver/CDCHost/CDCHost.c
index 9a5e81a..9a9d8a7 100644 (file)
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.c
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.c
@@ -50,7 +50,6 @@ int main(void)
 \r
        for (;;)\r
        {\r
-               CDC_Host_Task();\r
                USB_USBTask();\r
        }\r
 }\r
@@ -121,111 +120,3 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
-\r
-/** Task to set the configuration of the attached device after it has been enumerated, and to read in\r
- *  data received from the attached CDC device and print it to the serial port.\r
- */\r
-void CDC_Host_Task(void)\r
-{\r
-       uint8_t ErrorCode;\r
-\r
-       switch (USB_HostState)\r
-       {\r
-               case HOST_STATE_Addressed:\r
-                       /* Standard request to set the device configuration to configuration 1 */\r
-                       USB_ControlRequest = (USB_Request_Header_t)\r
-                               {\r
-                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       .bRequest      = REQ_SetConfiguration,\r
-                                       .wValue        = 1,\r
-                                       .wIndex        = 0,\r
-                                       .wLength       = 0,\r
-                               };\r
-\r
-                       /* Select the control pipe for the request transfer */\r
-                       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r
-                       /* Send the request, display error and wait for device detach if request fails */\r
-                       if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
-                       {\r
-                               puts_P(PSTR("Control Error (Set Configuration).\r\n"));\r
-                               printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
-\r
-                               /* Indicate error via status LEDs */\r
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-\r
-                               /* Wait until USB device disconnected */\r
-                               while (USB_IsConnected);\r
-                               break;\r
-                       }\r
-                               \r
-                       USB_HostState = HOST_STATE_Configured;\r
-                       break;\r
-               case HOST_STATE_Configured:\r
-                       puts_P(PSTR("Getting Config Data.\r\n"));\r
-               \r
-                       /* Get and process the configuration descriptor data */\r
-                       if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)\r
-                       {\r
-                               if (ErrorCode == ControlError)\r
-                                 puts_P(PSTR("Control Error (Get Configuration).\r\n"));\r
-                               else\r
-                                 puts_P(PSTR("Invalid Device.\r\n"));\r
-\r
-                               printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
-                               \r
-                               /* Indicate error via status LEDs */\r
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-\r
-                               /* Wait until USB device disconnected */\r
-                               while (USB_IsConnected);\r
-                               break;\r
-                       }\r
-\r
-                       puts_P(PSTR("CDC Device Enumerated.\r\n"));\r
-                               \r
-                       USB_HostState = HOST_STATE_Ready;\r
-                       break;\r
-               case HOST_STATE_Ready:\r
-                       /* Select and the data IN pipe */\r
-                       Pipe_SelectPipe(CDC_DATAPIPE_IN);\r
-\r
-                       /* Check to see if a packet has been received */\r
-                       if (Pipe_IsINReceived())\r
-                       {\r
-                               /* Check if data is in the pipe */\r
-                               if (Pipe_IsReadWriteAllowed())\r
-                               {\r
-                                       /* Get the length of the pipe data, and create a new buffer to hold it */\r
-                                       uint16_t BufferLength = Pipe_BytesInPipe();\r
-                                       uint8_t  Buffer[BufferLength];\r
-                                       \r
-                                       /* Read in the pipe data to the temporary buffer */\r
-                                       Pipe_Read_Stream_LE(Buffer, BufferLength);\r
-                                                                       \r
-                                       /* Print out the buffer contents to the USART */\r
-                                       for (uint16_t BufferByte = 0; BufferByte < BufferLength; BufferByte++)\r
-                                         putchar(Buffer[BufferByte]);\r
-                               }\r
-\r
-                               /* Clear the pipe after it is read, ready for the next packet */\r
-                               Pipe_ClearIN();\r
-                       }\r
-\r
-                       /* Select and unfreeze the notification pipe */\r
-                       Pipe_SelectPipe(CDC_NOTIFICATIONPIPE);\r
-                       Pipe_Unfreeze();\r
-                       \r
-                       /* Check if a packet has been received */\r
-                       if (Pipe_IsINReceived())\r
-                       {\r
-                               /* Discard the unused event notification */\r
-                               Pipe_ClearIN();\r
-                       }\r
-                       \r
-                       /* Freeze notification IN pipe after use */\r
-                       Pipe_Freeze();\r
-                                               \r
-                       break;\r
-       }\r
-}\r

diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.h b/Demos/Host/ClassDriver/CDCHost/CDCHost.h
index 5dcbc8e..c219a19 100644 (file)
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.h
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.h
@@ -45,22 +45,12 @@
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Misc/TerminalCodes.h>\r
-               #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
-               \r
-               #include "ConfigDescriptor.h"\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/USB/Class/Host/CDC.h>\r
                \r
        /* Macros: */\r
-               /** Pipe number for the CDC data IN pipe */\r
-               #define CDC_DATAPIPE_IN                1\r
-\r
-               /** Pipe number for the CDC data OUT pipe */\r
-               #define CDC_DATAPIPE_OUT               2\r
-\r
-               /** Pipe number for the CDC notification pipe */\r
-               #define CDC_NOTIFICATIONPIPE           3\r
-\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
 \r
@@ -75,7 +65,6 @@
                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
-               void CDC_Host_Task(void);\r
        \r
                void EVENT_USB_HostError(const uint8_t ErrorCode);\r
                void EVENT_USB_DeviceAttached(void);\r

diff --git a/Demos/Host/ClassDriver/CDCHost/makefile b/Demos/Host/ClassDriver/CDCHost/makefile
index dfbefbb..94fdae6 100644 (file)
--- a/Demos/Host/ClassDriver/CDCHost/makefile
+++ b/Demos/Host/ClassDriver/CDCHost/makefile
@@ -124,7 +124,6 @@ LUFA_PATH = ../../../..
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
-         ConfigDescriptor.c                                          \\r
          $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c         \\r
          $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
@@ -137,7 +136,9 @@ 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
-\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/CDC.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/CDC.c              \\r
+         \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r

diff --git a/Demos/Host/ClassDriver/GenericHIDHost/makefile b/Demos/Host/ClassDriver/GenericHIDHost/makefile
index a07acb4..49f8bf2 100644 (file)
--- a/Demos/Host/ClassDriver/GenericHIDHost/makefile
+++ b/Demos/Host/ClassDriver/GenericHIDHost/makefile
@@ -137,6 +137,8 @@ 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/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
 \r
 \r

diff --git a/Demos/Host/ClassDriver/KeyboardHost/makefile b/Demos/Host/ClassDriver/KeyboardHost/makefile
index 6e005da..9bc1e6a 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHost/makefile
+++ b/Demos/Host/ClassDriver/KeyboardHost/makefile
@@ -137,7 +137,9 @@ 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
-\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
index 3935512..8b1f08b 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
@@ -138,8 +138,10 @@ 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/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
-\r
+         \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r

diff --git a/Demos/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile
index 709f42f..91eb302 100644 (file)
--- a/Demos/Host/ClassDriver/MassStorageHost/makefile
+++ b/Demos/Host/ClassDriver/MassStorageHost/makefile
@@ -138,6 +138,8 @@ 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/Class/Device/MassStorage.c    \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/MassStorage.c      \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r

diff --git a/Demos/Host/ClassDriver/MouseHost/makefile b/Demos/Host/ClassDriver/MouseHost/makefile
index 67e05a6..b3c62b0 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHost/makefile
+++ b/Demos/Host/ClassDriver/MouseHost/makefile
@@ -137,7 +137,10 @@ 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
-\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
+         \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/makefile b/Demos/Host/ClassDriver/MouseHostWithParser/makefile
index 30e40ad..1ae74da 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/makefile
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/makefile
@@ -138,8 +138,10 @@ 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/Class/Device/HID.c            \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HIDParser.c        \\r
-\r
+         \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r

diff --git a/Demos/Host/ClassDriver/StillImageHost/makefile b/Demos/Host/ClassDriver/StillImageHost/makefile
index a4428c5..184f4f9 100644 (file)
--- a/Demos/Host/ClassDriver/StillImageHost/makefile
+++ b/Demos/Host/ClassDriver/StillImageHost/makefile
@@ -137,7 +137,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
-\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/StillImage.c       \\r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 CPPSRC = \r

diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.h b/Demos/Host/LowLevel/CDCHost/CDCHost.h
index 5dcbc8e..fc6a748 100644 (file)
--- a/Demos/Host/LowLevel/CDCHost/CDCHost.h
+++ b/Demos/Host/LowLevel/CDCHost/CDCHost.h
@@ -73,6 +73,40 @@
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
                \r
+       /* Type Defines: */\r
+               /** Class state structure. An instance of this structure should be made for each CDC interface\r
+                *  within the user application, and passed to each of the CDC class driver functions as the\r
+                *  CDCInterfaceInfo parameter. The contents of this structure should be set to their correct\r
+                *  values when used, or ommitted to force the library to use default values.\r
+                */\r
+               typedef struct\r
+               {\r
+                       uint8_t  ControlInterfaceNumber; /**< Interface number of the CDC control interface within the device */\r
+\r
+                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the CDC interface's IN data endpoint */\r
+                       uint16_t DataINEndpointSize; /**< Size in bytes of the CDC interface's IN data endpoint */\r
+\r
+                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the CDC interface's OUT data endpoint */\r
+                       uint16_t DataOUTEndpointSize;  /**< Size in bytes of the CDC interface's OUT data endpoint */\r
+\r
+                       uint8_t  NotificationEndpointNumber; /**< Endpoint number of the CDC interface's IN notification endpoint, if used */\r
+                       uint16_t NotificationEndpointSize;  /**< Size in bytes of the CDC interface's IN notification endpoint, if used */\r
+\r
+                       uint8_t  ControlLineState; /**< Current control line states, as set by the host */\r
+\r
+                       struct\r
+                       {\r
+                               uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */\r
+                               uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the\r
+                                                                         *   CDCDevice_CDC_LineCodingFormats_t enum\r
+                                                                         */\r
+                               uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the\r
+                                                                         *   CDCDevice_LineCodingParity_t enum\r
+                                                                         */\r
+                               uint8_t  DataBits; /**< Bits of data per character of the virtual serial port */\r
+                       } LineEncoding;\r
+               } USB_ClassInfo_CDC_Host_t;\r
+               \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
                void CDC_Host_Task(void);\r

diff --git a/LUFA.pnproj b/LUFA.pnproj
index 0c45843..d40eea7 100644 (file)
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-<Project name="LUFA"><Folder name="Demos"><Folder name="Device"><Folder name="ClassDriver"><Folder name="AudioInput"><File path="Demos\Device\ClassDriver\AudioInput\AudioInput.c"></File><File path="Demos\Device\ClassDriver\AudioInput\AudioInput.h"></File><File path="Demos\Device\ClassDriver\AudioInput\AudioInput.txt"></File><File path="Demos\Device\ClassDriver\AudioInput\Descriptors.c"></File><File path="Demos\Device\ClassDriver\AudioInput\Descriptors.h"></File><File path="Demos\Device\ClassDriver\AudioInput\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\AudioInput\makefile"></File></Folder><Folder name="AudioOutput"><File path="Demos\Device\ClassDriver\AudioOutput\AudioOutput.c"></File><File path="Demos\Device\ClassDriver\AudioOutput\AudioOutput.h"></File><File path="Demos\Device\ClassDriver\AudioOutput\AudioOutput.txt"></File><File path="Demos\Device\ClassDriver\AudioOutput\Descriptors.c"></File><File path="Demos\Device\ClassDriver\AudioOutput\Descriptors.h"></File><File path="Demos\Device\ClassDriver\AudioOutput\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\AudioOutput\makefile"></File></Folder><Folder name="CDC"><File path="Demos\Device\ClassDriver\CDC\CDC.c"></File><File path="Demos\Device\ClassDriver\CDC\CDC.h"></File><File path="Demos\Device\ClassDriver\CDC\CDC.txt"></File><File path="Demos\Device\ClassDriver\CDC\Descriptors.c"></File><File path="Demos\Device\ClassDriver\CDC\Descriptors.h"></File><File path="Demos\Device\ClassDriver\CDC\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\CDC\LUFA CDC.inf"></File><File path="Demos\Device\ClassDriver\CDC\makefile"></File></Folder><Folder name="DualCDC"><File path="Demos\Device\ClassDriver\DualCDC\Descriptors.c"></File><File path="Demos\Device\ClassDriver\DualCDC\Descriptors.h"></File><File path="Demos\Device\ClassDriver\DualCDC\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\DualCDC\DualCDC.c"></File><File path="Demos\Device\ClassDriver\DualCDC\DualCDC.h"></File><File path="Demos\Device\ClassDriver\DualCDC\DualCDC.txt"></File><File path="Demos\Device\ClassDriver\DualCDC\LUFA DualCDC.inf"></File><File path="Demos\Device\ClassDriver\DualCDC\makefile"></File></Folder><Folder name="GenericHID"><File path="Demos\Device\ClassDriver\GenericHID\Descriptors.c"></File><File path="Demos\Device\ClassDriver\GenericHID\Descriptors.h"></File><File path="Demos\Device\ClassDriver\GenericHID\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\GenericHID\GenericHID.c"></File><File path="Demos\Device\ClassDriver\GenericHID\GenericHID.h"></File><File path="Demos\Device\ClassDriver\GenericHID\GenericHID.txt"></File><File path="Demos\Device\ClassDriver\GenericHID\makefile"></File></Folder><Folder name="Joystick"><File path="Demos\Device\ClassDriver\Joystick\Descriptors.c"></File><File path="Demos\Device\ClassDriver\Joystick\Descriptors.h"></File><File path="Demos\Device\ClassDriver\Joystick\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\Joystick\Joystick.c"></File><File path="Demos\Device\ClassDriver\Joystick\Joystick.h"></File><File path="Demos\Device\ClassDriver\Joystick\Joystick.txt"></File><File path="Demos\Device\ClassDriver\Joystick\makefile"></File></Folder><Folder name="Keyboard"><File path="Demos\Device\ClassDriver\Keyboard\Descriptors.c"></File><File path="Demos\Device\ClassDriver\Keyboard\Descriptors.h"></File><File path="Demos\Device\ClassDriver\Keyboard\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\Keyboard\Keyboard.c"></File><File path="Demos\Device\ClassDriver\Keyboard\Keyboard.h"></File><File path="Demos\Device\ClassDriver\Keyboard\Keyboard.txt"></File><File path="Demos\Device\ClassDriver\Keyboard\makefile"></File></Folder><Folder name="KeyboardMouse"><File path="Demos\Device\ClassDriver\KeyboardMouse\Descriptors.c"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\Descriptors.h"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\KeyboardMouse.c"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\KeyboardMouse.h"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\KeyboardMouse.txt"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\makefile"></File></Folder><Folder name="MassStorage"><Folder name="Lib"><File path="Demos\Device\ClassDriver\MassStorage\Lib\DataflashManager.c"></File><File path="Demos\Device\ClassDriver\MassStorage\Lib\DataflashManager.h"></File><File path="Demos\Device\ClassDriver\MassStorage\Lib\SCSI.c"></File><File path="Demos\Device\ClassDriver\MassStorage\Lib\SCSI.h"></File><File path="Demos\Device\ClassDriver\MassStorage\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Device\ClassDriver\MassStorage\Descriptors.c"></File><File path="Demos\Device\ClassDriver\MassStorage\Descriptors.h"></File><File path="Demos\Device\ClassDriver\MassStorage\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\MassStorage\makefile"></File><File path="Demos\Device\ClassDriver\MassStorage\MassStorage.c"></File><File path="Demos\Device\ClassDriver\MassStorage\MassStorage.h"></File><File path="Demos\Device\ClassDriver\MassStorage\MassStorage.txt"></File></Folder><Folder name="MIDI"><File path="Demos\Device\ClassDriver\MIDI\Descriptors.c"></File><File path="Demos\Device\ClassDriver\MIDI\Descriptors.h"></File><File path="Demos\Device\ClassDriver\MIDI\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\MIDI\makefile"></File><File path="Demos\Device\ClassDriver\MIDI\MIDI.c"></File><File path="Demos\Device\ClassDriver\MIDI\MIDI.h"></File><File path="Demos\Device\ClassDriver\MIDI\MIDI.txt"></File></Folder><Folder name="Mouse"><File path="Demos\Device\ClassDriver\Mouse\Descriptors.c"></File><File path="Demos\Device\ClassDriver\Mouse\Descriptors.h"></File><File path="Demos\Device\ClassDriver\Mouse\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\Mouse\makefile"></File><File path="Demos\Device\ClassDriver\Mouse\Mouse.c"></File><File path="Demos\Device\ClassDriver\Mouse\Mouse.h"></File><File path="Demos\Device\ClassDriver\Mouse\Mouse.txt"></File></Folder><Folder name="RNDISEthernet"><Folder name="Lib"><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\Webserver.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ARP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ARP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\DHCP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\DHCP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\Ethernet.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\Ethernet.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\EthernetProtocols.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ICMP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ICMP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\IP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\IP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ProtocolDecoders.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ProtocolDecoders.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\TCP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\TCP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\UDP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\UDP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\Webserver.c"></File></Folder><File path="Demos\Device\ClassDriver\RNDISEthernet\Descriptors.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Descriptors.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\LUFA RNDIS.inf"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\makefile"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\RNDISEthernet.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\RNDISEthernet.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\RNDISEthernet.txt"></File></Folder><Folder name="USBtoSerial"><Folder name="Lib"><File path="Demos\Device\ClassDriver\USBtoSerial\Lib\RingBuff.c"></File><File path="Demos\Device\ClassDriver\USBtoSerial\Lib\RingBuff.h"></File></Folder><File path="Demos\Device\ClassDriver\USBtoSerial\Descriptors.c"></File><File path="Demos\Device\ClassDriver\USBtoSerial\Descriptors.h"></File><File path="Demos\Device\ClassDriver\USBtoSerial\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\USBtoSerial\LUFA USBtoSerial.inf"></File><File path="Demos\Device\ClassDriver\USBtoSerial\makefile"></File><File path="Demos\Device\ClassDriver\USBtoSerial\USBtoSerial.c"></File><File path="Demos\Device\ClassDriver\USBtoSerial\USBtoSerial.h"></File><File path="Demos\Device\ClassDriver\USBtoSerial\USBtoSerial.txt"></File></Folder><File path="Demos\Device\ClassDriver\makefile"></File></Folder><Folder name="LowLevel"><Folder name="AudioInput"><File path="Demos\Device\LowLevel\AudioInput\AudioInput.c"></File><File path="Demos\Device\LowLevel\AudioInput\AudioInput.h"></File><File path="Demos\Device\LowLevel\AudioInput\AudioInput.txt"></File><File path="Demos\Device\LowLevel\AudioInput\Descriptors.c"></File><File path="Demos\Device\LowLevel\AudioInput\Descriptors.h"></File><File path="Demos\Device\LowLevel\AudioInput\Doxygen.conf"></File><File path="Demos\Device\LowLevel\AudioInput\makefile"></File></Folder><Folder name="AudioOutput"><File path="Demos\Device\LowLevel\AudioOutput\AudioOutput.c"></File><File path="Demos\Device\LowLevel\AudioOutput\AudioOutput.h"></File><File path="Demos\Device\LowLevel\AudioOutput\AudioOutput.txt"></File><File path="Demos\Device\LowLevel\AudioOutput\Descriptors.c"></File><File path="Demos\Device\LowLevel\AudioOutput\Descriptors.h"></File><File path="Demos\Device\LowLevel\AudioOutput\Doxygen.conf"></File><File path="Demos\Device\LowLevel\AudioOutput\makefile"></File></Folder><Folder name="CDC"><File path="Demos\Device\LowLevel\CDC\CDC.c"></File><File path="Demos\Device\LowLevel\CDC\CDC.h"></File><File path="Demos\Device\LowLevel\CDC\CDC.txt"></File><File path="Demos\Device\LowLevel\CDC\Descriptors.c"></File><File path="Demos\Device\LowLevel\CDC\Descriptors.h"></File><File path="Demos\Device\LowLevel\CDC\Doxygen.conf"></File><File path="Demos\Device\LowLevel\CDC\LUFA CDC.inf"></File><File path="Demos\Device\LowLevel\CDC\makefile"></File></Folder><Folder name="DualCDC"><File path="Demos\Device\LowLevel\DualCDC\Descriptors.c"></File><File path="Demos\Device\LowLevel\DualCDC\Descriptors.h"></File><File path="Demos\Device\LowLevel\DualCDC\Doxygen.conf"></File><File path="Demos\Device\LowLevel\DualCDC\DualCDC.c"></File><File path="Demos\Device\LowLevel\DualCDC\DualCDC.h"></File><File path="Demos\Device\LowLevel\DualCDC\DualCDC.txt"></File><File path="Demos\Device\LowLevel\DualCDC\LUFA DualCDC.inf"></File><File path="Demos\Device\LowLevel\DualCDC\makefile"></File></Folder><Folder name="GenericHID"><File path="Demos\Device\LowLevel\GenericHID\Descriptors.c"></File><File path="Demos\Device\LowLevel\GenericHID\Descriptors.h"></File><File path="Demos\Device\LowLevel\GenericHID\Doxygen.conf"></File><File path="Demos\Device\LowLevel\GenericHID\GenericHID.c"></File><File path="Demos\Device\LowLevel\GenericHID\GenericHID.h"></File><File path="Demos\Device\LowLevel\GenericHID\GenericHID.txt"></File><File path="Demos\Device\LowLevel\GenericHID\makefile"></File></Folder><Folder name="Joystick"><File path="Demos\Device\LowLevel\Joystick\Descriptors.c"></File><File path="Demos\Device\LowLevel\Joystick\Descriptors.h"></File><File path="Demos\Device\LowLevel\Joystick\Doxygen.conf"></File><File path="Demos\Device\LowLevel\Joystick\Joystick.c"></File><File path="Demos\Device\LowLevel\Joystick\Joystick.h"></File><File path="Demos\Device\LowLevel\Joystick\Joystick.txt"></File><File path="Demos\Device\LowLevel\Joystick\makefile"></File></Folder><Folder name="Keyboard"><File path="Demos\Device\LowLevel\Keyboard\Descriptors.c"></File><File path="Demos\Device\LowLevel\Keyboard\Descriptors.h"></File><File path="Demos\Device\LowLevel\Keyboard\Doxygen.conf"></File><File path="Demos\Device\LowLevel\Keyboard\Keyboard.c"></File><File path="Demos\Device\LowLevel\Keyboard\Keyboard.h"></File><File path="Demos\Device\LowLevel\Keyboard\Keyboard.txt"></File><File path="Demos\Device\LowLevel\Keyboard\makefile"></File></Folder><Folder name="KeyboardMouse"><File path="Demos\Device\LowLevel\KeyboardMouse\Descriptors.c"></File><File path="Demos\Device\LowLevel\KeyboardMouse\Descriptors.h"></File><File path="Demos\Device\LowLevel\KeyboardMouse\Doxygen.conf"></File><File path="Demos\Device\LowLevel\KeyboardMouse\KeyboardMouse.c"></File><File path="Demos\Device\LowLevel\KeyboardMouse\KeyboardMouse.h"></File><File path="Demos\Device\LowLevel\KeyboardMouse\KeyboardMouse.txt"></File><File path="Demos\Device\LowLevel\KeyboardMouse\makefile"></File></Folder><Folder name="MassStorage"><Folder name="Lib"><File path="Demos\Device\LowLevel\MassStorage\Lib\DataflashManager.c"></File><File path="Demos\Device\LowLevel\MassStorage\Lib\DataflashManager.h"></File><File path="Demos\Device\LowLevel\MassStorage\Lib\SCSI.c"></File><File path="Demos\Device\LowLevel\MassStorage\Lib\SCSI.h"></File><File path="Demos\Device\LowLevel\MassStorage\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Device\LowLevel\MassStorage\Descriptors.c"></File><File path="Demos\Device\LowLevel\MassStorage\Descriptors.h"></File><File path="Demos\Device\LowLevel\MassStorage\Doxygen.conf"></File><File path="Demos\Device\LowLevel\MassStorage\makefile"></File><File path="Demos\Device\LowLevel\MassStorage\MassStorage.c"></File><File path="Demos\Device\LowLevel\MassStorage\MassStorage.h"></File><File path="Demos\Device\LowLevel\MassStorage\MassStorage.txt"></File></Folder><Folder name="MIDI"><File path="Demos\Device\LowLevel\MIDI\Descriptors.c"></File><File path="Demos\Device\LowLevel\MIDI\Descriptors.h"></File><File path="Demos\Device\LowLevel\MIDI\Doxygen.conf"></File><File path="Demos\Device\LowLevel\MIDI\makefile"></File><File path="Demos\Device\LowLevel\MIDI\MIDI.c"></File><File path="Demos\Device\LowLevel\MIDI\MIDI.h"></File><File path="Demos\Device\LowLevel\MIDI\MIDI.txt"></File></Folder><Folder name="Mouse"><File path="Demos\Device\LowLevel\Mouse\Descriptors.c"></File><File path="Demos\Device\LowLevel\Mouse\Descriptors.h"></File><File path="Demos\Device\LowLevel\Mouse\Doxygen.conf"></File><File path="Demos\Device\LowLevel\Mouse\makefile"></File><File path="Demos\Device\LowLevel\Mouse\Mouse.c"></File><File path="Demos\Device\LowLevel\Mouse\Mouse.h"></File><File path="Demos\Device\LowLevel\Mouse\Mouse.txt"></File></Folder><Folder name="RNDISEthernet"><Folder name="Lib"><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\Webserver.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ARP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ARP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\DHCP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\DHCP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\Ethernet.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\Ethernet.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\EthernetProtocols.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ICMP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ICMP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\IP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\IP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ProtocolDecoders.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ProtocolDecoders.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\RNDIS.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\RNDIS.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\RNDISConstants.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\TCP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\TCP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\UDP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\UDP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\Webserver.c"></File></Folder><File path="Demos\Device\LowLevel\RNDISEthernet\Descriptors.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Descriptors.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Doxygen.conf"></File><File path="Demos\Device\LowLevel\RNDISEthernet\LUFA RNDIS.inf"></File><File path="Demos\Device\LowLevel\RNDISEthernet\makefile"></File><File path="Demos\Device\LowLevel\RNDISEthernet\RNDISEthernet.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\RNDISEthernet.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\RNDISEthernet.txt"></File></Folder><Folder name="USBtoSerial"><Folder name="Lib"><File path="Demos\Device\LowLevel\USBtoSerial\Lib\RingBuff.c"></File><File path="Demos\Device\LowLevel\USBtoSerial\Lib\RingBuff.h"></File></Folder><File path="Demos\Device\LowLevel\USBtoSerial\Descriptors.c"></File><File path="Demos\Device\LowLevel\USBtoSerial\Descriptors.h"></File><File path="Demos\Device\LowLevel\USBtoSerial\Doxygen.conf"></File><File path="Demos\Device\LowLevel\USBtoSerial\LUFA USBtoSerial.inf"></File><File path="Demos\Device\LowLevel\USBtoSerial\makefile"></File><File path="Demos\Device\LowLevel\USBtoSerial\USBtoSerial.c"></File><File path="Demos\Device\LowLevel\USBtoSerial\USBtoSerial.h"></File><File path="Demos\Device\LowLevel\USBtoSerial\USBtoSerial.txt"></File></Folder><File path="Demos\Device\LowLevel\makefile"></File></Folder><Folder name="Incomplete"><Folder name="SideShow"><File path="Demos\Device\Incomplete\Sideshow\SideshowContent.h"></File><File path="Demos\Device\Incomplete\Sideshow\Descriptors.c"></File><File path="Demos\Device\Incomplete\Sideshow\Descriptors.h"></File><File path="Demos\Device\Incomplete\Sideshow\makefile"></File><File path="Demos\Device\Incomplete\Sideshow\Sideshow.c"></File><File path="Demos\Device\Incomplete\Sideshow\Sideshow.h"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowApplications.c"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowApplications.h"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowCommands.c"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowCommands.h"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowCommon.c"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowCommon.h"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowContent.c"></File></Folder></Folder><File path="Demos\Device\makefile"></File></Folder><Folder name="Host"><Folder name="ClassDriver"><Folder name="CDCHost"><File path="Demos\Host\ClassDriver\CDCHost\CDCHost.c"></File><File path="Demos\Host\ClassDriver\CDCHost\CDCHost.h"></File><File path="Demos\Host\ClassDriver\CDCHost\CDCHost.txt"></File><File path="Demos\Host\ClassDriver\CDCHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\CDCHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\CDCHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\CDCHost\makefile"></File></Folder><Folder name="GenericHIDHost"><File path="Demos\Host\ClassDriver\GenericHIDHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\GenericHIDHost.c"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\GenericHIDHost.h"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\GenericHIDHost.txt"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\makefile"></File></Folder><Folder name="KeyboardHost"><File path="Demos\Host\ClassDriver\KeyboardHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\KeyboardHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\KeyboardHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\KeyboardHost\KeyboardHost.c"></File><File path="Demos\Host\ClassDriver\KeyboardHost\KeyboardHost.h"></File><File path="Demos\Host\ClassDriver\KeyboardHost\KeyboardHost.txt"></File><File path="Demos\Host\ClassDriver\KeyboardHost\makefile"></File></Folder><Folder name="KeyboardHostWithParser"><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\makefile"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\HIDReport.c"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\HIDReport.h"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\KeyboardHostWithParser.c"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\KeyboardHostWithParser.h"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\KeyboardHostWithParser.txt"></File></Folder><Folder name="MassStorageHost"><Folder name="Lib"><File path="Demos\Host\ClassDriver\MassStorageHost\Lib\MassStoreCommands.c"></File><File path="Demos\Host\ClassDriver\MassStorageHost\Lib\MassStoreCommands.h"></File><File path="Demos\Host\ClassDriver\MassStorageHost\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Host\ClassDriver\MassStorageHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\MassStorageHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\MassStorageHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\MassStorageHost\makefile"></File><File path="Demos\Host\ClassDriver\MassStorageHost\MassStorageHost.c"></File><File path="Demos\Host\ClassDriver\MassStorageHost\MassStorageHost.h"></File><File path="Demos\Host\ClassDriver\MassStorageHost\MassStorageHost.txt"></File></Folder><Folder name="MouseHost"><File path="Demos\Host\ClassDriver\MouseHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\MouseHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\MouseHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\MouseHost\makefile"></File><File path="Demos\Host\ClassDriver\MouseHost\MouseHost.c"></File><File path="Demos\Host\ClassDriver\MouseHost\MouseHost.h"></File><File path="Demos\Host\ClassDriver\MouseHost\MouseHost.txt"></File></Folder><Folder name="MouseHostWithParser"><File path="Demos\Host\ClassDriver\MouseHostWithParser\MouseHostWithParser.txt"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\HIDReport.c"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\HIDReport.h"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\makefile"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\MouseHostWithParser.c"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\MouseHostWithParser.h"></File></Folder><Folder name="StillImageHost"><Folder name="Lib"><File path="Demos\Host\ClassDriver\StillImageHost\Lib\PIMACodes.h"></File><File path="Demos\Host\ClassDriver\StillImageHost\Lib\StillImageCommands.c"></File><File path="Demos\Host\ClassDriver\StillImageHost\Lib\StillImageCommands.h"></File></Folder><File path="Demos\Host\ClassDriver\StillImageHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\StillImageHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\StillImageHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\StillImageHost\makefile"></File><File path="Demos\Host\ClassDriver\StillImageHost\StillImageHost.c"></File><File path="Demos\Host\ClassDriver\StillImageHost\StillImageHost.h"></File><File path="Demos\Host\ClassDriver\StillImageHost\StillImageHost.txt"></File></Folder><File path="Demos\Host\ClassDriver\makefile"></File></Folder><Folder name="LowLevel"><Folder name="CDCHost"><File path="Demos\Host\LowLevel\CDCHost\CDCHost.c"></File><File path="Demos\Host\LowLevel\CDCHost\CDCHost.h"></File><File path="Demos\Host\LowLevel\CDCHost\CDCHost.txt"></File><File path="Demos\Host\LowLevel\CDCHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\CDCHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\CDCHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\CDCHost\makefile"></File></Folder><Folder name="GenericHIDHost"><File path="Demos\Host\LowLevel\GenericHIDHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\GenericHIDHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\GenericHIDHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\GenericHIDHost\GenericHIDHost.c"></File><File path="Demos\Host\LowLevel\GenericHIDHost\GenericHIDHost.h"></File><File path="Demos\Host\LowLevel\GenericHIDHost\GenericHIDHost.txt"></File><File path="Demos\Host\LowLevel\GenericHIDHost\makefile"></File></Folder><Folder name="KeyboardHost"><File path="Demos\Host\LowLevel\KeyboardHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\KeyboardHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\KeyboardHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\KeyboardHost\KeyboardHost.c"></File><File path="Demos\Host\LowLevel\KeyboardHost\KeyboardHost.h"></File><File path="Demos\Host\LowLevel\KeyboardHost\KeyboardHost.txt"></File><File path="Demos\Host\LowLevel\KeyboardHost\makefile"></File></Folder><Folder name="KeyboardHostWithParser"><File path="Demos\Host\LowLevel\KeyboardHostWithParser\makefile"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\Doxygen.conf"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\HIDReport.c"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\HIDReport.h"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\KeyboardHostWithParser.c"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\KeyboardHostWithParser.h"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\KeyboardHostWithParser.txt"></File></Folder><Folder name="MassStorageHost"><Folder name="Lib"><File path="Demos\Host\LowLevel\MassStorageHost\Lib\MassStoreCommands.c"></File><File path="Demos\Host\LowLevel\MassStorageHost\Lib\MassStoreCommands.h"></File><File path="Demos\Host\LowLevel\MassStorageHost\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Host\LowLevel\MassStorageHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\MassStorageHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\MassStorageHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\MassStorageHost\makefile"></File><File path="Demos\Host\LowLevel\MassStorageHost\MassStorageHost.c"></File><File path="Demos\Host\LowLevel\MassStorageHost\MassStorageHost.h"></File><File path="Demos\Host\LowLevel\MassStorageHost\MassStorageHost.txt"></File></Folder><Folder name="MouseHost"><File path="Demos\Host\LowLevel\MouseHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\MouseHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\MouseHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\MouseHost\makefile"></File><File path="Demos\Host\LowLevel\MouseHost\MouseHost.c"></File><File path="Demos\Host\LowLevel\MouseHost\MouseHost.h"></File><File path="Demos\Host\LowLevel\MouseHost\MouseHost.txt"></File></Folder><Folder name="MouseHostWithParser"><File path="Demos\Host\LowLevel\MouseHostWithParser\MouseHostWithParser.txt"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\Doxygen.conf"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\HIDReport.c"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\HIDReport.h"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\makefile"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\MouseHostWithParser.c"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\MouseHostWithParser.h"></File></Folder><Folder name="StillImageHost"><Folder name="Lib"><File path="Demos\Host\LowLevel\StillImageHost\Lib\PIMACodes.h"></File><File path="Demos\Host\LowLevel\StillImageHost\Lib\StillImageCommands.c"></File><File path="Demos\Host\LowLevel\StillImageHost\Lib\StillImageCommands.h"></File></Folder><File path="Demos\Host\LowLevel\StillImageHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\StillImageHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\StillImageHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\StillImageHost\makefile"></File><File path="Demos\Host\LowLevel\StillImageHost\StillImageHost.c"></File><File path="Demos\Host\LowLevel\StillImageHost\StillImageHost.h"></File><File path="Demos\Host\LowLevel\StillImageHost\StillImageHost.txt"></File></Folder><File path="Demos\Host\LowLevel\makefile"></File></Folder><Folder name="Incomplete"><Folder name="BluetoothHost"><File path="Demos\Host\Incomplete\BluetoothHost\makefile"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothACLPackets.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothACLPackets.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothClassCodes.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothHCICommands.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothHCICommands.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothHost.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothHost.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothStack.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothStack.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\ConfigDescriptor.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\ConfigDescriptor.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\DeviceDescriptor.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\DeviceDescriptor.h"></File></Folder></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><File path="LUFA\FutureChanges.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="ClassDriver"><Folder name="AudioInput"><File path="Demos\Device\ClassDriver\AudioInput\AudioInput.c"></File><File path="Demos\Device\ClassDriver\AudioInput\AudioInput.h"></File><File path="Demos\Device\ClassDriver\AudioInput\AudioInput.txt"></File><File path="Demos\Device\ClassDriver\AudioInput\Descriptors.c"></File><File path="Demos\Device\ClassDriver\AudioInput\Descriptors.h"></File><File path="Demos\Device\ClassDriver\AudioInput\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\AudioInput\makefile"></File></Folder><Folder name="AudioOutput"><File path="Demos\Device\ClassDriver\AudioOutput\AudioOutput.c"></File><File path="Demos\Device\ClassDriver\AudioOutput\AudioOutput.h"></File><File path="Demos\Device\ClassDriver\AudioOutput\AudioOutput.txt"></File><File path="Demos\Device\ClassDriver\AudioOutput\Descriptors.c"></File><File path="Demos\Device\ClassDriver\AudioOutput\Descriptors.h"></File><File path="Demos\Device\ClassDriver\AudioOutput\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\AudioOutput\makefile"></File></Folder><Folder name="CDC"><File path="Demos\Device\ClassDriver\CDC\CDC.c"></File><File path="Demos\Device\ClassDriver\CDC\CDC.h"></File><File path="Demos\Device\ClassDriver\CDC\CDC.txt"></File><File path="Demos\Device\ClassDriver\CDC\Descriptors.c"></File><File path="Demos\Device\ClassDriver\CDC\Descriptors.h"></File><File path="Demos\Device\ClassDriver\CDC\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\CDC\LUFA CDC.inf"></File><File path="Demos\Device\ClassDriver\CDC\makefile"></File></Folder><Folder name="DualCDC"><File path="Demos\Device\ClassDriver\DualCDC\Descriptors.c"></File><File path="Demos\Device\ClassDriver\DualCDC\Descriptors.h"></File><File path="Demos\Device\ClassDriver\DualCDC\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\DualCDC\DualCDC.c"></File><File path="Demos\Device\ClassDriver\DualCDC\DualCDC.h"></File><File path="Demos\Device\ClassDriver\DualCDC\DualCDC.txt"></File><File path="Demos\Device\ClassDriver\DualCDC\LUFA DualCDC.inf"></File><File path="Demos\Device\ClassDriver\DualCDC\makefile"></File></Folder><Folder name="GenericHID"><File path="Demos\Device\ClassDriver\GenericHID\Descriptors.c"></File><File path="Demos\Device\ClassDriver\GenericHID\Descriptors.h"></File><File path="Demos\Device\ClassDriver\GenericHID\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\GenericHID\GenericHID.c"></File><File path="Demos\Device\ClassDriver\GenericHID\GenericHID.h"></File><File path="Demos\Device\ClassDriver\GenericHID\GenericHID.txt"></File><File path="Demos\Device\ClassDriver\GenericHID\makefile"></File></Folder><Folder name="Joystick"><File path="Demos\Device\ClassDriver\Joystick\Descriptors.c"></File><File path="Demos\Device\ClassDriver\Joystick\Descriptors.h"></File><File path="Demos\Device\ClassDriver\Joystick\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\Joystick\Joystick.c"></File><File path="Demos\Device\ClassDriver\Joystick\Joystick.h"></File><File path="Demos\Device\ClassDriver\Joystick\Joystick.txt"></File><File path="Demos\Device\ClassDriver\Joystick\makefile"></File></Folder><Folder name="Keyboard"><File path="Demos\Device\ClassDriver\Keyboard\Descriptors.c"></File><File path="Demos\Device\ClassDriver\Keyboard\Descriptors.h"></File><File path="Demos\Device\ClassDriver\Keyboard\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\Keyboard\Keyboard.c"></File><File path="Demos\Device\ClassDriver\Keyboard\Keyboard.h"></File><File path="Demos\Device\ClassDriver\Keyboard\Keyboard.txt"></File><File path="Demos\Device\ClassDriver\Keyboard\makefile"></File></Folder><Folder name="KeyboardMouse"><File path="Demos\Device\ClassDriver\KeyboardMouse\Descriptors.c"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\Descriptors.h"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\KeyboardMouse.c"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\KeyboardMouse.h"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\KeyboardMouse.txt"></File><File path="Demos\Device\ClassDriver\KeyboardMouse\makefile"></File></Folder><Folder name="MassStorage"><Folder name="Lib"><File path="Demos\Device\ClassDriver\MassStorage\Lib\DataflashManager.c"></File><File path="Demos\Device\ClassDriver\MassStorage\Lib\DataflashManager.h"></File><File path="Demos\Device\ClassDriver\MassStorage\Lib\SCSI.c"></File><File path="Demos\Device\ClassDriver\MassStorage\Lib\SCSI.h"></File><File path="Demos\Device\ClassDriver\MassStorage\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Device\ClassDriver\MassStorage\Descriptors.c"></File><File path="Demos\Device\ClassDriver\MassStorage\Descriptors.h"></File><File path="Demos\Device\ClassDriver\MassStorage\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\MassStorage\makefile"></File><File path="Demos\Device\ClassDriver\MassStorage\MassStorage.c"></File><File path="Demos\Device\ClassDriver\MassStorage\MassStorage.h"></File><File path="Demos\Device\ClassDriver\MassStorage\MassStorage.txt"></File></Folder><Folder name="MIDI"><File path="Demos\Device\ClassDriver\MIDI\Descriptors.c"></File><File path="Demos\Device\ClassDriver\MIDI\Descriptors.h"></File><File path="Demos\Device\ClassDriver\MIDI\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\MIDI\makefile"></File><File path="Demos\Device\ClassDriver\MIDI\MIDI.c"></File><File path="Demos\Device\ClassDriver\MIDI\MIDI.h"></File><File path="Demos\Device\ClassDriver\MIDI\MIDI.txt"></File></Folder><Folder name="Mouse"><File path="Demos\Device\ClassDriver\Mouse\Descriptors.c"></File><File path="Demos\Device\ClassDriver\Mouse\Descriptors.h"></File><File path="Demos\Device\ClassDriver\Mouse\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\Mouse\makefile"></File><File path="Demos\Device\ClassDriver\Mouse\Mouse.c"></File><File path="Demos\Device\ClassDriver\Mouse\Mouse.h"></File><File path="Demos\Device\ClassDriver\Mouse\Mouse.txt"></File></Folder><Folder name="RNDISEthernet"><Folder name="Lib"><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\Webserver.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ARP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ARP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\DHCP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\DHCP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\Ethernet.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\Ethernet.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\EthernetProtocols.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ICMP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ICMP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\IP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\IP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ProtocolDecoders.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\ProtocolDecoders.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\TCP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\TCP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\UDP.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\UDP.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Lib\Webserver.c"></File></Folder><File path="Demos\Device\ClassDriver\RNDISEthernet\Descriptors.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Descriptors.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\LUFA RNDIS.inf"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\makefile"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\RNDISEthernet.c"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\RNDISEthernet.h"></File><File path="Demos\Device\ClassDriver\RNDISEthernet\RNDISEthernet.txt"></File></Folder><Folder name="USBtoSerial"><Folder name="Lib"><File path="Demos\Device\ClassDriver\USBtoSerial\Lib\RingBuff.c"></File><File path="Demos\Device\ClassDriver\USBtoSerial\Lib\RingBuff.h"></File></Folder><File path="Demos\Device\ClassDriver\USBtoSerial\Descriptors.c"></File><File path="Demos\Device\ClassDriver\USBtoSerial\Descriptors.h"></File><File path="Demos\Device\ClassDriver\USBtoSerial\Doxygen.conf"></File><File path="Demos\Device\ClassDriver\USBtoSerial\LUFA USBtoSerial.inf"></File><File path="Demos\Device\ClassDriver\USBtoSerial\makefile"></File><File path="Demos\Device\ClassDriver\USBtoSerial\USBtoSerial.c"></File><File path="Demos\Device\ClassDriver\USBtoSerial\USBtoSerial.h"></File><File path="Demos\Device\ClassDriver\USBtoSerial\USBtoSerial.txt"></File></Folder><File path="Demos\Device\ClassDriver\makefile"></File></Folder><Folder name="LowLevel"><Folder name="AudioInput"><File path="Demos\Device\LowLevel\AudioInput\AudioInput.c"></File><File path="Demos\Device\LowLevel\AudioInput\AudioInput.h"></File><File path="Demos\Device\LowLevel\AudioInput\AudioInput.txt"></File><File path="Demos\Device\LowLevel\AudioInput\Descriptors.c"></File><File path="Demos\Device\LowLevel\AudioInput\Descriptors.h"></File><File path="Demos\Device\LowLevel\AudioInput\Doxygen.conf"></File><File path="Demos\Device\LowLevel\AudioInput\makefile"></File></Folder><Folder name="AudioOutput"><File path="Demos\Device\LowLevel\AudioOutput\AudioOutput.c"></File><File path="Demos\Device\LowLevel\AudioOutput\AudioOutput.h"></File><File path="Demos\Device\LowLevel\AudioOutput\AudioOutput.txt"></File><File path="Demos\Device\LowLevel\AudioOutput\Descriptors.c"></File><File path="Demos\Device\LowLevel\AudioOutput\Descriptors.h"></File><File path="Demos\Device\LowLevel\AudioOutput\Doxygen.conf"></File><File path="Demos\Device\LowLevel\AudioOutput\makefile"></File></Folder><Folder name="CDC"><File path="Demos\Device\LowLevel\CDC\CDC.c"></File><File path="Demos\Device\LowLevel\CDC\CDC.h"></File><File path="Demos\Device\LowLevel\CDC\CDC.txt"></File><File path="Demos\Device\LowLevel\CDC\Descriptors.c"></File><File path="Demos\Device\LowLevel\CDC\Descriptors.h"></File><File path="Demos\Device\LowLevel\CDC\Doxygen.conf"></File><File path="Demos\Device\LowLevel\CDC\LUFA CDC.inf"></File><File path="Demos\Device\LowLevel\CDC\makefile"></File></Folder><Folder name="DualCDC"><File path="Demos\Device\LowLevel\DualCDC\Descriptors.c"></File><File path="Demos\Device\LowLevel\DualCDC\Descriptors.h"></File><File path="Demos\Device\LowLevel\DualCDC\Doxygen.conf"></File><File path="Demos\Device\LowLevel\DualCDC\DualCDC.c"></File><File path="Demos\Device\LowLevel\DualCDC\DualCDC.h"></File><File path="Demos\Device\LowLevel\DualCDC\DualCDC.txt"></File><File path="Demos\Device\LowLevel\DualCDC\LUFA DualCDC.inf"></File><File path="Demos\Device\LowLevel\DualCDC\makefile"></File></Folder><Folder name="GenericHID"><File path="Demos\Device\LowLevel\GenericHID\Descriptors.c"></File><File path="Demos\Device\LowLevel\GenericHID\Descriptors.h"></File><File path="Demos\Device\LowLevel\GenericHID\Doxygen.conf"></File><File path="Demos\Device\LowLevel\GenericHID\GenericHID.c"></File><File path="Demos\Device\LowLevel\GenericHID\GenericHID.h"></File><File path="Demos\Device\LowLevel\GenericHID\GenericHID.txt"></File><File path="Demos\Device\LowLevel\GenericHID\makefile"></File></Folder><Folder name="Joystick"><File path="Demos\Device\LowLevel\Joystick\Descriptors.c"></File><File path="Demos\Device\LowLevel\Joystick\Descriptors.h"></File><File path="Demos\Device\LowLevel\Joystick\Doxygen.conf"></File><File path="Demos\Device\LowLevel\Joystick\Joystick.c"></File><File path="Demos\Device\LowLevel\Joystick\Joystick.h"></File><File path="Demos\Device\LowLevel\Joystick\Joystick.txt"></File><File path="Demos\Device\LowLevel\Joystick\makefile"></File></Folder><Folder name="Keyboard"><File path="Demos\Device\LowLevel\Keyboard\Descriptors.c"></File><File path="Demos\Device\LowLevel\Keyboard\Descriptors.h"></File><File path="Demos\Device\LowLevel\Keyboard\Doxygen.conf"></File><File path="Demos\Device\LowLevel\Keyboard\Keyboard.c"></File><File path="Demos\Device\LowLevel\Keyboard\Keyboard.h"></File><File path="Demos\Device\LowLevel\Keyboard\Keyboard.txt"></File><File path="Demos\Device\LowLevel\Keyboard\makefile"></File></Folder><Folder name="KeyboardMouse"><File path="Demos\Device\LowLevel\KeyboardMouse\Descriptors.c"></File><File path="Demos\Device\LowLevel\KeyboardMouse\Descriptors.h"></File><File path="Demos\Device\LowLevel\KeyboardMouse\Doxygen.conf"></File><File path="Demos\Device\LowLevel\KeyboardMouse\KeyboardMouse.c"></File><File path="Demos\Device\LowLevel\KeyboardMouse\KeyboardMouse.h"></File><File path="Demos\Device\LowLevel\KeyboardMouse\KeyboardMouse.txt"></File><File path="Demos\Device\LowLevel\KeyboardMouse\makefile"></File></Folder><Folder name="MassStorage"><Folder name="Lib"><File path="Demos\Device\LowLevel\MassStorage\Lib\DataflashManager.c"></File><File path="Demos\Device\LowLevel\MassStorage\Lib\DataflashManager.h"></File><File path="Demos\Device\LowLevel\MassStorage\Lib\SCSI.c"></File><File path="Demos\Device\LowLevel\MassStorage\Lib\SCSI.h"></File><File path="Demos\Device\LowLevel\MassStorage\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Device\LowLevel\MassStorage\Descriptors.c"></File><File path="Demos\Device\LowLevel\MassStorage\Descriptors.h"></File><File path="Demos\Device\LowLevel\MassStorage\Doxygen.conf"></File><File path="Demos\Device\LowLevel\MassStorage\makefile"></File><File path="Demos\Device\LowLevel\MassStorage\MassStorage.c"></File><File path="Demos\Device\LowLevel\MassStorage\MassStorage.h"></File><File path="Demos\Device\LowLevel\MassStorage\MassStorage.txt"></File></Folder><Folder name="MIDI"><File path="Demos\Device\LowLevel\MIDI\Descriptors.c"></File><File path="Demos\Device\LowLevel\MIDI\Descriptors.h"></File><File path="Demos\Device\LowLevel\MIDI\Doxygen.conf"></File><File path="Demos\Device\LowLevel\MIDI\makefile"></File><File path="Demos\Device\LowLevel\MIDI\MIDI.c"></File><File path="Demos\Device\LowLevel\MIDI\MIDI.h"></File><File path="Demos\Device\LowLevel\MIDI\MIDI.txt"></File></Folder><Folder name="Mouse"><File path="Demos\Device\LowLevel\Mouse\Descriptors.c"></File><File path="Demos\Device\LowLevel\Mouse\Descriptors.h"></File><File path="Demos\Device\LowLevel\Mouse\Doxygen.conf"></File><File path="Demos\Device\LowLevel\Mouse\makefile"></File><File path="Demos\Device\LowLevel\Mouse\Mouse.c"></File><File path="Demos\Device\LowLevel\Mouse\Mouse.h"></File><File path="Demos\Device\LowLevel\Mouse\Mouse.txt"></File></Folder><Folder name="RNDISEthernet"><Folder name="Lib"><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\Webserver.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ARP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ARP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\DHCP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\DHCP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\Ethernet.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\Ethernet.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\EthernetProtocols.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ICMP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ICMP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\IP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\IP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ProtocolDecoders.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\ProtocolDecoders.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\RNDIS.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\RNDIS.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\RNDISConstants.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\TCP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\TCP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\UDP.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\UDP.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Lib\Webserver.c"></File></Folder><File path="Demos\Device\LowLevel\RNDISEthernet\Descriptors.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Descriptors.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\Doxygen.conf"></File><File path="Demos\Device\LowLevel\RNDISEthernet\LUFA RNDIS.inf"></File><File path="Demos\Device\LowLevel\RNDISEthernet\makefile"></File><File path="Demos\Device\LowLevel\RNDISEthernet\RNDISEthernet.c"></File><File path="Demos\Device\LowLevel\RNDISEthernet\RNDISEthernet.h"></File><File path="Demos\Device\LowLevel\RNDISEthernet\RNDISEthernet.txt"></File></Folder><Folder name="USBtoSerial"><Folder name="Lib"><File path="Demos\Device\LowLevel\USBtoSerial\Lib\RingBuff.c"></File><File path="Demos\Device\LowLevel\USBtoSerial\Lib\RingBuff.h"></File></Folder><File path="Demos\Device\LowLevel\USBtoSerial\Descriptors.c"></File><File path="Demos\Device\LowLevel\USBtoSerial\Descriptors.h"></File><File path="Demos\Device\LowLevel\USBtoSerial\Doxygen.conf"></File><File path="Demos\Device\LowLevel\USBtoSerial\LUFA USBtoSerial.inf"></File><File path="Demos\Device\LowLevel\USBtoSerial\makefile"></File><File path="Demos\Device\LowLevel\USBtoSerial\USBtoSerial.c"></File><File path="Demos\Device\LowLevel\USBtoSerial\USBtoSerial.h"></File><File path="Demos\Device\LowLevel\USBtoSerial\USBtoSerial.txt"></File></Folder><File path="Demos\Device\LowLevel\makefile"></File></Folder><Folder name="Incomplete"><Folder name="SideShow"><File path="Demos\Device\Incomplete\Sideshow\SideshowContent.h"></File><File path="Demos\Device\Incomplete\Sideshow\Descriptors.c"></File><File path="Demos\Device\Incomplete\Sideshow\Descriptors.h"></File><File path="Demos\Device\Incomplete\Sideshow\makefile"></File><File path="Demos\Device\Incomplete\Sideshow\Sideshow.c"></File><File path="Demos\Device\Incomplete\Sideshow\Sideshow.h"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowApplications.c"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowApplications.h"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowCommands.c"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowCommands.h"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowCommon.c"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowCommon.h"></File><File path="Demos\Device\Incomplete\Sideshow\SideshowContent.c"></File></Folder></Folder><File path="Demos\Device\makefile"></File></Folder><Folder name="Host"><Folder name="ClassDriver"><Folder name="CDCHost"><File path="Demos\Host\ClassDriver\CDCHost\CDCHost.c"></File><File path="Demos\Host\ClassDriver\CDCHost\CDCHost.h"></File><File path="Demos\Host\ClassDriver\CDCHost\CDCHost.txt"></File><File path="Demos\Host\ClassDriver\CDCHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\CDCHost\makefile"></File></Folder><Folder name="GenericHIDHost"><File path="Demos\Host\ClassDriver\GenericHIDHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\GenericHIDHost.c"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\GenericHIDHost.h"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\GenericHIDHost.txt"></File><File path="Demos\Host\ClassDriver\GenericHIDHost\makefile"></File></Folder><Folder name="KeyboardHost"><File path="Demos\Host\ClassDriver\KeyboardHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\KeyboardHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\KeyboardHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\KeyboardHost\KeyboardHost.c"></File><File path="Demos\Host\ClassDriver\KeyboardHost\KeyboardHost.h"></File><File path="Demos\Host\ClassDriver\KeyboardHost\KeyboardHost.txt"></File><File path="Demos\Host\ClassDriver\KeyboardHost\makefile"></File></Folder><Folder name="KeyboardHostWithParser"><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\makefile"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\HIDReport.c"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\HIDReport.h"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\KeyboardHostWithParser.c"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\KeyboardHostWithParser.h"></File><File path="Demos\Host\ClassDriver\KeyboardHostWithParser\KeyboardHostWithParser.txt"></File></Folder><Folder name="MassStorageHost"><Folder name="Lib"><File path="Demos\Host\ClassDriver\MassStorageHost\Lib\MassStoreCommands.c"></File><File path="Demos\Host\ClassDriver\MassStorageHost\Lib\MassStoreCommands.h"></File><File path="Demos\Host\ClassDriver\MassStorageHost\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Host\ClassDriver\MassStorageHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\MassStorageHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\MassStorageHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\MassStorageHost\makefile"></File><File path="Demos\Host\ClassDriver\MassStorageHost\MassStorageHost.c"></File><File path="Demos\Host\ClassDriver\MassStorageHost\MassStorageHost.h"></File><File path="Demos\Host\ClassDriver\MassStorageHost\MassStorageHost.txt"></File></Folder><Folder name="MouseHost"><File path="Demos\Host\ClassDriver\MouseHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\MouseHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\MouseHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\MouseHost\makefile"></File><File path="Demos\Host\ClassDriver\MouseHost\MouseHost.c"></File><File path="Demos\Host\ClassDriver\MouseHost\MouseHost.h"></File><File path="Demos\Host\ClassDriver\MouseHost\MouseHost.txt"></File></Folder><Folder name="MouseHostWithParser"><File path="Demos\Host\ClassDriver\MouseHostWithParser\MouseHostWithParser.txt"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\HIDReport.c"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\HIDReport.h"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\makefile"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\MouseHostWithParser.c"></File><File path="Demos\Host\ClassDriver\MouseHostWithParser\MouseHostWithParser.h"></File></Folder><Folder name="StillImageHost"><Folder name="Lib"><File path="Demos\Host\ClassDriver\StillImageHost\Lib\PIMACodes.h"></File><File path="Demos\Host\ClassDriver\StillImageHost\Lib\StillImageCommands.c"></File><File path="Demos\Host\ClassDriver\StillImageHost\Lib\StillImageCommands.h"></File></Folder><File path="Demos\Host\ClassDriver\StillImageHost\ConfigDescriptor.c"></File><File path="Demos\Host\ClassDriver\StillImageHost\ConfigDescriptor.h"></File><File path="Demos\Host\ClassDriver\StillImageHost\Doxygen.conf"></File><File path="Demos\Host\ClassDriver\StillImageHost\makefile"></File><File path="Demos\Host\ClassDriver\StillImageHost\StillImageHost.c"></File><File path="Demos\Host\ClassDriver\StillImageHost\StillImageHost.h"></File><File path="Demos\Host\ClassDriver\StillImageHost\StillImageHost.txt"></File></Folder><File path="Demos\Host\ClassDriver\makefile"></File></Folder><Folder name="LowLevel"><Folder name="CDCHost"><File path="Demos\Host\LowLevel\CDCHost\CDCHost.c"></File><File path="Demos\Host\LowLevel\CDCHost\CDCHost.h"></File><File path="Demos\Host\LowLevel\CDCHost\CDCHost.txt"></File><File path="Demos\Host\LowLevel\CDCHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\CDCHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\CDCHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\CDCHost\makefile"></File></Folder><Folder name="GenericHIDHost"><File path="Demos\Host\LowLevel\GenericHIDHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\GenericHIDHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\GenericHIDHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\GenericHIDHost\GenericHIDHost.c"></File><File path="Demos\Host\LowLevel\GenericHIDHost\GenericHIDHost.h"></File><File path="Demos\Host\LowLevel\GenericHIDHost\GenericHIDHost.txt"></File><File path="Demos\Host\LowLevel\GenericHIDHost\makefile"></File></Folder><Folder name="KeyboardHost"><File path="Demos\Host\LowLevel\KeyboardHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\KeyboardHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\KeyboardHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\KeyboardHost\KeyboardHost.c"></File><File path="Demos\Host\LowLevel\KeyboardHost\KeyboardHost.h"></File><File path="Demos\Host\LowLevel\KeyboardHost\KeyboardHost.txt"></File><File path="Demos\Host\LowLevel\KeyboardHost\makefile"></File></Folder><Folder name="KeyboardHostWithParser"><File path="Demos\Host\LowLevel\KeyboardHostWithParser\makefile"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\Doxygen.conf"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\HIDReport.c"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\HIDReport.h"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\KeyboardHostWithParser.c"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\KeyboardHostWithParser.h"></File><File path="Demos\Host\LowLevel\KeyboardHostWithParser\KeyboardHostWithParser.txt"></File></Folder><Folder name="MassStorageHost"><Folder name="Lib"><File path="Demos\Host\LowLevel\MassStorageHost\Lib\MassStoreCommands.c"></File><File path="Demos\Host\LowLevel\MassStorageHost\Lib\MassStoreCommands.h"></File><File path="Demos\Host\LowLevel\MassStorageHost\Lib\SCSI_Codes.h"></File></Folder><File path="Demos\Host\LowLevel\MassStorageHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\MassStorageHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\MassStorageHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\MassStorageHost\makefile"></File><File path="Demos\Host\LowLevel\MassStorageHost\MassStorageHost.c"></File><File path="Demos\Host\LowLevel\MassStorageHost\MassStorageHost.h"></File><File path="Demos\Host\LowLevel\MassStorageHost\MassStorageHost.txt"></File></Folder><Folder name="MouseHost"><File path="Demos\Host\LowLevel\MouseHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\MouseHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\MouseHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\MouseHost\makefile"></File><File path="Demos\Host\LowLevel\MouseHost\MouseHost.c"></File><File path="Demos\Host\LowLevel\MouseHost\MouseHost.h"></File><File path="Demos\Host\LowLevel\MouseHost\MouseHost.txt"></File></Folder><Folder name="MouseHostWithParser"><File path="Demos\Host\LowLevel\MouseHostWithParser\MouseHostWithParser.txt"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\Doxygen.conf"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\HIDReport.c"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\HIDReport.h"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\makefile"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\MouseHostWithParser.c"></File><File path="Demos\Host\LowLevel\MouseHostWithParser\MouseHostWithParser.h"></File></Folder><Folder name="StillImageHost"><Folder name="Lib"><File path="Demos\Host\LowLevel\StillImageHost\Lib\PIMACodes.h"></File><File path="Demos\Host\LowLevel\StillImageHost\Lib\StillImageCommands.c"></File><File path="Demos\Host\LowLevel\StillImageHost\Lib\StillImageCommands.h"></File></Folder><File path="Demos\Host\LowLevel\StillImageHost\ConfigDescriptor.c"></File><File path="Demos\Host\LowLevel\StillImageHost\ConfigDescriptor.h"></File><File path="Demos\Host\LowLevel\StillImageHost\Doxygen.conf"></File><File path="Demos\Host\LowLevel\StillImageHost\makefile"></File><File path="Demos\Host\LowLevel\StillImageHost\StillImageHost.c"></File><File path="Demos\Host\LowLevel\StillImageHost\StillImageHost.h"></File><File path="Demos\Host\LowLevel\StillImageHost\StillImageHost.txt"></File></Folder><File path="Demos\Host\LowLevel\makefile"></File></Folder><Folder name="Incomplete"><Folder name="BluetoothHost"><File path="Demos\Host\Incomplete\BluetoothHost\makefile"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothACLPackets.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothACLPackets.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothClassCodes.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothHCICommands.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothHCICommands.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothHost.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothHost.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothStack.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\BluetoothStack.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\ConfigDescriptor.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\ConfigDescriptor.h"></File><File path="Demos\Host\Incomplete\BluetoothHost\DeviceDescriptor.c"></File><File path="Demos\Host\Incomplete\BluetoothHost\DeviceDescriptor.h"></File></Folder></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><File path="LUFA\Drivers\USB\Class\Host\CDC.c"></File><File path="LUFA\Drivers\USB\Class\Host\CDC.h"></File><File path="LUFA\Drivers\USB\Class\Host\HID.c"></File><File path="LUFA\Drivers\USB\Class\Host\HID.h"></File><File path="LUFA\Drivers\USB\Class\Host\Audio.c"></File><File path="LUFA\Drivers\USB\Class\Host\Audio.h"></File><File path="LUFA\Drivers\USB\Class\Host\MIDI.c"></File><File path="LUFA\Drivers\USB\Class\Host\MIDI.h"></File><File path="LUFA\Drivers\USB\Class\Host\MassStorage.c"></File><File path="LUFA\Drivers\USB\Class\Host\MassStorage.h"></File><File path="LUFA\Drivers\USB\Class\Host\StillImage.c"></File><File path="LUFA\Drivers\USB\Class\Host\StillImage.h"></File></Folder><Folder name="Common"><File path="LUFA\Drivers\USB\Class\Common\Audio.h"></File><File path="LUFA\Drivers\USB\Class\Common\CDC.h"></File><File path="LUFA\Drivers\USB\Class\Common\HID.h"></File><File path="LUFA\Drivers\USB\Class\Common\MassStorage.h"></File><File path="LUFA\Drivers\USB\Class\Common\MIDI.h"></File><File path="LUFA\Drivers\USB\Class\Common\RNDIS.h"></File></Folder><File path="LUFA\Drivers\USB\Class\Audio.h"></File><File path="LUFA\Drivers\USB\Class\CDC.h"></File><File path="LUFA\Drivers\USB\Class\HID.h"></File><File path="LUFA\Drivers\USB\Class\MassStorage.h"></File><File path="LUFA\Drivers\USB\Class\MIDI.h"></File><File path="LUFA\Drivers\USB\Class\RNDIS.h"></File><File path="LUFA\Drivers\USB\Class\StillImage.h"></File></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><File path="LUFA\FutureChanges.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/DirectorySummaries.txt b/LUFA/DirectorySummaries.txt
index 13cdc3e..3b2c15f 100644 (file)
--- a/LUFA/DirectorySummaries.txt
+++ b/LUFA/DirectorySummaries.txt
@@ -4,30 +4,30 @@
  *  documentation pages. It is not a project source file.\r
  */\r
 \r
-/** \dir Common\r
+/** \dir LUFA/Common\r
  *  \brief Common library header files.\r
  *  \r
  *  This folder contains header files which are common to all parts of the LUFA library. They may be used freely in\r
  *  user applications.\r
  *\r
- *  \dir Drivers\r
+ *  \dir LUFA/Drivers\r
  *  \brief Library hardware and software drivers.\r
  *  \r
  *  This folder contains all the library hardware and software drivers for each supported board and USB AVR\r
  *  microcontroller model.\r
  * \r
- *  \dir Drivers/Misc\r
+ *  \dir LUFA/Drivers/Misc\r
  *  \brief Miscellaneous driver files.\r
  *  \r
  *  This folder contains drivers for aspects other than the USB interface, board hardware or AVR peripherals.\r
  * \r
- *  \dir Drivers/Peripheral\r
+ *  \dir LUFA/Drivers/Peripheral\r
  *  \brief USB AVR peripheral driver files.\r
  *  \r
  *  This folder contains drivers for several of the AVR internal peripherals such as the USART, compatible with\r
  *  all USB AVR models.\r
  *\r
- *  \dir Drivers/Peripheral/AT90USBXXX67\r
+ *  \dir LUFA/Drivers/Peripheral/AT90USBXXX67\r
  *  \brief AT90USBXXX6, AT90USBXXX7 and ATMEGAXXU4 AVR model peripheral driver files. Its original name is due to legacy\r
  *  reasons.\r
  *  \r
@@ -36,7 +36,7 @@
  *  included by the user application - the dispatch header file located in the parent AT90USBXXX directory should be used\r
  *  instead.\r
  *\r
- *  \dir Drivers/USB\r
+ *  \dir LUFA/Drivers/USB\r
  *  \brief USB controller peripheral driver files.\r
  *  \r
  *  This folder contains the main header files required to implement the USB interface in the USB supporting AVR models.\r
@@ -44,76 +44,76 @@
  *  functionality, and the appropriate C source files in the LowLevel and HighLevel driver folders added to the compile\r
  *  and link stages.\r
  *\r
- *  \dir Drivers/USB/LowLevel\r
+ *  \dir LUFA/Drivers/USB/LowLevel\r
  *  \brief Low level USB driver files.\r
  *  \r
  *  This folder contains low level USB driver source files required to implement USB functionality on the USB AVR microcontrollers.\r
  *\r
- *  \dir Drivers/USB/HighLevel\r
+ *  \dir LUFA/Drivers/USB/HighLevel\r
  *  \brief High level USB driver files.\r
  *  \r
  *  This folder contains high level USB driver source files required to implement USB functionality on the USB AVR microcontrollers.\r
  *\r
- *  \dir Drivers/USB/Class\r
+ *  \dir LUFA/Drivers/USB/Class\r
  *  \brief USB Class helper driver files.\r
  *  \r
  *  This folder contains drivers for implementing functionality of standardized USB classes. These are not used directly by the library,\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
+ *  \dir LUFA/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
+ *  \dir LUFA/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
+ *  \dir LUFA/Drivers/Board\r
  *  \brief Board hardware driver files.\r
  *  \r
  *  This folder contains drivers for interfacing with the physical hardware on supported commercial boards, primarily from\r
  *  the Atmel corporation. Header files in this folder should be included in user applications requiring the functionality of\r
  *  hardware placed on supported boards.\r
  *\r
- *  \dir Drivers/Board/USBKEY\r
+ *  \dir LUFA/Drivers/Board/USBKEY\r
  *  \brief USBKEY board hardware driver files.\r
  *  \r
  *  This folder contains drivers for hardware on the Atmel USBKEY demonstration board. The header files in this folder should\r
  *  not be included directly in user applications; the similarly named dispatch header files located in the parent Board directory\r
  *  should be included instead.\r
  *\r
- *  \dir Drivers/Board/STK526\r
+ *  \dir LUFA/Drivers/Board/STK526\r
  *  \brief STK526 board hardware driver files.\r
  *  \r
  *  This folder contains drivers for hardware on the Atmel STK526 development board. The header files in this folder should\r
  *  not be included directly in user applications; the similarly named dispatch header files located in the parent Board directory\r
  *  should be included instead.\r
  *\r
- *  \dir Drivers/Board/STK525\r
+ *  \dir LUFA/Drivers/Board/STK525\r
  *  \brief STK525 board hardware driver files.\r
  *  \r
  *  This folder contains drivers for hardware on the Atmel STK525 development board. The header files in this folder should\r
  *  not be included directly in user applications; the similarly named dispatch header files located in the parent Board directory\r
  *  should be included instead.\r
  *\r
- *  \dir Drivers/Board/RZUSBSTICK\r
+ *  \dir LUFA/Drivers/Board/RZUSBSTICK\r
  *  \brief RZUSBSTICK board hardware driver files.\r
  *  \r
  *  This folder contains drivers for hardware on the Atmel RZUSBSTICK board, as used in the Atmel "Raven" wireless kits. The header\r
  *  files in this folder should not be included directly in user applications; the similarly named dispatch header files located in\r
  *  the parent Board directory should be included instead.\r
  *\r
- *  \dir Drivers/Board/ATAVRUSBRF01\r
+ *  \dir LUFA/Drivers/Board/ATAVRUSBRF01\r
  *  \brief ATAVRUSBRF01 board hardware driver files.\r
  *  \r
  *  This folder contains drivers for hardware on the Atmel ATAVRUSBRF01 board, as used in several Atmel wireless demo kits. The header\r
  *  files in this folder should not be included directly in user applications; the similarly named dispatch header files located in\r
  *  the parent Board directory should be included instead.\r
  *\r
- *  \dir DriverStubs\r
+ *  \dir LUFA/DriverStubs\r
  *  \brief Driver stub header files for custom boards, to allow the LUFA board drivers to operate.\r
  *  \r
  *  This contains stub files for the LUFA board drivers. If the LUFA board drivers are used with board hardware other than those\r

diff --git a/LUFA/Drivers/USB/Class/Audio.h b/LUFA/Drivers/USB/Class/Audio.h
new file mode 100644 (file)
index 0000000..2175a9b
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Audio.h
@@ -0,0 +1,62 @@
+/*\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
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBClassAudio Audio Device Class Driver - LUFA/Drivers/Class/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
+ *    - LUFA/Drivers/USB/Class/Host/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
+       /* Includes: */\r
+               #include "../HighLevel/USBMode.h"\r
+\r
+               #if defined(USB_CAN_BE_DEVICE)\r
+                       #include "Device/Audio.h"\r
+               #endif\r
+               \r
+               #if defined(USB_CAN_BE_HOST)\r
+                       #include "Host/Audio.h"\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/CDC.h b/LUFA/Drivers/USB/Class/CDC.h
new file mode 100644 (file)
index 0000000..9cd3bcd
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/CDC.h
@@ -0,0 +1,62 @@
+/*\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
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBClassCDC CDC Device Class Driver - LUFA/Drivers/Class/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
+ *    - LUFA/Drivers/USB/Class/Host/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
+       /* Includes: */\r
+               #include "../HighLevel/USBMode.h"\r
+\r
+               #if defined(USB_CAN_BE_DEVICE)\r
+                       #include "Device/CDC.h"\r
+               #endif\r
+               \r
+               #if defined(USB_CAN_BE_HOST)\r
+                       #include "Host/CDC.h"\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/Audio.h
new file mode 100644 (file)
index 0000000..51cdfc6
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Common/Audio.h
@@ -0,0 +1,381 @@
+/*\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
+/** \ingroup Group_USBClassAudio\r
+ *  @{\r
+ */\r
+\r
+#ifndef _AUDIO_CLASS_COMMON_H_\r
+#define _AUDIO_CLASS_COMMON_H_\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               \r
+               #include <string.h>\r
+\r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\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
+               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\r
+               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+
+               /** 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
+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \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
+\r
+               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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 AUDIO_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 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
+               /** Class state structure. An instance of this structure should be made for each Audio interface\r
+                *  within the user application, and passed to each of the Audio class driver functions as the\r
+                *  AudioInterfaceInfo parameter. The contents of this structure should be set to their correct\r
+                *  values when used, or ommitted to force the library to use default values.\r
+                */\r
+               typedef struct\r
+               {\r
+                       uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this structure controls */\r
+\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
+                       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
+                       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
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDC.h
new file mode 100644 (file)
index 0000000..12f8b83
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Common/CDC.h
@@ -0,0 +1,184 @@
+/*\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
+/** \ingroup Group_USBClassCDC\r
+ *  @{\r
+ */\r
+ \r
+#ifndef _CDC_CLASS_COMMON_H_\r
+#define _CDC_CLASS_COMMON_H_\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+\r
+               #include <string.h>\r
+\r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Macros: */\r
+               /** CDC Class specific request to get the current virtual serial port configuration settings. */\r
+               #define REQ_GetLineEncoding              0x21\r
+\r
+               /** CDC Class specific request to set the current virtual serial port configuration settings. */\r
+               #define REQ_SetLineEncoding              0x20\r
+\r
+               /** CDC Class specific request to set the current virtual serial port handshake line states. */\r
+               #define REQ_SetControlLineState          0x22\r
+               \r
+               /** Notification type constant for a change in the virtual serial port handshake line states, for\r
+                *  use with a USB_Notification_Header_t notification structure when sent to the host via the CDC \r
+                *  notification endpoint.\r
+                */\r
+               #define NOTIF_SerialState                0x20\r
+\r
+               /** Mask for the DTR handshake line for use with the REQ_SetControlLineState class specific request\r
+                *  from the host, to indicate that the DTR line state should be high.\r
+                */\r
+               #define CDC_CONTROL_LINE_OUT_DTR         (1 << 0)\r
+\r
+               /** Mask for the RTS handshake line for use with the REQ_SetControlLineState class specific request\r
+                *  from the host, to indicate that theRTS line state should be high.\r
+                */\r
+               #define CDC_CONTROL_LINE_OUT_RTS         (1 << 1)\r
+               \r
+               /** Mask for the DCD handshake line for use with the a NOTIF_SerialState class specific notification\r
+                *  from the device to the host, to indicate that the DCD line state is currently high.\r
+                */\r
+               #define CDC_CONTROL_LINE_IN_DCD          (1 << 0)\r
+\r
+               /** Mask for the DSR handshake line for use with the a NOTIF_SerialState class specific notification\r
+                *  from the device to the host, to indicate that the DSR line state is currently high.\r
+                */\r
+               #define CDC_CONTROL_LINE_IN_DSR          (1 << 1)\r
+\r
+               /** Mask for the BREAK handshake line for use with the a NOTIF_SerialState class specific notification\r
+                *  from the device to the host, to indicate that the BREAK line state is currently high.\r
+                */\r
+               #define CDC_CONTROL_LINE_IN_BREAK        (1 << 2)\r
+\r
+               /** Mask for the RING handshake line for use with the a NOTIF_SerialState class specific notification\r
+                *  from the device to the host, to indicate that the RING line state is currently high.\r
+                */\r
+               #define CDC_CONTROL_LINE_IN_RING         (1 << 3)\r
+\r
+               /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
+                *  to indicate that a framing error has occurred on the virtual serial port.\r
+                */\r
+               #define CDC_CONTROL_LINE_IN_FRAMEERROR   (1 << 4)\r
+\r
+               /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
+                *  to indicate that a parity error has occurred on the virtual serial port.\r
+                */\r
+               #define CDC_CONTROL_LINE_IN_PARITYERROR  (1 << 5)\r
+\r
+               /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
+                *  to indicate that a data overrun error has occurred on the virtual serial port.\r
+                */\r
+               #define CDC_CONTROL_LINE_IN_OVERRUNERROR (1 << 6)\r
+               \r
+               /** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a\r
+                *  uniform structure but variable sized data payloads, thus cannot be represented accurately by\r
+                *  a single typedef struct. A macro is used instead so that functional descriptors can be created\r
+                *  easily by specifying the size of the payload. This allows sizeof() to work correctly.\r
+                *\r
+                *  \param DataSize  Size in bytes of the CDC functional descriptor's data payload\r
+                */\r
+               #define CDC_FUNCTIONAL_DESCRIPTOR(DataSize)        \\r
+                    struct                                        \\r
+                    {                                             \\r
+                         USB_Descriptor_Header_t Header;          \\r
+                             uint8_t                 SubType;         \\r
+                         uint8_t                 Data[DataSize];  \\r
+                    }\r
+\r
+       /* Enums: */\r
+               /** Enum for the possible line encoding formats of a virtual serial port. */\r
+               enum CDCDevice_CDC_LineCodingFormats_t\r
+               {\r
+                       CDC_LINEENCODING_OneStopBit          = 0, /**< Each frame contains one stop bit */\r
+                       CDC_LINEENCODING_OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits */\r
+                       CDC_LINEENCODING_TwoStopBits         = 2, /**< Each frame contains two stop bits */\r
+               };\r
+               \r
+               /** Enum for the possible line encoding parity settings of a virtual serial port. */\r
+               enum CDCDevice_LineCodingParity_t\r
+               {\r
+                       CDC_PARITY_None    = 0, /**< No parity bit mode on each frame */\r
+                       CDC_PARITY_Odd     = 1, /**< Odd parity bit mode on each frame */\r
+                       CDC_PARITY_Even    = 2, /**< Even parity bit mode on each frame */\r
+                       CDC_PARITY_Mark    = 3, /**< Mark parity bit mode on each frame */\r
+                       CDC_PARITY_Space   = 4, /**< Space parity bit mode on each frame */\r
+               };\r
+\r
+       /* Type Defines: */\r
+               /** Class state structure. An instance of this structure should be made for each CDC interface\r
+                *  within the user application, and passed to each of the CDC class driver functions as the\r
+                *  CDCInterfaceInfo parameter. The contents of this structure should be set to their correct\r
+                *  values when used, or ommitted to force the library to use default values.\r
+                */\r
+               typedef struct\r
+               {\r
+                       uint8_t  ControlInterfaceNumber; /**< Interface number of the CDC control interface within the device */\r
+\r
+                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the CDC interface's IN data endpoint */\r
+                       uint16_t DataINEndpointSize; /**< Size in bytes of the CDC interface's IN data endpoint */\r
+\r
+                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the CDC interface's OUT data endpoint */\r
+                       uint16_t DataOUTEndpointSize;  /**< Size in bytes of the CDC interface's OUT data endpoint */\r
+\r
+                       uint8_t  NotificationEndpointNumber; /**< Endpoint number of the CDC interface's IN notification endpoint, if used */\r
+                       uint16_t NotificationEndpointSize;  /**< Size in bytes of the CDC interface's IN notification endpoint, if used */\r
+\r
+                       uint8_t  ControlLineState; /**< Current control line states, as set by the host */\r
+\r
+                       struct\r
+                       {\r
+                               uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */\r
+                               uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the\r
+                                                                         *   CDCDevice_CDC_LineCodingFormats_t enum\r
+                                                                         */\r
+                               uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the\r
+                                                                         *   CDCDevice_LineCodingParity_t enum\r
+                                                                         */\r
+                               uint8_t  DataBits; /**< Bits of data per character of the virtual serial port */\r
+                       } LineEncoding;\r
+               } USB_ClassInfo_CDC_t;\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HID.h
new file mode 100644 (file)
index 0000000..07ed94b
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Common/HID.h
@@ -0,0 +1,112 @@
+/*\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
+/** \ingroup Group_USBClassHID\r
+ *  @{\r
+ */\r
+ \r
+#ifndef _HID_CLASS_COMMON_H_\r
+#define _HID_CLASS_COMMON_H_\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+\r
+               #include <string.h>\r
+\r
+       /* Macros: */\r
+               /** HID Class Specific Request to get the current HID report from the device. */\r
+               #define REQ_GetReport      0x01\r
+\r
+               /** HID Class Specific Request to get the current device idle count. */\r
+               #define REQ_GetIdle        0x02\r
+\r
+               /** HID Class Specific Request to set the current HID report to the device. */\r
+               #define REQ_SetReport      0x09\r
+\r
+               /** HID Class Specific Request to set the device's idle count. */\r
+               #define REQ_SetIdle        0x0A\r
+\r
+               /** HID Class Specific Request to get the current HID report protocol mode. */\r
+               #define REQ_GetProtocol    0x03\r
+\r
+               /** HID Class Specific Request to set the current HID report protocol mode. */\r
+               #define REQ_SetProtocol    0x0B\r
+\r
+               /** Descriptor header type value, to indicate a HID class HID descriptor. */\r
+               #define DTYPE_HID          0x21\r
+               \r
+               /** Descriptor header type value, to indicate a HID class HID report descriptor. */\r
+               #define DTYPE_Report       0x22\r
+               \r
+       /* Type Defines: */\r
+               /** Type define for the HID class specific HID descriptor, to describe the HID device's specifications. Refer to the HID\r
+                *  specification for details on the structure elements.\r
+                */\r
+               typedef struct\r
+               {\r
+                       USB_Descriptor_Header_t               Header;\r
+                               \r
+                       uint16_t                              HIDSpec;\r
+                       uint8_t                               CountryCode;\r
+               \r
+                       uint8_t                               TotalReportDescriptors;\r
+\r
+                       uint8_t                               HIDReportType;\r
+                       uint16_t                              HIDReportLength;\r
+               } USB_Descriptor_HID_t;\r
+\r
+               /** Type define for the data type used to store HID report descriptor elements. */\r
+               typedef uint8_t USB_Descriptor_HIDReport_Datatype_t;\r
+\r
+               /** Class state structure. An instance of this structure should be made for each HID interface\r
+                *  within the user application, and passed to each of the HID class driver functions as the\r
+                *  HIDInterfaceInfo parameter. The contents of this structure should be set to their correct\r
+                *  values when used, or ommitted to force the library to use default values.\r
+                *\r
+                *  Note that for the HID class driver, host-to-device reports are received via HID class requests\r
+                *  rather than a dedicated endpoint to simplify the driver and its interface.\r
+                */\r
+               typedef struct\r
+               {\r
+                       uint8_t  InterfaceNumber; /**< Interface number of the HID interface within the device */\r
+\r
+                       uint8_t  ReportINEndpointNumber; /**< Endpoint number of the HID interface's IN report endpoint */\r
+                       uint16_t ReportINEndpointSize; /**< Size in bytes of the HID interface's IN report endpoint */\r
+                       \r
+                       uint8_t  ReportINBufferSize; /**< Size of the largest possible report to send to the host, for buffer allocation purposes */\r
+\r
+                       bool     UsingReportProtocol; /**< Indicates if the HID interface is set to Boot or Report protocol mode */\r
+                       uint16_t IdleCount; /**< Report idle period, in ms, set by the host */\r
+                       uint16_t IdleMSRemaining; /**< Total number of ms remaining before the idle period elapses */\r
+               } USB_ClassInfo_HID_t;\r
+\r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDI.h
new file mode 100644 (file)
index 0000000..05bd846
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Common/MIDI.h
@@ -0,0 +1,171 @@
+/*\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
+/** \ingroup Group_USBClassMIDI\r
+ *  @{\r
+ */\r
+\r
+#ifndef _MIDI_CLASS_COMMON_H_\r
+#define _MIDI_CLASS_COMMON_H_\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               #include "Audio.h"\r
+\r
+               #include <string.h>\r
+\r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\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 MIDI_JACKTYPE_EMBEDDED      0x01\r
+\r
+               /** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */\r
+               #define MIDI_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 */\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
+               /** Type define for a USB MIDI event packet, used to encapsulate sent and received MIDI messages from a USB MIDI interface. */\r
+               typedef struct\r
+               {\r
+                       unsigned char Command     : 4; /**< MIDI command being sent or received in the event packet */\r
+                       unsigned char CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface */\r
+                       \r
+                       uint8_t Data1; /**< First byte of data in the MIDI event */\r
+                       uint8_t Data2; /**< Second byte of data in the MIDI event */\r
+                       uint8_t Data3; /**< Third byte of data in the MIDI event */             \r
+               } USB_MIDI_EventPacket_t;\r
+\r
+               /** Class state structure. An instance of this structure should be made for each MIDI interface\r
+                *  within the user application, and passed to each of the MIDI class driver functions as the\r
+                *  MIDIInterfaceInfo parameter. The contents of this structure should be set to their correct\r
+                *  values when used, or ommitted to force the library to use default values.\r
+                */\r
+               typedef struct\r
+               {\r
+                       uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this structure controls */\r
+\r
+                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the incomming MIDI data, if available (zero if unused) */\r
+                       uint16_t DataINEndpointSize; /**< Size in bytes of the incomming MIDI data endpoint, if available (zero if unused) */\r
+\r
+                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the outgoing MIDI data, if available (zero if unused) */\r
+                       uint16_t DataOUTEndpointSize; /**< Size in bytes of the outgoing MIDI data endpoint, if available (zero if unused) */\r
+               } USB_ClassInfo_MIDI_t;\r
+\r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorage.h
new file mode 100644 (file)
index 0000000..b4ba090
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h
@@ -0,0 +1,135 @@
+/*\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
+/** \ingroup Group_USBClassMS\r
+ *  @{\r
+ */\r
+\r
+#ifndef _MS_CLASS_COMMON_H_\r
+#define _MS_CLASS_COMMON_H_\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+\r
+               #include <string.h>\r
+\r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Macros: */\r
+               /** Mass Storage Class specific request to reset the Mass Storage interface, ready for the next command. */\r
+               #define REQ_MassStorageReset       0xFF\r
+\r
+               /** Mass Storage Class specific request to retrieve the total number of Logical Units (drives) in the SCSI device. */\r
+               #define REQ_GetMaxLUN              0xFE\r
+               \r
+               /** Magic signature for a Command Block Wrapper used in the Mass Storage Bulk-Only transport protocol. */\r
+               #define MS_CBW_SIGNATURE           0x43425355UL\r
+\r
+               /** Magic signature for a Command Status Wrapper used in the Mass Storage Bulk-Only transport protocol. */\r
+               #define MS_CSW_SIGNATURE           0x53425355UL\r
+               \r
+               /** Mask for a Command Block Wrapper's flags attribute to specify a command with data sent from host-to-device. */\r
+               #define MS_COMMAND_DIR_DATA_OUT    (0 << 7)\r
+\r
+               /** Mask for a Command Block Wrapper's flags attribute to specify a command with data sent from device-to-host. */\r
+               #define MS_COMMAND_DIR_DATA_IN     (1 << 7)\r
+\r
+       /* Type defines: */\r
+               /** Type define for a Command Block Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r
+               typedef struct\r
+               {\r
+                       uint32_t Signature; /**< Command block signature, must be CBW_SIGNATURE to indicate a valid Command Block */\r
+                       uint32_t Tag; /**< Unique command ID value, to associate a command block wrapper with its command status wrapper */\r
+                       uint32_t DataTransferLength; /** Length of the optional data portion of the issued command, in bytes */\r
+                       uint8_t  Flags; /**< Command block flags, indicating command data direction */\r
+                       uint8_t  LUN; /**< Logical Unit number this command is issued to */\r
+                       uint8_t  SCSICommandLength; /**< Length of the issued SCSI command within the SCSI command data array */\r
+                       uint8_t  SCSICommandData[16]; /**< Issued SCSI command in the Command Block */\r
+               } CommandBlockWrapper_t;\r
+               \r
+               /** Type define for a Command Status Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r
+               typedef struct\r
+               {\r
+                       uint32_t Signature; /**< Status block signature, must be CSW_SIGNATURE to indicate a valid Command Status */\r
+                       uint32_t Tag; /**< Unique command ID value, to associate a command block wrapper with its command status wrapper */\r
+                       uint32_t DataTransferResidue; /**< Number of bytes of data not processed in the SCSI command */\r
+                       uint8_t  Status; /**< Status code of the issued command - a value from the MassStorage_CommandStatusCodes_t enum */\r
+               } CommandStatusWrapper_t;\r
+               \r
+       /* Enums: */\r
+               /** Enum for the possible command status wrapper return status codes. */\r
+               enum MassStorage_CommandStatusCodes_t\r
+               {\r
+                       SCSI_Command_Pass = 0, /**< Command completed with no error */\r
+                       SCSI_Command_Fail = 1, /**< Command failed to complete - host may check the exact error via a SCSI REQUEST SENSE command */\r
+                       SCSI_Phase_Error  = 2  /**< Command failed due to being invalid in the current phase */\r
+               };\r
+               \r
+       /* Type Defines: */\r
+               /** Class state structure. An instance of this structure should be made for each Mass Storage interface\r
+                *  within the user application, and passed to each of the Mass Storage class driver functions as the\r
+                *  MSInterfaceInfo parameter. The contents of this structure should be set to their correct\r
+                *  values when used, or ommitted to force the library to use default values.\r
+                */\r
+               typedef struct\r
+               {\r
+                       uint8_t  InterfaceNumber; /**< Interface number of the Mass Storage interface within the device */\r
+\r
+                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the Mass Storage interface's IN data endpoint */\r
+                       uint16_t DataINEndpointSize; /**< Size in bytes of the Mass Storage interface's IN data endpoint */\r
+\r
+                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the Mass Storage interface's OUT data endpoint */\r
+                       uint16_t DataOUTEndpointSize;  /**< Size in bytes of the Mass Storage interface's OUT data endpoint */\r
+\r
+                       uint8_t  TotalLUNs; /**< Total number of logical drives in the Mass Storage interface */\r
+\r
+                       CommandBlockWrapper_t  CommandBlock; /**< Mass Storage class command block structure, used internally\r
+                                                             *   by the class driver\r
+                                                             */\r
+                       CommandStatusWrapper_t CommandStatus; /**< Mass Storage class command status structure, used internally\r
+                                                             *   by the class driver\r
+                                                             */\r
+\r
+                       bool IsMassStoreReset; /**< Flag indicating that the host has requested that the Mass Storage interface be reset\r
+                                               *   and that all current Mass Storage operations should immediately abort\r
+                                                                       */\r
+               } USB_ClassInfo_MS_t;\r
+       \r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDIS.h
new file mode 100644 (file)
index 0000000..abc1733
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Common/RNDIS.h
@@ -0,0 +1,274 @@
+/*\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
+/** \ingroup Group_USBClassRNDIS\r
+ *  @{\r
+ */\r
+\r
+#ifndef _RNDIS_CLASS_COMMON_H_\r
+#define _RNDIS_CLASS_COMMON_H_\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               \r
+               #include <string.h>\r
+       \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Macros: */\r
+               /** Implemented RNDIS Version Major */\r
+               #define REMOTE_NDIS_VERSION_MAJOR             0x01\r
+\r
+               /** Implemented RNDIS Version Minor */\r
+               #define REMOTE_NDIS_VERSION_MINOR             0x00\r
+       \r
+               /** RNDIS request to issue a host-to-device NDIS command */\r
+               #define REQ_SendEncapsulatedCommand           0x00\r
+\r
+               /** RNDIS request to issue a device-to-host NDIS response */\r
+               #define REQ_GetEncapsulatedResponse           0x01\r
+               \r
+               /** Maximum size in bytes of a RNDIS control message which can be sent or received */\r
+               #define RNDIS_MESSAGE_BUFFER_SIZE             128\r
+\r
+               /** Maximum size in bytes of an Ethernet frame which can be sent or received */\r
+               #define ETHERNET_FRAME_SIZE_MAX               1500\r
+               \r
+               /** Notification request value for a RNDIS Response Available notification */\r
+               #define NOTIF_ResponseAvailable               1\r
+               \r
+       /* Enums: */\r
+               /** Enum for the possible NDIS adapter states. */\r
+               enum RNDIS_States_t\r
+               {\r
+                       RNDIS_Uninitialized    = 0, /**< Adapter currently uninitialized */\r
+                       RNDIS_Initialized      = 1, /**< Adapter currently initialized but not ready for data transfers */\r
+                       RNDIS_Data_Initialized = 2, /**< Adapter currently initialized and ready for data transfers */\r
+               };\r
+\r
+               /** Enum for the NDIS hardware states */\r
+               enum NDIS_Hardware_Status_t\r
+               {\r
+                       NDIS_HardwareStatus_Ready, /**< Hardware Ready to accept commands from the host */\r
+                       NDIS_HardwareStatus_Initializing, /**< Hardware busy initializing */\r
+                       NDIS_HardwareStatus_Reset, /**< Hardware reset */\r
+                       NDIS_HardwareStatus_Closing, /**< Hardware currently closing */\r
+                       NDIS_HardwareStatus_NotReady /**< Hardware not ready to accept commands from the host */\r
+               };\r
+               \r
+       /* Type Defines: */\r
+               /** Type define for a physical MAC address of a device on a network */\r
+               typedef struct\r
+               {\r
+                       uint8_t       Octets[6]; /**< Individual bytes of a MAC address */\r
+               } MAC_Address_t;\r
+\r
+               /** Type define for a RNDIS message header, sent before RNDIS messages */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType; /**< RNDIS message type, a REMOTE_NDIS_*_MSG constant */\r
+                       uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */\r
+               } RNDIS_Message_Header_t;\r
+\r
+               /** Type define for an Ethernet frame buffer. */\r
+               typedef struct\r
+               {\r
+                       uint8_t       FrameData[ETHERNET_FRAME_SIZE_MAX]; /**< Ethernet frame contents */\r
+                       uint16_t      FrameLength; /**< Length in bytes of the Ethernet frame stored in the buffer */\r
+                       bool          FrameInBuffer; /**< Indicates if a frame is currently stored in the buffer */\r
+               } Ethernet_Frame_Info_t;\r
+\r
+               /** Type define for a RNDIS packet message, used to encapsulate Ethernet packets sent to and from the adapter */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t DataOffset;\r
+                       uint32_t DataLength;\r
+                       uint32_t OOBDataOffset;\r
+                       uint32_t OOBDataLength;\r
+                       uint32_t NumOOBDataElements;\r
+                       uint32_t PerPacketInfoOffset;\r
+                       uint32_t PerPacketInfoLength;\r
+                       uint32_t VcHandle;\r
+                       uint32_t Reserved;\r
+               } RNDIS_PACKET_MSG_t;\r
+\r
+               /** Type define for a RNDIS Initialize command message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t RequestId;\r
+                       \r
+                       uint32_t MajorVersion;\r
+                       uint32_t MinorVersion;\r
+                       uint32_t MaxTransferSize;\r
+               } RNDIS_INITIALIZE_MSG_t;\r
+               \r
+               /** Type define for a RNDIS Initialize complete response message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t RequestId;\r
+                       uint32_t Status;\r
+                       \r
+                       uint32_t MajorVersion;\r
+                       uint32_t MinorVersion;\r
+                       uint32_t DeviceFlags;\r
+                       uint32_t Medium;\r
+                       uint32_t MaxPacketsPerTransfer;\r
+                       uint32_t MaxTransferSize;\r
+                       uint32_t PacketAlignmentFactor;\r
+                       uint32_t AFListOffset;\r
+                       uint32_t AFListSize;\r
+               } RNDIS_INITIALIZE_CMPLT_t;\r
+               \r
+               /** Type define for a RNDIS Keepalive command message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t RequestId;\r
+               } RNDIS_KEEPALIVE_MSG_t;\r
+\r
+               /** Type define for a RNDIS Keepalive complete message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t RequestId;\r
+                       uint32_t Status;\r
+               } RNDIS_KEEPALIVE_CMPLT_t;\r
+\r
+               /** Type define for a RNDIS Reset complete message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t Status;\r
+\r
+                       uint32_t AddressingReset;\r
+               } RNDIS_RESET_CMPLT_t;\r
+               \r
+               /** Type define for a RNDIS Set command message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t RequestId;\r
+                       \r
+                       uint32_t Oid;\r
+                       uint32_t InformationBufferLength;\r
+                       uint32_t InformationBufferOffset;\r
+                       uint32_t DeviceVcHandle;\r
+               } RNDIS_SET_MSG_t;\r
+\r
+               /** Type define for a RNDIS Set complete response message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t RequestId;\r
+                       uint32_t Status;\r
+               } RNDIS_SET_CMPLT_t;\r
+               \r
+               /** Type define for a RNDIS Query command message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t RequestId;\r
+                       \r
+                       uint32_t Oid;\r
+                       uint32_t InformationBufferLength;\r
+                       uint32_t InformationBufferOffset;\r
+                       uint32_t DeviceVcHandle;\r
+               } RNDIS_QUERY_MSG_t;\r
+               \r
+               /** Type define for a RNDIS Query complete response message */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType;\r
+                       uint32_t MessageLength;\r
+                       uint32_t RequestId;\r
+                       uint32_t Status;\r
+                       \r
+                       uint32_t InformationBufferLength;\r
+                       uint32_t InformationBufferOffset;\r
+               } RNDIS_QUERY_CMPLT_t;\r
+\r
+               /** Class state structure. An instance of this structure should be made for each RNDIS interface\r
+                *  within the user application, and passed to each of the RNDIS class driver functions as the\r
+                *  RNDISInterfaceInfo parameter. The contents of this structure should be set to their correct\r
+                *  values when used, or ommitted to force the library to use default values.\r
+                */\r
+               typedef struct\r
+               {\r
+                       uint8_t  ControlInterfaceNumber; /**< Interface number of the CDC control interface within the device */\r
+\r
+                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the CDC interface's IN data endpoint */\r
+                       uint16_t DataINEndpointSize; /**< Size in bytes of the CDC interface's IN data endpoint */\r
+\r
+                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the CDC interface's OUT data endpoint */\r
+                       uint16_t DataOUTEndpointSize;  /**< Size in bytes of the CDC interface's OUT data endpoint */\r
+\r
+                       uint8_t  NotificationEndpointNumber; /**< Endpoint number of the CDC interface's IN notification endpoint, if used */\r
+                       uint16_t NotificationEndpointSize;  /**< Size in bytes of the CDC interface's IN notification endpoint, if used */\r
+                       \r
+                       char*         AdapterVendorDescription; /**< String description of the adapter vendor */\r
+                       MAC_Address_t AdapterMACAddress; /**< MAC address of the adapter */\r
+\r
+                       uint8_t  RNDISMessageBuffer[RNDIS_MESSAGE_BUFFER_SIZE]; /**< Buffer to hold RNDIS messages to and from the host,\r
+                                                                                *   managed by the class driver\r
+                                                                                */\r
+                       bool     ResponseReady; /**< Internal flag indicating if a RNDIS message is waiting to be returned to the host */\r
+                       uint8_t  CurrRNDISState; /**< Current RNDIS state of the adapter, a value from the RNDIS_States_t enum */\r
+                       uint32_t CurrPacketFilter; /**< Current packet filter mode, used internally by the class driver */\r
+                       Ethernet_Frame_Info_t FrameIN; /**< Structure holding the last received Ethernet frame from the host, for user\r
+                                                       *   processing\r
+                                                       */\r
+                       Ethernet_Frame_Info_t FrameOUT; /**< Structure holding the next Ethernet frame to send to the host, populated by the\r
+                                                        *   user application\r
+                                                        */\r
+               } USB_ClassInfo_RNDIS_t;\r
+                               \r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index f53d73e..108bf94 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -28,6 +28,9 @@
   this software.\r
 */\r
 \r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
 #include "Audio.h"\r
 \r
 void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_t* AudioInterfaceInfo)\r
@@ -157,3 +160,5 @@ bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_t* AudioInterfaceInfo
        Endpoint_SelectEndpoint(AudioInterfaceInfo->DataINEndpointNumber);\r
        return Endpoint_IsINReady();\r
 }\r
+\r
+#endif
\ No newline at end of file

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h
index 185fa90..efffcda 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -28,26 +28,22 @@
   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
+/** \ingroup Group_USBClassAudio\r
+ *  @defgroup Group_USBClassAudioDevice Audio Class Device Mode Driver\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
+ *  Device Mode USB Class driver framework interface, for the Audio USB Class driver.\r
  *\r
  *  @{\r
  */\r
 \r
-#ifndef _AUDIO_CLASS_H_\r
-#define _AUDIO_CLASS_H_\r
+#ifndef _AUDIO_CLASS_DEVICE_H_\r
+#define _AUDIO_CLASS_DEVICE_H_\r
 \r
        /* Includes: */\r
                #include "../../USB.h"\r
-\r
+               #include "../Common/Audio.h"\r
+               \r
                #include <string.h>\r
 \r
        /* Enable C linkage for C++ Compilers: */\r
@@ -55,332 +51,6 @@
                        extern "C" {\r
                #endif\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
-               /** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\r
-               /** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-
-               /** 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
-\r
-               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \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
-\r
-               /** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */               \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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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
-\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 AUDIO_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 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
-               /** Class state structure. An instance of this structure should be made for each Audio interface\r
-                *  within the user application, and passed to each of the Audio class driver functions as the\r
-                *  AudioInterfaceInfo parameter. The contents of this structure should be set to their correct\r
-                *  values when used, or ommitted to force the library to use default values.\r
-                */\r
-               typedef struct\r
-               {\r
-                       uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this structure controls */\r
-\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
-                       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
-                       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
                /** 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

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index 0dc830b..2cc0f94 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -28,7 +28,10 @@
   this software.\r
 */\r
 \r
-#define  INCLUDE_FROM_CDC_CLASS_C\r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
+#define  INCLUDE_FROM_CDC_CLASS_DEVICE_C\r
 #include "CDC.h"\r
 \r
 void CDC_Device_Event_Stub(void)\r
@@ -195,3 +198,5 @@ void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo
        Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask), NO_STREAM_CALLBACK);\r
        Endpoint_ClearIN();\r
 }\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDC.h
index c0d1ccd..6938eb3 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.h
+++ b/LUFA/Drivers/USB/Class/Device/CDC.h
@@ -28,25 +28,21 @@
   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
+/** \ingroup Group_USBClassCDC\r
+ *  @defgroup Group_USBClassCDCDevice CDC Class Device Mode Driver\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
+ *  Device Mode USB Class driver framework interface, for the CDC USB Class driver.\r
  *\r
  *  @{\r
  */\r
  \r
-#ifndef _CDC_CLASS_H_\r
-#define _CDC_CLASS_H_\r
+#ifndef _CDC_CLASS_DEVICE_H_\r
+#define _CDC_CLASS_DEVICE_H_\r
 \r
        /* Includes: */\r
                #include "../../USB.h"\r
+               #include "../Common/CDC.h"\r
 \r
                #include <string.h>\r
 \r
@@ -55,137 +51,8 @@
                        extern "C" {\r
                #endif\r
 \r
-       /* Macros: */\r
-               /** CDC Class specific request to get the current virtual serial port configuration settings. */\r
-               #define REQ_GetLineEncoding              0x21\r
-\r
-               /** CDC Class specific request to set the current virtual serial port configuration settings. */\r
-               #define REQ_SetLineEncoding              0x20\r
-\r
-               /** CDC Class specific request to set the current virtual serial port handshake line states. */\r
-               #define REQ_SetControlLineState          0x22\r
-               \r
-               /** Notification type constant for a change in the virtual serial port handshake line states, for\r
-                *  use with a USB_Notification_Header_t notification structure when sent to the host via the CDC \r
-                *  notification endpoint.\r
-                */\r
-               #define NOTIF_SerialState                0x20\r
-\r
-               /** Mask for the DTR handshake line for use with the REQ_SetControlLineState class specific request\r
-                *  from the host, to indicate that the DTR line state should be high.\r
-                */\r
-               #define CDC_CONTROL_LINE_OUT_DTR         (1 << 0)\r
-\r
-               /** Mask for the RTS handshake line for use with the REQ_SetControlLineState class specific request\r
-                *  from the host, to indicate that theRTS line state should be high.\r
-                */\r
-               #define CDC_CONTROL_LINE_OUT_RTS         (1 << 1)\r
-               \r
-               /** Mask for the DCD handshake line for use with the a NOTIF_SerialState class specific notification\r
-                *  from the device to the host, to indicate that the DCD line state is currently high.\r
-                */\r
-               #define CDC_CONTROL_LINE_IN_DCD          (1 << 0)\r
-\r
-               /** Mask for the DSR handshake line for use with the a NOTIF_SerialState class specific notification\r
-                *  from the device to the host, to indicate that the DSR line state is currently high.\r
-                */\r
-               #define CDC_CONTROL_LINE_IN_DSR          (1 << 1)\r
-\r
-               /** Mask for the BREAK handshake line for use with the a NOTIF_SerialState class specific notification\r
-                *  from the device to the host, to indicate that the BREAK line state is currently high.\r
-                */\r
-               #define CDC_CONTROL_LINE_IN_BREAK        (1 << 2)\r
-\r
-               /** Mask for the RING handshake line for use with the a NOTIF_SerialState class specific notification\r
-                *  from the device to the host, to indicate that the RING line state is currently high.\r
-                */\r
-               #define CDC_CONTROL_LINE_IN_RING         (1 << 3)\r
-\r
-               /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
-                *  to indicate that a framing error has occurred on the virtual serial port.\r
-                */\r
-               #define CDC_CONTROL_LINE_IN_FRAMEERROR   (1 << 4)\r
-\r
-               /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
-                *  to indicate that a parity error has occurred on the virtual serial port.\r
-                */\r
-               #define CDC_CONTROL_LINE_IN_PARITYERROR  (1 << 5)\r
-\r
-               /** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,\r
-                *  to indicate that a data overrun error has occurred on the virtual serial port.\r
-                */\r
-               #define CDC_CONTROL_LINE_IN_OVERRUNERROR (1 << 6)\r
-               \r
-               /** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a\r
-                *  uniform structure but variable sized data payloads, thus cannot be represented accurately by\r
-                *  a single typedef struct. A macro is used instead so that functional descriptors can be created\r
-                *  easily by specifying the size of the payload. This allows sizeof() to work correctly.\r
-                *\r
-                *  \param DataSize  Size in bytes of the CDC functional descriptor's data payload\r
-                */\r
-               #define CDC_FUNCTIONAL_DESCRIPTOR(DataSize)        \\r
-                    struct                                        \\r
-                    {                                             \\r
-                         USB_Descriptor_Header_t Header;          \\r
-                             uint8_t                 SubType;         \\r
-                         uint8_t                 Data[DataSize];  \\r
-                    }\r
-\r
-       /* Enums: */\r
-               /** Enum for the possible line encoding formats of a virtual serial port. */\r
-               enum CDCDevice_CDC_LineCodingFormats_t\r
-               {\r
-                       CDC_LINEENCODING_OneStopBit          = 0, /**< Each frame contains one stop bit */\r
-                       CDC_LINEENCODING_OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits */\r
-                       CDC_LINEENCODING_TwoStopBits         = 2, /**< Each frame contains two stop bits */\r
-               };\r
-               \r
-               /** Enum for the possible line encoding parity settings of a virtual serial port. */\r
-               enum CDCDevice_LineCodingParity_t\r
-               {\r
-                       CDC_PARITY_None    = 0, /**< No parity bit mode on each frame */\r
-                       CDC_PARITY_Odd     = 1, /**< Odd parity bit mode on each frame */\r
-                       CDC_PARITY_Even    = 2, /**< Even parity bit mode on each frame */\r
-                       CDC_PARITY_Mark    = 3, /**< Mark parity bit mode on each frame */\r
-                       CDC_PARITY_Space   = 4, /**< Space parity bit mode on each frame */\r
-               };\r
-\r
-       /* Type Defines: */\r
-               /** Class state structure. An instance of this structure should be made for each CDC interface\r
-                *  within the user application, and passed to each of the CDC class driver functions as the\r
-                *  CDCInterfaceInfo parameter. The contents of this structure should be set to their correct\r
-                *  values when used, or ommitted to force the library to use default values.\r
-                */\r
-               typedef struct\r
-               {\r
-                       uint8_t  ControlInterfaceNumber; /**< Interface number of the CDC control interface within the device */\r
-\r
-                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the CDC interface's IN data endpoint */\r
-                       uint16_t DataINEndpointSize; /**< Size in bytes of the CDC interface's IN data endpoint */\r
-\r
-                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the CDC interface's OUT data endpoint */\r
-                       uint16_t DataOUTEndpointSize;  /**< Size in bytes of the CDC interface's OUT data endpoint */\r
-\r
-                       uint8_t  NotificationEndpointNumber; /**< Endpoint number of the CDC interface's IN notification endpoint, if used */\r
-                       uint16_t NotificationEndpointSize;  /**< Size in bytes of the CDC interface's IN notification endpoint, if used */\r
-\r
-                       uint8_t  ControlLineState; /**< Current control line states, as set by the host */\r
-\r
-                       struct\r
-                       {\r
-                               uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second */\r
-                               uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the\r
-                                                                         *   CDCDevice_CDC_LineCodingFormats_t enum\r
-                                                                         */\r
-                               uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the\r
-                                                                         *   CDCDevice_LineCodingParity_t enum\r
-                                                                         */\r
-                               uint8_t  DataBits; /**< Bits of data per character of the virtual serial port */\r
-                       } LineEncoding;\r
-               } USB_ClassInfo_CDC_t;\r
-               \r
        /* Function Prototypes: */\r
-               #if defined(INCLUDE_FROM_CDC_CLASS_C)\r
+               #if defined(INCLUDE_FROM_CDC_CLASS_DEVICE_C)\r
                        void CDC_Device_Event_Stub(void);\r
                        void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
                                                                                                      ATTR_WEAK ATTR_ALIAS(CDC_Device_Event_Stub);\r

diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c
index 4aca50b..54bef47 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -28,6 +28,9 @@
   this software.\r
 */\r
 \r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
 #include "HID.h"\r
 \r
 void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
@@ -172,3 +175,5 @@ void HID_Device_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                Endpoint_ClearIN();\r
        }\r
 }\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HID.h
index 1269a52..a4317d7 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.h
+++ b/LUFA/Drivers/USB/Class/Device/HID.h
@@ -28,25 +28,21 @@
   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
+/** \ingroup Group_USBClassHID\r
+ *  @defgroup Group_USBClassHIDDevice HID Class Device Mode Driver\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
+ *  Device Mode USB Class driver framework interface, for the HID USB Class driver.\r
  *\r
  *  @{\r
  */\r
  \r
-#ifndef _HID_CLASS_H_\r
-#define _HID_CLASS_H_\r
+#ifndef _HID_CLASS_DEVICE_H_\r
+#define _HID_CLASS_DEVICE_H_\r
 \r
        /* Includes: */\r
                #include "../../USB.h"\r
+               #include "../Common/HID.h"\r
 \r
                #include <string.h>\r
 \r
@@ -55,73 +51,6 @@
                        extern "C" {\r
                #endif\r
 \r
-       /* Macros: */\r
-               /** HID Class Specific Request to get the current HID report from the device. */\r
-               #define REQ_GetReport      0x01\r
-\r
-               /** HID Class Specific Request to get the current device idle count. */\r
-               #define REQ_GetIdle        0x02\r
-\r
-               /** HID Class Specific Request to set the current HID report to the device. */\r
-               #define REQ_SetReport      0x09\r
-\r
-               /** HID Class Specific Request to set the device's idle count. */\r
-               #define REQ_SetIdle        0x0A\r
-\r
-               /** HID Class Specific Request to get the current HID report protocol mode. */\r
-               #define REQ_GetProtocol    0x03\r
-\r
-               /** HID Class Specific Request to set the current HID report protocol mode. */\r
-               #define REQ_SetProtocol    0x0B\r
-\r
-               /** Descriptor header type value, to indicate a HID class HID descriptor. */\r
-               #define DTYPE_HID          0x21\r
-               \r
-               /** Descriptor header type value, to indicate a HID class HID report descriptor. */\r
-               #define DTYPE_Report       0x22\r
-\r
-       /* Type Defines: */\r
-               /** Type define for the HID class specific HID descriptor, to describe the HID device's specifications. Refer to the HID\r
-                *  specification for details on the structure elements.\r
-                */\r
-               typedef struct\r
-               {\r
-                       USB_Descriptor_Header_t               Header;\r
-                               \r
-                       uint16_t                              HIDSpec;\r
-                       uint8_t                               CountryCode;\r
-               \r
-                       uint8_t                               TotalReportDescriptors;\r
-\r
-                       uint8_t                               HIDReportType;\r
-                       uint16_t                              HIDReportLength;\r
-               } USB_Descriptor_HID_t;\r
-\r
-               /** Type define for the data type used to store HID report descriptor elements. */\r
-               typedef uint8_t USB_Descriptor_HIDReport_Datatype_t;\r
-\r
-               /** Class state structure. An instance of this structure should be made for each HID interface\r
-                *  within the user application, and passed to each of the HID class driver functions as the\r
-                *  HIDInterfaceInfo parameter. The contents of this structure should be set to their correct\r
-                *  values when used, or ommitted to force the library to use default values.\r
-                *\r
-                *  Note that for the HID class driver, host-to-device reports are received via HID class requests\r
-                *  rather than a dedicated endpoint to simplify the driver and its interface.\r
-                */\r
-               typedef struct\r
-               {\r
-                       uint8_t  InterfaceNumber; /**< Interface number of the HID interface within the device */\r
-\r
-                       uint8_t  ReportINEndpointNumber; /**< Endpoint number of the HID interface's IN report endpoint */\r
-                       uint16_t ReportINEndpointSize; /**< Size in bytes of the HID interface's IN report endpoint */\r
-                       \r
-                       uint8_t  ReportINBufferSize; /**< Size of the largest possible report to send to the host, for buffer allocation purposes */\r
-\r
-                       bool     UsingReportProtocol; /**< Indicates if the HID interface is set to Boot or Report protocol mode */\r
-                       uint16_t IdleCount; /**< Report idle period, in ms, set by the host */\r
-                       uint16_t IdleMSRemaining; /**< Total number of ms remaining before the idle period elapses */\r
-               } USB_ClassInfo_HID_t;\r
-\r
        /* Function Prototypes: */\r
                /** Configures the endpoints of a given HID 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\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index 09be12e..a2ab0be 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -28,6 +28,9 @@
   this software.\r
 */\r
 \r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
 #include "MIDI.h"\r
 \r
 void MIDI_Device_ProcessControlPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo)\r
@@ -94,3 +97,5 @@ bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_t* MIDIInterfaceInfo, USB
        \r
        return true;\r
 }\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
index 71bca8a..0963aab 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -28,26 +28,21 @@
   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
+/** \ingroup Group_USBClassMIDI\r
+ *  @defgroup Group_USBClassMIDIDevice MIDI Class Device Mode Driver\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
+ *  Device Mode USB Class driver framework interface, for the MIDI USB Class driver.\r
  *\r
  *  @{\r
  */\r
 \r
-#ifndef _MIDI_CLASS_H_\r
-#define _MIDI_CLASS_H_\r
+#ifndef _MIDI_CLASS_DEVICE_H_\r
+#define _MIDI_CLASS_DEVICE_H_\r
 \r
        /* Includes: */\r
                #include "../../USB.h"\r
+               #include "../Common/MIDI.h"\r
                #include "Audio.h"\r
 \r
                #include <string.h>\r
@@ -57,121 +52,6 @@
                        extern "C" {\r
                #endif\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 MIDI_JACKTYPE_EMBEDDED      0x01\r
-\r
-               /** Audio class descriptor jack type value for an external (physical) MIDI input or output jack. */\r
-               #define MIDI_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 */\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
-               /** Type define for a USB MIDI event packet, used to encapsulate sent and received MIDI messages from a USB MIDI interface. */\r
-               typedef struct\r
-               {\r
-                       unsigned char Command     : 4; /**< MIDI command being sent or received in the event packet */\r
-                       unsigned char CableNumber : 4; /**< Virtual cable number of the event being sent or received in the given MIDI interface */\r
-                       \r
-                       uint8_t Data1; /**< First byte of data in the MIDI event */\r
-                       uint8_t Data2; /**< Second byte of data in the MIDI event */\r
-                       uint8_t Data3; /**< Third byte of data in the MIDI event */             \r
-               } USB_MIDI_EventPacket_t;\r
-\r
-               /** Class state structure. An instance of this structure should be made for each MIDI interface\r
-                *  within the user application, and passed to each of the MIDI class driver functions as the\r
-                *  MIDIInterfaceInfo parameter. The contents of this structure should be set to their correct\r
-                *  values when used, or ommitted to force the library to use default values.\r
-                */\r
-               typedef struct\r
-               {\r
-                       uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this structure controls */\r
-\r
-                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the incomming MIDI data, if available (zero if unused) */\r
-                       uint16_t DataINEndpointSize; /**< Size in bytes of the incomming MIDI data endpoint, if available (zero if unused) */\r
-\r
-                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the outgoing MIDI data, if available (zero if unused) */\r
-                       uint16_t DataOUTEndpointSize; /**< Size in bytes of the outgoing MIDI data endpoint, if available (zero if unused) */\r
-               } USB_ClassInfo_MIDI_t;\r
-               \r
        /* Function Prototypes: */\r
                /** Configures the endpoints of a given MIDI 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\r

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorage.c
index 116e016..1dc6d60 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.c
@@ -28,7 +28,10 @@
   this software.\r
 */\r
 \r
-#define  INCLUDE_FROM_MS_CLASS_C\r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
+#define  INCLUDE_FROM_MS_CLASS_DEVICE_C\r
 #include "MassStorage.h"\r
 \r
 static USB_ClassInfo_MS_t* CallbackMSInterfaceInfo;\r
@@ -206,3 +209,5 @@ static uint8_t StreamCallback_MS_Device_AbortOnMassStoreReset(void)
        else\r
          return STREAMCALLBACK_Continue;\r
 }\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.h b/LUFA/Drivers/USB/Class/Device/MassStorage.h
index e648161..0761b7a 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.h
@@ -28,25 +28,21 @@
   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
+/** \ingroup Group_USBClassMS\r
+ *  @defgroup Group_USBClassMSDevice Mass Storage Class Device Mode Driver\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
+ *  Device Mode USB Class driver framework interface, for the Mass Storage USB Class driver.\r
  *\r
  *  @{\r
  */\r
 \r
-#ifndef _MS_CLASS_H_\r
-#define _MS_CLASS_H_\r
+#ifndef _MS_CLASS_DEVICE_H_\r
+#define _MS_CLASS_DEVICE_H_\r
 \r
        /* Includes: */\r
                #include "../../USB.h"\r
+               #include "../Common/MassStorage.h"\r
 \r
                #include <string.h>\r
 \r
@@ -55,88 +51,8 @@
                        extern "C" {\r
                #endif\r
 \r
-       /* Macros: */\r
-               /** Mass Storage Class specific request to reset the Mass Storage interface, ready for the next command. */\r
-               #define REQ_MassStorageReset       0xFF\r
-\r
-               /** Mass Storage Class specific request to retrieve the total number of Logical Units (drives) in the SCSI device. */\r
-               #define REQ_GetMaxLUN              0xFE\r
-               \r
-               /** Magic signature for a Command Block Wrapper used in the Mass Storage Bulk-Only transport protocol. */\r
-               #define MS_CBW_SIGNATURE           0x43425355UL\r
-\r
-               /** Magic signature for a Command Status Wrapper used in the Mass Storage Bulk-Only transport protocol. */\r
-               #define MS_CSW_SIGNATURE           0x53425355UL\r
-               \r
-               /** Mask for a Command Block Wrapper's flags attribute to specify a command with data sent from host-to-device. */\r
-               #define MS_COMMAND_DIR_DATA_OUT    (0 << 7)\r
-\r
-               /** Mask for a Command Block Wrapper's flags attribute to specify a command with data sent from device-to-host. */\r
-               #define MS_COMMAND_DIR_DATA_IN     (1 << 7)\r
-\r
-       /* Type defines: */\r
-               /** Type define for a Command Block Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r
-               typedef struct\r
-               {\r
-                       uint32_t Signature; /**< Command block signature, must be CBW_SIGNATURE to indicate a valid Command Block */\r
-                       uint32_t Tag; /**< Unique command ID value, to associate a command block wrapper with its command status wrapper */\r
-                       uint32_t DataTransferLength; /** Length of the optional data portion of the issued command, in bytes */\r
-                       uint8_t  Flags; /**< Command block flags, indicating command data direction */\r
-                       uint8_t  LUN; /**< Logical Unit number this command is issued to */\r
-                       uint8_t  SCSICommandLength; /**< Length of the issued SCSI command within the SCSI command data array */\r
-                       uint8_t  SCSICommandData[16]; /**< Issued SCSI command in the Command Block */\r
-               } CommandBlockWrapper_t;\r
-               \r
-               /** Type define for a Command Status Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r
-               typedef struct\r
-               {\r
-                       uint32_t Signature; /**< Status block signature, must be CSW_SIGNATURE to indicate a valid Command Status */\r
-                       uint32_t Tag; /**< Unique command ID value, to associate a command block wrapper with its command status wrapper */\r
-                       uint32_t DataTransferResidue; /**< Number of bytes of data not processed in the SCSI command */\r
-                       uint8_t  Status; /**< Status code of the issued command - a value from the MassStorage_CommandStatusCodes_t enum */\r
-               } CommandStatusWrapper_t;\r
-               \r
-       /* Enums: */\r
-               /** Enum for the possible command status wrapper return status codes. */\r
-               enum MassStorage_CommandStatusCodes_t\r
-               {\r
-                       SCSI_Command_Pass = 0, /**< Command completed with no error */\r
-                       SCSI_Command_Fail = 1, /**< Command failed to complete - host may check the exact error via a SCSI REQUEST SENSE command */\r
-                       SCSI_Phase_Error  = 2  /**< Command failed due to being invalid in the current phase */\r
-               };\r
-               \r
-       /* Type Defines: */\r
-               /** Class state structure. An instance of this structure should be made for each Mass Storage interface\r
-                *  within the user application, and passed to each of the Mass Storage class driver functions as the\r
-                *  MSInterfaceInfo parameter. The contents of this structure should be set to their correct\r
-                *  values when used, or ommitted to force the library to use default values.\r
-                */\r
-               typedef struct\r
-               {\r
-                       uint8_t  InterfaceNumber; /**< Interface number of the Mass Storage interface within the device */\r
-\r
-                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the Mass Storage interface's IN data endpoint */\r
-                       uint16_t DataINEndpointSize; /**< Size in bytes of the Mass Storage interface's IN data endpoint */\r
-\r
-                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the Mass Storage interface's OUT data endpoint */\r
-                       uint16_t DataOUTEndpointSize;  /**< Size in bytes of the Mass Storage interface's OUT data endpoint */\r
-\r
-                       uint8_t  TotalLUNs; /**< Total number of logical drives in the Mass Storage interface */\r
-\r
-                       CommandBlockWrapper_t  CommandBlock; /**< Mass Storage class command block structure, used internally\r
-                                                             *   by the class driver\r
-                                                             */\r
-                       CommandStatusWrapper_t CommandStatus; /**< Mass Storage class command status structure, used internally\r
-                                                             *   by the class driver\r
-                                                             */\r
-\r
-                       bool IsMassStoreReset; /**< Flag indicating that the host has requested that the Mass Storage interface be reset\r
-                                               *   and that all current Mass Storage operations should immediately abort\r
-                                                                       */\r
-               } USB_ClassInfo_MS_t;\r
-               \r
        /* Function Prototypes: */\r
-               #if defined(INCLUDE_FROM_MS_CLASS_C)\r
+               #if defined(INCLUDE_FROM_MS_CLASS_DEVICE_C)\r
                        static void    MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_t* MSInterfaceInfo);\r
                        static bool    MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_t* MSInterfaceInfo);\r
                        static uint8_t StreamCallback_MS_Device_AbortOnMassStoreReset(void);\r

diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.c b/LUFA/Drivers/USB/Class/Device/RNDIS.c
index 3409ebf..08efcde 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Device/RNDIS.c
@@ -28,7 +28,10 @@
   this software.\r
 */\r
 \r
-#define  INCLUDE_FROM_RNDIS_CLASS_C\r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
+#define  INCLUDE_FROM_RNDIS_CLASS_DEVICE_C\r
 #include "RNDIS.h"\r
 \r
 static const uint32_t PROGMEM AdapterSupportedOIDList[]  =\r
@@ -454,3 +457,5 @@ static bool RNDIS_Device_ProcessNDISSet(USB_ClassInfo_RNDIS_t* RNDISInterfaceInf
                        return false;\r
        }\r
 }\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.h b/LUFA/Drivers/USB/Class/Device/RNDIS.h
index d0d66f8..896266e 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Device/RNDIS.h
@@ -28,255 +28,32 @@
   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/RNDIS.c\r
+/** \ingroup Group_USBClassRNDIS\r
+ *  @defgroup Group_USBClassRNDISDevice RNDIS Class Device Mode Driver\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
+ *  Device Mode USB Class driver framework interface, for the RNDIS USB Class driver.\r
  *\r
  *  @{\r
  */\r
 \r
-#ifndef _RNDIS_CLASS_H_\r
-#define _RNDIS_CLASS_H_\r
+#ifndef _RNDIS_CLASS_DEVICE_H_\r
+#define _RNDIS_CLASS_DEVICE_H_\r
 \r
        /* Includes: */\r
-               #include <string.h>\r
-       \r
                #include "../../USB.h"\r
+               #include "../Common/RNDIS.h"\r
                #include "RNDISConstants.h"\r
                \r
+               #include <string.h>\r
+       \r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                        extern "C" {\r
                #endif\r
 \r
-       /* Macros: */\r
-               /** Implemented RNDIS Version Major */\r
-               #define REMOTE_NDIS_VERSION_MAJOR             0x01\r
-\r
-               /** Implemented RNDIS Version Minor */\r
-               #define REMOTE_NDIS_VERSION_MINOR             0x00\r
-       \r
-               /** RNDIS request to issue a host-to-device NDIS command */\r
-               #define REQ_SendEncapsulatedCommand           0x00\r
-\r
-               /** RNDIS request to issue a device-to-host NDIS response */\r
-               #define REQ_GetEncapsulatedResponse           0x01\r
-               \r
-               /** Maximum size in bytes of a RNDIS control message which can be sent or received */\r
-               #define RNDIS_MESSAGE_BUFFER_SIZE             128\r
-\r
-               /** Maximum size in bytes of an Ethernet frame which can be sent or received */\r
-               #define ETHERNET_FRAME_SIZE_MAX               1500\r
-               \r
-               /** Notification request value for a RNDIS Response Available notification */\r
-               #define NOTIF_ResponseAvailable               1\r
-               \r
-       /* Enums: */\r
-               /** Enum for the possible NDIS adapter states. */\r
-               enum RNDIS_States_t\r
-               {\r
-                       RNDIS_Uninitialized    = 0, /**< Adapter currently uninitialized */\r
-                       RNDIS_Initialized      = 1, /**< Adapter currently initialized but not ready for data transfers */\r
-                       RNDIS_Data_Initialized = 2, /**< Adapter currently initialized and ready for data transfers */\r
-               };\r
-\r
-               /** Enum for the NDIS hardware states */\r
-               enum NDIS_Hardware_Status_t\r
-               {\r
-                       NDIS_HardwareStatus_Ready, /**< Hardware Ready to accept commands from the host */\r
-                       NDIS_HardwareStatus_Initializing, /**< Hardware busy initializing */\r
-                       NDIS_HardwareStatus_Reset, /**< Hardware reset */\r
-                       NDIS_HardwareStatus_Closing, /**< Hardware currently closing */\r
-                       NDIS_HardwareStatus_NotReady /**< Hardware not ready to accept commands from the host */\r
-               };\r
-               \r
-       /* Type Defines: */\r
-               /** Type define for a physical MAC address of a device on a network */\r
-               typedef struct\r
-               {\r
-                       uint8_t       Octets[6]; /**< Individual bytes of a MAC address */\r
-               } MAC_Address_t;\r
-\r
-               /** Type define for a RNDIS message header, sent before RNDIS messages */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType; /**< RNDIS message type, a REMOTE_NDIS_*_MSG constant */\r
-                       uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */\r
-               } RNDIS_Message_Header_t;\r
-\r
-               /** Type define for an Ethernet frame buffer. */\r
-               typedef struct\r
-               {\r
-                       uint8_t       FrameData[ETHERNET_FRAME_SIZE_MAX]; /**< Ethernet frame contents */\r
-                       uint16_t      FrameLength; /**< Length in bytes of the Ethernet frame stored in the buffer */\r
-                       bool          FrameInBuffer; /**< Indicates if a frame is currently stored in the buffer */\r
-               } Ethernet_Frame_Info_t;\r
-\r
-               /** Type define for a RNDIS packet message, used to encapsulate Ethernet packets sent to and from the adapter */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t DataOffset;\r
-                       uint32_t DataLength;\r
-                       uint32_t OOBDataOffset;\r
-                       uint32_t OOBDataLength;\r
-                       uint32_t NumOOBDataElements;\r
-                       uint32_t PerPacketInfoOffset;\r
-                       uint32_t PerPacketInfoLength;\r
-                       uint32_t VcHandle;\r
-                       uint32_t Reserved;\r
-               } RNDIS_PACKET_MSG_t;\r
-\r
-               /** Type define for a RNDIS Initialize command message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t RequestId;\r
-                       \r
-                       uint32_t MajorVersion;\r
-                       uint32_t MinorVersion;\r
-                       uint32_t MaxTransferSize;\r
-               } RNDIS_INITIALIZE_MSG_t;\r
-               \r
-               /** Type define for a RNDIS Initialize complete response message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t RequestId;\r
-                       uint32_t Status;\r
-                       \r
-                       uint32_t MajorVersion;\r
-                       uint32_t MinorVersion;\r
-                       uint32_t DeviceFlags;\r
-                       uint32_t Medium;\r
-                       uint32_t MaxPacketsPerTransfer;\r
-                       uint32_t MaxTransferSize;\r
-                       uint32_t PacketAlignmentFactor;\r
-                       uint32_t AFListOffset;\r
-                       uint32_t AFListSize;\r
-               } RNDIS_INITIALIZE_CMPLT_t;\r
-               \r
-               /** Type define for a RNDIS Keepalive command message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t RequestId;\r
-               } RNDIS_KEEPALIVE_MSG_t;\r
-\r
-               /** Type define for a RNDIS Keepalive complete message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t RequestId;\r
-                       uint32_t Status;\r
-               } RNDIS_KEEPALIVE_CMPLT_t;\r
-\r
-               /** Type define for a RNDIS Reset complete message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t Status;\r
-\r
-                       uint32_t AddressingReset;\r
-               } RNDIS_RESET_CMPLT_t;\r
-               \r
-               /** Type define for a RNDIS Set command message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t RequestId;\r
-                       \r
-                       uint32_t Oid;\r
-                       uint32_t InformationBufferLength;\r
-                       uint32_t InformationBufferOffset;\r
-                       uint32_t DeviceVcHandle;\r
-               } RNDIS_SET_MSG_t;\r
-\r
-               /** Type define for a RNDIS Set complete response message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t RequestId;\r
-                       uint32_t Status;\r
-               } RNDIS_SET_CMPLT_t;\r
-               \r
-               /** Type define for a RNDIS Query command message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t RequestId;\r
-                       \r
-                       uint32_t Oid;\r
-                       uint32_t InformationBufferLength;\r
-                       uint32_t InformationBufferOffset;\r
-                       uint32_t DeviceVcHandle;\r
-               } RNDIS_QUERY_MSG_t;\r
-               \r
-               /** Type define for a RNDIS Query complete response message */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType;\r
-                       uint32_t MessageLength;\r
-                       uint32_t RequestId;\r
-                       uint32_t Status;\r
-                       \r
-                       uint32_t InformationBufferLength;\r
-                       uint32_t InformationBufferOffset;\r
-               } RNDIS_QUERY_CMPLT_t;\r
-\r
-               /** Class state structure. An instance of this structure should be made for each RNDIS interface\r
-                *  within the user application, and passed to each of the RNDIS class driver functions as the\r
-                *  RNDISInterfaceInfo parameter. The contents of this structure should be set to their correct\r
-                *  values when used, or ommitted to force the library to use default values.\r
-                */\r
-               typedef struct\r
-               {\r
-                       uint8_t  ControlInterfaceNumber; /**< Interface number of the CDC control interface within the device */\r
-\r
-                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the CDC interface's IN data endpoint */\r
-                       uint16_t DataINEndpointSize; /**< Size in bytes of the CDC interface's IN data endpoint */\r
-\r
-                       uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the CDC interface's OUT data endpoint */\r
-                       uint16_t DataOUTEndpointSize;  /**< Size in bytes of the CDC interface's OUT data endpoint */\r
-\r
-                       uint8_t  NotificationEndpointNumber; /**< Endpoint number of the CDC interface's IN notification endpoint, if used */\r
-                       uint16_t NotificationEndpointSize;  /**< Size in bytes of the CDC interface's IN notification endpoint, if used */\r
-                       \r
-                       char*         AdapterVendorDescription; /**< String description of the adapter vendor */\r
-                       MAC_Address_t AdapterMACAddress; /**< MAC address of the adapter */\r
-\r
-                       uint8_t  RNDISMessageBuffer[RNDIS_MESSAGE_BUFFER_SIZE]; /**< Buffer to hold RNDIS messages to and from the host,\r
-                                                                                *   managed by the class driver\r
-                                                                                */\r
-                       bool     ResponseReady; /**< Internal flag indicating if a RNDIS message is waiting to be returned to the host */\r
-                       uint8_t  CurrRNDISState; /**< Current RNDIS state of the adapter, a value from the RNDIS_States_t enum */\r
-                       uint32_t CurrPacketFilter; /**< Current packet filter mode, used internally by the class driver */\r
-                       Ethernet_Frame_Info_t FrameIN; /**< Structure holding the last received Ethernet frame from the host, for user\r
-                                                       *   processing\r
-                                                       */\r
-                       Ethernet_Frame_Info_t FrameOUT; /**< Structure holding the next Ethernet frame to send to the host, populated by the\r
-                                                        *   user application\r
-                                                        */\r
-               } USB_ClassInfo_RNDIS_t;\r
-                               \r
        /* Function Prototypes: */\r
-               #if defined(INCLUDE_FROM_RNDIS_CLASS_C)\r
+               #if defined(INCLUDE_FROM_RNDIS_CLASS_DEVICE_C)\r
                        static void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);\r
                        static bool RNDIS_Device_ProcessNDISQuery(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo, \r
                                                                  uint32_t OId, void* QueryData, uint16_t QuerySize,\r

diff --git a/LUFA/Drivers/USB/Class/Device/RNDISConstants.h b/LUFA/Drivers/USB/Class/Device/RNDISConstants.h
index ad66f62..c36213d 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/RNDISConstants.h
+++ b/LUFA/Drivers/USB/Class/Device/RNDISConstants.h
@@ -34,8 +34,8 @@
  *  constants, please refer to the Microsoft RNDIS specification.\r
  */\r
  \r
-#ifndef _RNDIS_CONSTANTS_H_\r
-#define _RNDIS_CONSTANTS_H_\r
+#ifndef _RNDIS_CONSTANTS_DEVICE_H_\r
+#define _RNDIS_CONSTANTS_DEVICE_H_\r
 \r
        /* Macros: */\r
                #define REMOTE_NDIS_PACKET_MSG                0x00000001UL\r

diff --git a/LUFA/Drivers/USB/Class/HID.h b/LUFA/Drivers/USB/Class/HID.h
new file mode 100644 (file)
index 0000000..f8449b2
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/HID.h
@@ -0,0 +1,63 @@
+/*\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
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBClassHID HID Device Class Driver - LUFA/Drivers/Class/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
+ *    - LUFA/Drivers/USB/Class/Host/HID.c\r
+ *    - LUFA/Drivers/USB/Class/Host/HIDParser.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
+       /* Includes: */\r
+               #include "../HighLevel/USBMode.h"\r
+\r
+               #if defined(USB_CAN_BE_DEVICE)\r
+                       #include "Device/HID.h"\r
+               #endif\r
+               \r
+               #if defined(USB_CAN_BE_HOST)\r
+                       #include "Host/HID.h"\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Host/Audio.c b/LUFA/Drivers/USB/Class/Host/Audio.c
new file mode 100644 (file)
index 0000000..bb8e7c5
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/Audio.c
@@ -0,0 +1,36 @@
+/*\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 "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_HOST)\r
+\r
+#include "Audio.h"\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/Audio.h b/LUFA/Drivers/USB/Class/Host/Audio.h
new file mode 100644 (file)
index 0000000..0047b0f
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/Audio.h
@@ -0,0 +1,61 @@
+/*\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
+/** \ingroup Group_USBClassAudio\r
+ *  @defgroup Group_USBClassAudioHost Audio Class Host Mode Driver\r
+ *\r
+ *  \section Module Description\r
+ *  Host Mode USB Class driver framework interface, for the Audio USB Class driver.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef __AUDIO_CLASS_HOST_H__\r
+#define __AUDIO_CLASS_HOST_H__\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               #include "../Common/Audio.h"\r
+               \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Function Prototypes: */\r
+               \r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c
new file mode 100644 (file)
index 0000000..30970f1
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -0,0 +1,231 @@
+/*\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 "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_HOST)\r
+\r
+#define  INCLUDE_FROM_CDC_CLASS_HOST_C\r
+#include "CDC.h"\r
+\r
+static uint8_t CDC_Host_ProcessConfigDescriptor(void)\r
+{\r
+       uint8_t* ConfigDescriptorData;\r
+       uint16_t ConfigDescriptorSize;\r
+       uint8_t  FoundEndpoints = 0;\r
+       \r
+       if (USB_GetDeviceConfigDescriptor(&ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)\r
+         return ControlError;\r
+       \r
+       if (ConfigDescriptorSize > MAX_CONFIG_DESCRIPTOR_SIZE)\r
+         return DescriptorTooLarge;\r
+         \r
+       ConfigDescriptorData = alloca(ConfigDescriptorSize);\r
+\r
+       USB_GetDeviceConfigDescriptor(&ConfigDescriptorSize, ConfigDescriptorData);\r
+       \r
+       if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
+         return InvalidConfigDataReturned;\r
+       \r
+       if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
+                                     DComp_CDC_Host_NextCDCControlInterface) != DESCRIPTOR_SEARCH_COMP_Found)\r
+       {\r
+               return NoCDCInterfaceFound;\r
+       }\r
+\r
+       while (FoundEndpoints != ((1 << CDC_NOTIFICATIONPIPE) | (1 << CDC_DATAPIPE_IN) | (1 << CDC_DATAPIPE_OUT)))\r
+       {\r
+               if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
+                                             DComp_CDC_Host_NextInterfaceCDCDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
+               {\r
+                       /* Check to see if the control interface's notification pipe has been found, if so search for the data interface */\r
+                       if (FoundEndpoints & (1 << CDC_NOTIFICATIONPIPE))\r
+                       {\r
+                               /* Get the next CDC data interface from the configuration descriptor (CDC class has two CDC interfaces) */\r
+                               if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, \r
+                                                             DComp_CDC_Host_NextCDCDataInterface) != DESCRIPTOR_SEARCH_COMP_Found)\r
+                               {\r
+                                       /* Descriptor not found, error out */\r
+                                       return NoCDCInterfaceFound;\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               FoundEndpoints = 0;\r
+\r
+                               Pipe_SelectPipe(CDC_NOTIFICATIONPIPE);\r
+                               Pipe_DisablePipe();\r
+                               Pipe_SelectPipe(CDC_DATAPIPE_IN);\r
+                               Pipe_DisablePipe();\r
+                               Pipe_SelectPipe(CDC_DATAPIPE_OUT);\r
+                               Pipe_DisablePipe();\r
+                       \r
+                               if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
+                                                             DComp_CDC_Host_NextCDCControlInterface) != DESCRIPTOR_SEARCH_COMP_Found)\r
+                               {\r
+                                       return NoCDCInterfaceFound;\r
+                               }\r
+                       }\r
+\r
+                       if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
+                                                     DComp_CDC_Host_NextInterfaceCDCDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
+                       {\r
+                               return NoEndpointFound;\r
+                       }\r
+               }\r
+               \r
+               USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);\r
+\r
+               if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)\r
+               {\r
+                       if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
+                       {                                                          \r
+                               Pipe_ConfigurePipe(CDC_NOTIFICATIONPIPE, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,\r
+                                                                  EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+\r
+                               Pipe_SetInfiniteINRequests();\r
+                               Pipe_SetInterruptPeriod(EndpointData->PollingIntervalMS);\r
+                               \r
+                               FoundEndpoints |= (1 << CDC_NOTIFICATIONPIPE);\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
+                       {\r
+                               Pipe_ConfigurePipe(CDC_DATAPIPE_IN, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
+                                                                  EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+\r
+                               Pipe_SetInfiniteINRequests();\r
+                               Pipe_Unfreeze();\r
+                               \r
+                               FoundEndpoints |= (1 << CDC_DATAPIPE_IN);\r
+                       }\r
+                       else\r
+                       {\r
+                               Pipe_ConfigurePipe(CDC_DATAPIPE_OUT, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
+                                                                  EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
+                               \r
+                               Pipe_Unfreeze();\r
+                               \r
+                               FoundEndpoints |= (1 << CDC_DATAPIPE_OUT);\r
+                       }\r
+               }\r
+       }\r
+\r
+       return SuccessfulConfigRead;\r
+}\r
+\r
+static uint8_t DComp_CDC_Host_NextCDCControlInterface(void* CurrentDescriptor)\r
+{\r
+       if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
+       {\r
+               /* Check the CDC descriptor class, subclass and protocol, break out if correct control interface found */\r
+               if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class    == CDC_CONTROL_CLASS)    &&\r
+                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == CDC_CONTROL_SUBCLASS) &&\r
+                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == CDC_CONTROL_PROTOCOL))\r
+               {\r
+                       return DESCRIPTOR_SEARCH_Found;\r
+               }\r
+       }\r
+       \r
+       return DESCRIPTOR_SEARCH_NotFound;\r
+}\r
+\r
+static uint8_t DComp_CDC_Host_NextCDCDataInterface(void* CurrentDescriptor)\r
+{\r
+       if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
+       {\r
+               /* Check the CDC descriptor class, subclass and protocol, break out if correct data interface found */\r
+               if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class    == CDC_DATA_CLASS)    &&\r
+                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == CDC_DATA_SUBCLASS) &&\r
+                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == CDC_DATA_PROTOCOL))\r
+               {\r
+                       return DESCRIPTOR_SEARCH_Found;\r
+               }\r
+       }\r
+       \r
+       return DESCRIPTOR_SEARCH_NotFound;\r
+}\r
+\r
+static uint8_t DComp_CDC_Host_NextInterfaceCDCDataEndpoint(void* CurrentDescriptor)\r
+{\r
+       if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
+       {\r
+               uint8_t EndpointType = (DESCRIPTOR_CAST(CurrentDescriptor,\r
+                                                       USB_Descriptor_Endpoint_t).Attributes & EP_TYPE_MASK);\r
+       \r
+               if ((EndpointType == EP_TYPE_BULK) || (EndpointType == EP_TYPE_INTERRUPT))\r
+                 return DESCRIPTOR_SEARCH_Found;\r
+       }\r
+       else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
+       {\r
+               return DESCRIPTOR_SEARCH_Fail;\r
+       }\r
+\r
+       return DESCRIPTOR_SEARCH_NotFound;\r
+}\r
+\r
+void CDC_Host_Task(void)\r
+{\r
+       uint8_t ErrorCode;\r
+\r
+       switch (USB_HostState)\r
+       {\r
+               case HOST_STATE_Addressed:\r
+                       USB_ControlRequest = (USB_Request_Header_t)\r
+                               {\r
+                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                                       .bRequest      = REQ_SetConfiguration,\r
+                                       .wValue        = 1,\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = 0,\r
+                               };\r
+\r
+                       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r
+                       if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
+                       {\r
+                               USB_HostState = HOST_STATE_Unattached;\r
+                       }\r
+                               \r
+                       USB_HostState = HOST_STATE_Configured;\r
+                       break;\r
+               case HOST_STATE_Configured:\r
+                       if ((ErrorCode = CDC_Host_ProcessConfigDescriptor()) != SuccessfulConfigRead)\r
+                       {\r
+                               USB_HostState = HOST_STATE_Unattached;\r
+                       }\r
+                               \r
+                       USB_HostState = HOST_STATE_Ready;\r
+                       break;\r
+       }\r
+}\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h
new file mode 100644 (file)
index 0000000..35c2b27
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/CDC.h
@@ -0,0 +1,69 @@
+/*\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
+/** \ingroup Group_USBClassCDC\r
+ *  @defgroup Group_USBClassCDCHost CDC Class Host Mode Driver\r
+ *\r
+ *  \section Module Description\r
+ *  Host Mode USB Class driver framework interface, for the CDC USB Class driver.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef __CDC_CLASS_HOST_H__\r
+#define __CDC_CLASS_HOST_H__\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               #include "../Common/CDC.h"\r
+               \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Function Prototypes: */\r
+               #if defined(INCLUDE_FROM_CDC_CLASS_HOST_C)\r
+                       static uint8_t CDC_Host_ProcessConfigDescriptor(void);\r
+                       static uint8_t DComp_CDC_Host_NextCDCControlInterface(void* CurrentDescriptor);\r
+                       static uint8_t DComp_CDC_Host_NextCDCDataInterface(void* CurrentDescriptor);\r
+                       static uint8_t DComp_CDC_Host_NextInterfaceCDCDataEndpoint(void* CurrentDescriptor);\r
+               #endif\r
+               \r
+               void CDC_Host_Task(void);\r
+               \r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
new file mode 100644 (file)
index 0000000..99e44a4
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -0,0 +1,36 @@
+/*\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 "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_HOST)\r
+\r
+#include "HID.h"\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/HID.h b/LUFA/Drivers/USB/Class/Host/HID.h
new file mode 100644 (file)
index 0000000..d632466
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/HID.h
@@ -0,0 +1,61 @@
+/*\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
+/** \ingroup Group_USBClassHID\r
+ *  @defgroup Group_USBClassHIDHost HID Class Host Mode Driver\r
+ *\r
+ *  \section Module Description\r
+ *  Host Mode USB Class driver framework interface, for the HID USB Class driver.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef __HID_CLASS_HOST_H__\r
+#define __HID_CLASS_HOST_H__\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               #include "../Common/HID.h"\r
+               \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Function Prototypes: */\r
+               \r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.c b/LUFA/Drivers/USB/Class/Host/HIDParser.c
index 5fb29aa..7c4983b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c
@@ -29,6 +29,7 @@
 */\r
 \r
 #include "HIDParser.h"\r
+#if defined(CAN_BE_HOST)\r
 \r
 uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID_ReportInfo_t* const ParserData)\r
 {\r
@@ -324,3 +325,5 @@ void USB_SetHIDReportItemInfo(uint8_t* ReportData, const HID_ReportItem_t* Repor
                BitMask <<= 1;\r
        }\r
 }\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDI.c
new file mode 100644 (file)
index 0000000..542700b
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/MIDI.c
@@ -0,0 +1,36 @@
+/*\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 "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_HOST)\r
+\r
+#include "MIDI.h"\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.h b/LUFA/Drivers/USB/Class/Host/MIDI.h
new file mode 100644 (file)
index 0000000..b35fb6d
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/MIDI.h
@@ -0,0 +1,61 @@
+/*\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
+/** \ingroup Group_USBClassMIDI\r
+ *  @defgroup Group_USBClassMIDIHost MIDI Class Host Mode Driver\r
+ *\r
+ *  \section Module Description\r
+ *  Host Mode USB Class driver framework interface, for the MIDI USB Class driver.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef __MIDI_CLASS_HOST_H__\r
+#define __MIDI_CLASS_HOST_H__\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               #include "../Common/MIDI.h"\r
+               \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Function Prototypes: */\r
+               \r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
new file mode 100644 (file)
index 0000000..99e44a4
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -0,0 +1,36 @@
+/*\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 "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_HOST)\r
+\r
+#include "HID.h"\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorage.h
new file mode 100644 (file)
index 0000000..4a694f3
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.h
@@ -0,0 +1,61 @@
+/*\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
+/** \ingroup Group_USBClassMassStorage\r
+ *  @defgroup Group_USBClassMassStorageHost Mass Storage Class Host Mode Driver\r
+ *\r
+ *  \section Module Description\r
+ *  Host Mode USB Class driver framework interface, for the Mass Storage USB Class driver.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef __MS_CLASS_HOST_H__\r
+#define __MS_CLASS_HOST_H__\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               #include "../Common/MassStorage.h"\r
+               \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Function Prototypes: */\r
+               \r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c
new file mode 100644 (file)
index 0000000..eaaaa1a
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.c
@@ -0,0 +1,36 @@
+/*\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 "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_HOST)\r
+\r
+#include "StillImage.h"\r
+\r
+#endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImage.h
new file mode 100644 (file)
index 0000000..b522fb7
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.h
@@ -0,0 +1,61 @@
+/*\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
+/** \ingroup Group_USBClassStillImage\r
+ *  @defgroup Group_USBClassStillImageHost Still Image Class Host Mode Driver\r
+ *\r
+ *  \section Module Description\r
+ *  Host Mode USB Class driver framework interface, for the Still Image USB Class driver.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef __SI_CLASS_HOST_H__\r
+#define __SI_CLASS_HOST_H__\r
+\r
+       /* Includes: */\r
+               #include "../../USB.h"\r
+               #include "../Common/StillImage.h"\r
+               \r
+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r
+       /* Function Prototypes: */\r
+               \r
+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/MIDI.h b/LUFA/Drivers/USB/Class/MIDI.h
new file mode 100644 (file)
index 0000000..8b68480
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/MIDI.h
@@ -0,0 +1,63 @@
+/*\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
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBClassMIDI MIDI Device Class Driver - LUFA/Drivers/Class/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
+ *    - LUFA/Drivers/USB/Class/Host/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
+       /* Includes: */\r
+               #include "../HighLevel/USBMode.h"\r
+\r
+               #if defined(USB_CAN_BE_DEVICE)\r
+                       #include "Device/MIDI.h"\r
+               #endif\r
+               \r
+               #if defined(USB_CAN_BE_HOST)\r
+                       #include "Host/MIDI.h"\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/MassStorage.h b/LUFA/Drivers/USB/Class/MassStorage.h
new file mode 100644 (file)
index 0000000..5733b72
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/MassStorage.h
@@ -0,0 +1,62 @@
+/*\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
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBClassMS Mass Storage Device Class Driver - LUFA/Drivers/Class/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
+ *    - LUFA/Drivers/USB/Class/Host/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
+       /* Includes: */\r
+               #include "../HighLevel/USBMode.h"\r
+\r
+               #if defined(USB_CAN_BE_DEVICE)\r
+                       #include "Device/MassStorage.h"\r
+               #endif\r
+               \r
+               #if defined(USB_CAN_BE_HOST)\r
+                       #include "Host/MassStorage.h"\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/RNDIS.h b/LUFA/Drivers/USB/Class/RNDIS.h
new file mode 100644 (file)
index 0000000..8709aa1
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/RNDIS.h
@@ -0,0 +1,57 @@
+/*\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
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBClassRNDIS RNDIS Device Class Driver - LUFA/Drivers/Class/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/RNDIS.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
+       /* Includes: */\r
+               #include "../HighLevel/USBMode.h"\r
+\r
+               #if defined(USB_CAN_BE_DEVICE)\r
+                       #include "Device/RNDIS.h"\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/StillImage.h b/LUFA/Drivers/USB/Class/StillImage.h
new file mode 100644 (file)
index 0000000..e023363
--- /dev/null
+++ b/LUFA/Drivers/USB/Class/StillImage.h
@@ -0,0 +1,57 @@
+/*\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
+/** \ingroup Group_USBClassDrivers\r
+ *  @defgroup Group_USBClassSI Still Image Device Class Driver - LUFA/Drivers/Class/StillImage.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/Host/StillImage.c\r
+ *\r
+ *  \section Module Description\r
+ *  Functions, macros, variables, enums and types related to the management of USB Still Image Class interfaces\r
+ *  within a USB device.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+#ifndef _SI_CLASS_H_\r
+#define _SI_CLASS_H_\r
+\r
+       /* Includes: */\r
+               #include "../HighLevel/USBMode.h"\r
+               \r
+               #if defined(USB_CAN_BE_HOST)\r
+                       #include "Host/StillImage.h"\r
+               #endif\r
+               \r
+#endif\r
+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index c2d9339..9abd275 100644 (file)
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -67,20 +67,6 @@
  *  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

diff --git a/LUFA/makefile b/LUFA/makefile
index 20f943a..d5829c6 100644 (file)
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -18,6 +18,19 @@ LUFA_SRC_FILES =     ./Drivers/USB/LowLevel/DevChapter9.c        \
                      ./Drivers/USB/HighLevel/USBInterrupt.c      \\r
                      ./Drivers/USB/HighLevel/USBTask.c           \\r
                      ./Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
+                     ./Drivers/USB/Class/Device/Audio.c          \\r
+                     ./Drivers/USB/Class/Device/CDC.c            \\r
+                     ./Drivers/USB/Class/Device/HID.c            \\r
+                     ./Drivers/USB/Class/Device/MIDI.c           \\r
+                     ./Drivers/USB/Class/Device/MassStorage.c    \\r
+                     ./Drivers/USB/Class/Device/RNDIS.c          \\r
+                     ./Drivers/USB/Class/Host/Audio.c            \\r
+                     ./Drivers/USB/Class/Host/CDC.c              \\r
+                     ./Drivers/USB/Class/Host/HID.c              \\r
+                     ./Drivers/USB/Class/Host/HIDParser.c        \\r
+                     ./Drivers/USB/Class/Host/MIDI.c             \\r
+                     ./Drivers/USB/Class/Host/MassStorage.c      \\r
+                     ./Drivers/USB/Class/Host/StillImage.c       \\r
                      ./Drivers/Board/Temperature.c               \\r
                      ./Drivers/Peripheral/Serial.c               \\r
                      ./Drivers/Peripheral/SerialStream.c         \\r

diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 0fff2c2..27cfe02 100644 (file)
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -41,7 +41,7 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r

diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 6e5e00b..716b995 100644 (file)
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -46,7 +46,7 @@ BitBuffer_t TrackDataBuffers[3];
  *  passed to all HID Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r
-USB_ClassInfo_HID_t Keyboard_HID_Interface =\r
+USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =\r
        {\r
                .InterfaceNumber         = 0,\r
 \r
@@ -157,7 +157,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *\r
  *  \return Number of bytes in the created report\r
  */\r
-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r
+uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r
 {\r
        static bool IsKeyReleaseReport;\r
        static bool IsNewlineReport;\r
@@ -204,7 +204,7 @@ uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceI
  *  \param ReportData  Pointer to the report buffer where the received report is stored\r
  *  \param ReportSize  Size in bytes of the report received from the host\r
  */\r
-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
+void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo, uint8_t ReportID,\r
                                                void* ReportData, uint16_t ReportSize)\r
 {\r
        // Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports\r

diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index 6a13af4..c96d038 100644 (file)
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -48,7 +48,7 @@
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/Device/HID.h>\r
+               #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
        /* Macros: */\r
                /** HID keyboard keycode to indicate that the "1" key is currently pressed. */\r
@@ -79,7 +79,8 @@
                void EVENT_USB_ConfigurationChanged(void);\r
                void EVENT_USB_UnhandledControlPacket(void);\r
 \r
-               uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData);\r
+               uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID,\r
+                                                             void* ReportData);\r
                void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
                                                        void* ReportData, uint16_t ReportSize);\r
                \r

diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index 80b1744..b81f9f1 100644 (file)
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/makefile
@@ -137,6 +137,7 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/Host/HID.c              \
 
 
 # List C++ source files here. (C dependencies are automatically generated.)