diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h index 0072204920..da908b5ea5 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h @@ -40,7 +40,7 @@ #include #include - #include + #include #include "EthernetProtocols.h" #include "ProtocolDecoders.h" diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/EthernetProtocols.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/EthernetProtocols.h index ca76a9392b..d79aa634e9 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/EthernetProtocols.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/EthernetProtocols.h @@ -38,7 +38,7 @@ #define _ETHERNET_PROTOCOLS_H_ /* Includes: */ - #include + #include /* Macros: */ #define ETHERTYPE_IPV4 0x0800 diff --git a/LUFA.pnproj b/LUFA.pnproj index 2623a09c8c..b310434794 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index 340fa6ba19..00aa13f6a3 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -19,6 +19,7 @@ * - Core: * - When automatic PLL management mode is enabled on the U4 series AVR8 chips, the PLL is now configured for 48MHz and not * a divided 96MHz, to lower power consumption and to keep the system within the datasheet specs for 3.3V operation (thanks to Scott Vitale) + * - Added Class, ClassDevice, ClassHost and ClassCommon to the internal class driver source filenames to prevent ambiguities * - Library Applications: * - None * diff --git a/LUFA/DoxygenPages/MigrationInformation.txt b/LUFA/DoxygenPages/MigrationInformation.txt index de7da5d1b3..3fe03349ae 100644 --- a/LUFA/DoxygenPages/MigrationInformation.txt +++ b/LUFA/DoxygenPages/MigrationInformation.txt @@ -14,6 +14,10 @@ * USB Core * - The HID_KEYBOARD_MODIFER_* macros in the HID class driver have been corrected to HID_KEYBOARD_MODIFIER_* (note the spelling of "modifier"). * Existing applications should switch over to the correctly spelled macro names. + * - The names of the USB Device and USB Host class driver files have changed; a new "ClassDevice" and "ClassHost" postfix has been added to the + * respective class driver files. Projects referencing the class driver source files by filename rather than the LUFA_SRC_USBCLASS makefile + * variable should append these postfixes to the source file names. Projects including the USB class driver dispatch headers directly should either + * switch to including the main USB driver header instead, or use the updated header filenames. * * \section Sec_Migration111009 Migrating from 110528 to 111009 * Non-USB Library Components diff --git a/LUFA/Drivers/USB/Class/Audio.h b/LUFA/Drivers/USB/Class/AudioClass.h similarity index 97% rename from LUFA/Drivers/USB/Class/Audio.h rename to LUFA/Drivers/USB/Class/AudioClass.h index 5d02b4d4a6..ff6eb91908 100644 --- a/LUFA/Drivers/USB/Class/Audio.h +++ b/LUFA/Drivers/USB/Class/AudioClass.h @@ -67,11 +67,11 @@ #include "../Core/USBMode.h" #if defined(USB_CAN_BE_DEVICE) - #include "Device/Audio.h" + #include "Device/AudioClassDevice.h" #endif #if defined(USB_CAN_BE_HOST) - #include "Host/Audio.h" + #include "Host/AudioClassHost.h" #endif #endif diff --git a/LUFA/Drivers/USB/Class/CDC.h b/LUFA/Drivers/USB/Class/CDCClass.h similarity index 97% rename from LUFA/Drivers/USB/Class/CDC.h rename to LUFA/Drivers/USB/Class/CDCClass.h index 935291cd29..4e3a06d61d 100644 --- a/LUFA/Drivers/USB/Class/CDC.h +++ b/LUFA/Drivers/USB/Class/CDCClass.h @@ -67,11 +67,11 @@ #include "../Core/USBMode.h" #if defined(USB_CAN_BE_DEVICE) - #include "Device/CDC.h" + #include "Device/CDCClassDevice.h" #endif #if defined(USB_CAN_BE_HOST) - #include "Host/CDC.h" + #include "Host/CDCClassHost.h" #endif #endif diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h similarity index 100% rename from LUFA/Drivers/USB/Class/Common/Audio.h rename to LUFA/Drivers/USB/Class/Common/AudioClassCommon.h diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h similarity index 100% rename from LUFA/Drivers/USB/Class/Common/CDC.h rename to LUFA/Drivers/USB/Class/Common/CDCClassCommon.h diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h similarity index 100% rename from LUFA/Drivers/USB/Class/Common/HID.h rename to LUFA/Drivers/USB/Class/Common/HIDClassCommon.h diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.h b/LUFA/Drivers/USB/Class/Common/HIDParser.h index e491213329..3e3bb237ea 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDParser.h +++ b/LUFA/Drivers/USB/Class/Common/HIDParser.h @@ -70,7 +70,7 @@ #include "../../../../Common/Common.h" #include "HIDReportData.h" - #include "../Common/HID.h" + #include "HIDClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h similarity index 99% rename from LUFA/Drivers/USB/Class/Common/MIDI.h rename to LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h index a273589e49..7255499737 100644 --- a/LUFA/Drivers/USB/Class/Common/MIDI.h +++ b/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../Core/StdDescriptors.h" - #include "Audio.h" + #include "AudioClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h similarity index 100% rename from LUFA/Drivers/USB/Class/Common/MassStorage.h rename to LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h diff --git a/LUFA/Drivers/USB/Class/Common/Printer.h b/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h similarity index 100% rename from LUFA/Drivers/USB/Class/Common/Printer.h rename to LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h similarity index 99% rename from LUFA/Drivers/USB/Class/Common/RNDIS.h rename to LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h index f931de8266..30840f5a37 100644 --- a/LUFA/Drivers/USB/Class/Common/RNDIS.h +++ b/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../Core/StdDescriptors.h" - #include "CDC.h" + #include "CDCClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Common/StillImage.h b/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h similarity index 100% rename from LUFA/Drivers/USB/Class/Common/StillImage.h rename to LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c similarity index 99% rename from LUFA/Drivers/USB/Class/Device/Audio.c rename to LUFA/Drivers/USB/Class/Device/AudioClassDevice.c index cdbe1a0d9b..d8c5d29eb9 100644 --- a/LUFA/Drivers/USB/Class/Device/Audio.c +++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_AUDIO_DRIVER #define __INCLUDE_FROM_AUDIO_DEVICE_C -#include "Audio.h" +#include "AudioClassDevice.h" void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) { diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h similarity index 99% rename from LUFA/Drivers/USB/Class/Device/Audio.h rename to LUFA/Drivers/USB/Class/Device/AudioClassDevice.h index 60880c29ec..175bc8bf4b 100644 --- a/LUFA/Drivers/USB/Class/Device/Audio.h +++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/Audio.h" + #include "../Common/AudioClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c similarity index 99% rename from LUFA/Drivers/USB/Class/Device/CDC.c rename to LUFA/Drivers/USB/Class/Device/CDCClassDevice.c index 29e5c25eb3..e3b05e037e 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.c +++ b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_CDC_DRIVER #define __INCLUDE_FROM_CDC_DEVICE_C -#include "CDC.h" +#include "CDCClassDevice.h" void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) { diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h similarity index 99% rename from LUFA/Drivers/USB/Class/Device/CDC.h rename to LUFA/Drivers/USB/Class/Device/CDCClassDevice.h index b1eeb41dc3..449b76afd4 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.h +++ b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h @@ -72,7 +72,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/CDC.h" + #include "../Common/CDCClassCommon.h" #include diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c similarity index 99% rename from LUFA/Drivers/USB/Class/Device/HID.c rename to LUFA/Drivers/USB/Class/Device/HIDClassDevice.c index ec02138ab0..9b5a7dd350 100644 --- a/LUFA/Drivers/USB/Class/Device/HID.c +++ b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_HID_DRIVER #define __INCLUDE_FROM_HID_DEVICE_C -#include "HID.h" +#include "HIDClassDevice.h" void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo) { diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.h similarity index 99% rename from LUFA/Drivers/USB/Class/Device/HID.h rename to LUFA/Drivers/USB/Class/Device/HIDClassDevice.h index 52bff7ec9b..40aab39021 100644 --- a/LUFA/Drivers/USB/Class/Device/HID.h +++ b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/HID.h" + #include "../Common/HIDClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c similarity index 99% rename from LUFA/Drivers/USB/Class/Device/MIDI.c rename to LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c index 5e4bd9c2d4..13454592b1 100644 --- a/LUFA/Drivers/USB/Class/Device/MIDI.c +++ b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_MIDI_DRIVER #define __INCLUDE_FROM_MIDI_DEVICE_C -#include "MIDI.h" +#include "MIDIClassDevice.h" bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) { diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h similarity index 99% rename from LUFA/Drivers/USB/Class/Device/MIDI.h rename to LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h index 45a7561578..c73ce43bfc 100644 --- a/LUFA/Drivers/USB/Class/Device/MIDI.h +++ b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/MIDI.h" + #include "../Common/MIDIClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c similarity index 99% rename from LUFA/Drivers/USB/Class/Device/MassStorage.c rename to LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c index 7586c28122..1e3fe3412f 100644 --- a/LUFA/Drivers/USB/Class/Device/MassStorage.c +++ b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_MS_DRIVER #define __INCLUDE_FROM_MASSSTORAGE_DEVICE_C -#include "MassStorage.h" +#include "MassStorageClassDevice.h" void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) { diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.h b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h similarity index 99% rename from LUFA/Drivers/USB/Class/Device/MassStorage.h rename to LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h index 6f0539e540..ce0bcb7874 100644 --- a/LUFA/Drivers/USB/Class/Device/MassStorage.h +++ b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/MassStorage.h" + #include "../Common/MassStorageClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.c b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c similarity index 99% rename from LUFA/Drivers/USB/Class/Device/RNDIS.c rename to LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c index 9a89ae077d..12115ee5e8 100644 --- a/LUFA/Drivers/USB/Class/Device/RNDIS.c +++ b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_RNDIS_DRIVER #define __INCLUDE_FROM_RNDIS_DEVICE_C -#include "RNDIS.h" +#include "RNDISClassDevice.h" static const uint32_t PROGMEM AdapterSupportedOIDList[] = { diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.h b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h similarity index 99% rename from LUFA/Drivers/USB/Class/Device/RNDIS.h rename to LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h index a3b45cbc5f..9953fa1a3f 100644 --- a/LUFA/Drivers/USB/Class/Device/RNDIS.h +++ b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/RNDIS.h" + #include "../Common/RNDISClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/HID.h b/LUFA/Drivers/USB/Class/HIDClass.h similarity index 97% rename from LUFA/Drivers/USB/Class/HID.h rename to LUFA/Drivers/USB/Class/HIDClass.h index f72d47b8eb..71a9b2ea4e 100644 --- a/LUFA/Drivers/USB/Class/HID.h +++ b/LUFA/Drivers/USB/Class/HIDClass.h @@ -68,11 +68,11 @@ #include "../Core/USBMode.h" #if defined(USB_CAN_BE_DEVICE) - #include "Device/HID.h" + #include "Device/HIDClassDevice.h" #endif #if defined(USB_CAN_BE_HOST) - #include "Host/HID.h" + #include "Host/HIDClassHost.h" #endif #endif diff --git a/LUFA/Drivers/USB/Class/Host/Audio.c b/LUFA/Drivers/USB/Class/Host/AudioClassHost.c similarity index 99% rename from LUFA/Drivers/USB/Class/Host/Audio.c rename to LUFA/Drivers/USB/Class/Host/AudioClassHost.c index d8665e4eae..af6f0ec536 100644 --- a/LUFA/Drivers/USB/Class/Host/Audio.c +++ b/LUFA/Drivers/USB/Class/Host/AudioClassHost.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_AUDIO_DRIVER #define __INCLUDE_FROM_AUDIO_HOST_C -#include "Audio.h" +#include "AudioClassHost.h" uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/Audio.h b/LUFA/Drivers/USB/Class/Host/AudioClassHost.h similarity index 99% rename from LUFA/Drivers/USB/Class/Host/Audio.h rename to LUFA/Drivers/USB/Class/Host/AudioClassHost.h index 310d21c088..8be5210c23 100644 --- a/LUFA/Drivers/USB/Class/Host/Audio.h +++ b/LUFA/Drivers/USB/Class/Host/AudioClassHost.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/Audio.h" + #include "../Common/AudioClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDCClassHost.c similarity index 99% rename from LUFA/Drivers/USB/Class/Host/CDC.c rename to LUFA/Drivers/USB/Class/Host/CDCClassHost.c index 2b9835996b..184406643c 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.c +++ b/LUFA/Drivers/USB/Class/Host/CDCClassHost.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_CDC_DRIVER #define __INCLUDE_FROM_CDC_HOST_C -#include "CDC.h" +#include "CDCClassHost.h" uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDCClassHost.h similarity index 99% rename from LUFA/Drivers/USB/Class/Host/CDC.h rename to LUFA/Drivers/USB/Class/Host/CDCClassHost.h index 7fd9e49f4f..4de5043801 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.h +++ b/LUFA/Drivers/USB/Class/Host/CDCClassHost.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/CDC.h" + #include "../Common/CDCClassCommon.h" #include diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HIDClassHost.c similarity index 99% rename from LUFA/Drivers/USB/Class/Host/HID.c rename to LUFA/Drivers/USB/Class/Host/HIDClassHost.c index bfbe6cf695..88e3c49935 100644 --- a/LUFA/Drivers/USB/Class/Host/HID.c +++ b/LUFA/Drivers/USB/Class/Host/HIDClassHost.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_HID_DRIVER #define __INCLUDE_FROM_HID_HOST_C -#include "HID.h" +#include "HIDClassHost.h" uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/HID.h b/LUFA/Drivers/USB/Class/Host/HIDClassHost.h similarity index 99% rename from LUFA/Drivers/USB/Class/Host/HID.h rename to LUFA/Drivers/USB/Class/Host/HIDClassHost.h index 08410f2b1c..5d8c8e922d 100644 --- a/LUFA/Drivers/USB/Class/Host/HID.h +++ b/LUFA/Drivers/USB/Class/Host/HIDClassHost.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/HID.h" + #include "../Common/HIDClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c similarity index 99% rename from LUFA/Drivers/USB/Class/Host/MIDI.c rename to LUFA/Drivers/USB/Class/Host/MIDIClassHost.c index 9f7bbd4ea1..109b075d94 100644 --- a/LUFA/Drivers/USB/Class/Host/MIDI.c +++ b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_MIDI_DRIVER #define __INCLUDE_FROM_MIDI_HOST_C -#include "MIDI.h" +#include "MIDIClassHost.h" uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.h b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.h similarity index 99% rename from LUFA/Drivers/USB/Class/Host/MIDI.h rename to LUFA/Drivers/USB/Class/Host/MIDIClassHost.h index c4451b117e..3398830e11 100644 --- a/LUFA/Drivers/USB/Class/Host/MIDI.h +++ b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/MIDI.h" + #include "../Common/MIDIClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c similarity index 99% rename from LUFA/Drivers/USB/Class/Host/MassStorage.c rename to LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c index 36503bf45a..96550cc3fc 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorage.c +++ b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_MS_DRIVER #define __INCLUDE_FROM_MASSSTORAGE_HOST_C -#include "MassStorage.h" +#include "MassStorageClassHost.h" uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h similarity index 99% rename from LUFA/Drivers/USB/Class/Host/MassStorage.h rename to LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h index f0dd475f26..3b3b9fa5a4 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorage.h +++ b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/MassStorage.h" + #include "../Common/MassStorageClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Host/Printer.c b/LUFA/Drivers/USB/Class/Host/PrinterClassHost.c similarity index 99% rename from LUFA/Drivers/USB/Class/Host/Printer.c rename to LUFA/Drivers/USB/Class/Host/PrinterClassHost.c index 576dd36f14..8bb0acdd6d 100644 --- a/LUFA/Drivers/USB/Class/Host/Printer.c +++ b/LUFA/Drivers/USB/Class/Host/PrinterClassHost.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_PRINTER_DRIVER #define __INCLUDE_FROM_PRINTER_HOST_C -#include "Printer.h" +#include "PrinterClassHost.h" uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/Printer.h b/LUFA/Drivers/USB/Class/Host/PrinterClassHost.h similarity index 99% rename from LUFA/Drivers/USB/Class/Host/Printer.h rename to LUFA/Drivers/USB/Class/Host/PrinterClassHost.h index 9f5c8161ab..f0fe8ee98d 100644 --- a/LUFA/Drivers/USB/Class/Host/Printer.h +++ b/LUFA/Drivers/USB/Class/Host/PrinterClassHost.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/Printer.h" + #include "../Common/PrinterClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.c b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c similarity index 99% rename from LUFA/Drivers/USB/Class/Host/RNDIS.c rename to LUFA/Drivers/USB/Class/Host/RNDISClassHost.c index b942c536c2..61f14020cb 100644 --- a/LUFA/Drivers/USB/Class/Host/RNDIS.c +++ b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_RNDIS_DRIVER #define __INCLUDE_FROM_RNDIS_HOST_C -#include "RNDIS.h" +#include "RNDISClassHost.h" uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.h b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.h similarity index 99% rename from LUFA/Drivers/USB/Class/Host/RNDIS.h rename to LUFA/Drivers/USB/Class/Host/RNDISClassHost.h index f90ed412da..7b0acfb5ce 100644 --- a/LUFA/Drivers/USB/Class/Host/RNDIS.h +++ b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.h @@ -56,7 +56,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/RNDIS.h" + #include "../Common/RNDISClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c similarity index 99% rename from LUFA/Drivers/USB/Class/Host/StillImage.c rename to LUFA/Drivers/USB/Class/Host/StillImageClassHost.c index 48aa86431a..31f581355a 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.c +++ b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c @@ -35,7 +35,7 @@ #define __INCLUDE_FROM_SI_DRIVER #define __INCLUDE_FROM_STILLIMAGE_HOST_C -#include "StillImage.h" +#include "StillImageClassHost.h" uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.h similarity index 99% rename from LUFA/Drivers/USB/Class/Host/StillImage.h rename to LUFA/Drivers/USB/Class/Host/StillImageClassHost.h index 2c5c6b1b63..44894fe6b8 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.h +++ b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.h @@ -55,7 +55,7 @@ /* Includes: */ #include "../../USB.h" - #include "../Common/StillImage.h" + #include "../Common/StillImageClassCommon.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/Class/MIDI.h b/LUFA/Drivers/USB/Class/MIDIClass.h similarity index 97% rename from LUFA/Drivers/USB/Class/MIDI.h rename to LUFA/Drivers/USB/Class/MIDIClass.h index 3f7970b6d5..fae117b397 100644 --- a/LUFA/Drivers/USB/Class/MIDI.h +++ b/LUFA/Drivers/USB/Class/MIDIClass.h @@ -70,11 +70,11 @@ #include "../Core/USBMode.h" #if defined(USB_CAN_BE_DEVICE) - #include "Device/MIDI.h" + #include "Device/MIDIClassDevice.h" #endif #if defined(USB_CAN_BE_HOST) - #include "Host/MIDI.h" + #include "Host/MIDIClassHost.h" #endif #endif diff --git a/LUFA/Drivers/USB/Class/MassStorage.h b/LUFA/Drivers/USB/Class/MassStorageClass.h similarity index 97% rename from LUFA/Drivers/USB/Class/MassStorage.h rename to LUFA/Drivers/USB/Class/MassStorageClass.h index 49af9dd24c..003c63be28 100644 --- a/LUFA/Drivers/USB/Class/MassStorage.h +++ b/LUFA/Drivers/USB/Class/MassStorageClass.h @@ -67,11 +67,11 @@ #include "../Core/USBMode.h" #if defined(USB_CAN_BE_DEVICE) - #include "Device/MassStorage.h" + #include "Device/MassStorageClassDevice.h" #endif #if defined(USB_CAN_BE_HOST) - #include "Host/MassStorage.h" + #include "Host/MassStorageClassHost.h" #endif #endif diff --git a/LUFA/Drivers/USB/Class/Printer.h b/LUFA/Drivers/USB/Class/PrinterClass.h similarity index 98% rename from LUFA/Drivers/USB/Class/Printer.h rename to LUFA/Drivers/USB/Class/PrinterClass.h index 067ce756c6..52edd5208f 100644 --- a/LUFA/Drivers/USB/Class/Printer.h +++ b/LUFA/Drivers/USB/Class/PrinterClass.h @@ -68,7 +68,7 @@ #include "../Core/USBMode.h" #if defined(USB_CAN_BE_HOST) - #include "Host/Printer.h" + #include "Host/PrinterClassHost.h" #endif #endif diff --git a/LUFA/Drivers/USB/Class/RNDIS.h b/LUFA/Drivers/USB/Class/RNDISClass.h similarity index 97% rename from LUFA/Drivers/USB/Class/RNDIS.h rename to LUFA/Drivers/USB/Class/RNDISClass.h index 37a5840883..a85ba1d062 100644 --- a/LUFA/Drivers/USB/Class/RNDIS.h +++ b/LUFA/Drivers/USB/Class/RNDISClass.h @@ -67,11 +67,11 @@ #include "../Core/USBMode.h" #if defined(USB_CAN_BE_DEVICE) - #include "Device/RNDIS.h" + #include "Device/RNDISClassDevice.h" #endif #if defined(USB_CAN_BE_HOST) - #include "Host/RNDIS.h" + #include "Host/RNDISClassHost.h" #endif #endif diff --git a/LUFA/Drivers/USB/Class/StillImage.h b/LUFA/Drivers/USB/Class/StillImageClass.h similarity index 98% rename from LUFA/Drivers/USB/Class/StillImage.h rename to LUFA/Drivers/USB/Class/StillImageClass.h index a421b15550..74e93ed21c 100644 --- a/LUFA/Drivers/USB/Class/StillImage.h +++ b/LUFA/Drivers/USB/Class/StillImageClass.h @@ -66,7 +66,7 @@ #include "../Core/USBMode.h" #if defined(USB_CAN_BE_HOST) - #include "Host/StillImage.h" + #include "Host/StillImageClassHost.h" #endif #endif diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h index fa4fcf1c36..a5a743bef5 100644 --- a/LUFA/Drivers/USB/USB.h +++ b/LUFA/Drivers/USB/USB.h @@ -388,14 +388,14 @@ #include "Core/OTG.h" #endif - #include "Class/Audio.h" - #include "Class/CDC.h" - #include "Class/HID.h" - #include "Class/MassStorage.h" - #include "Class/MIDI.h" - #include "Class/Printer.h" - #include "Class/RNDIS.h" - #include "Class/StillImage.h" + #include "Class/AudioClass.h" + #include "Class/CDCClass.h" + #include "Class/HIDClass.h" + #include "Class/MassStorageClass.h" + #include "Class/MIDIClass.h" + #include "Class/PrinterClass.h" + #include "Class/RNDISClass.h" + #include "Class/StillImageClass.h" #endif diff --git a/LUFA/makefile b/LUFA/makefile index a05b956705..226cf5a754 100644 --- a/LUFA/makefile +++ b/LUFA/makefile @@ -37,20 +37,20 @@ LUFA_SRC_USB = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c -LUFA_SRC_USBCLASS = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/Audio.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDC.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HID.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorage.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDI.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDIS.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Audio.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDC.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HID.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorage.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDI.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Printer.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDIS.c \ - $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImage.c +LUFA_SRC_USBCLASS = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/AudioClassDevice.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c \ + $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c LUFA_SRC_TEMPERATURE = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c LUFA_SRC_SERIAL = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c LUFA_SRC_TWI = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c diff --git a/Projects/MIDIToneGenerator/MIDIToneGenerator.h b/Projects/MIDIToneGenerator/MIDIToneGenerator.h index 27cb84dc98..cf04b9f9a3 100644 --- a/Projects/MIDIToneGenerator/MIDIToneGenerator.h +++ b/Projects/MIDIToneGenerator/MIDIToneGenerator.h @@ -50,7 +50,6 @@ #include #include #include - #include /* Macros: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ diff --git a/Projects/Webserver/Lib/uip/uip-split.h b/Projects/Webserver/Lib/uip/uip-split.h index 2243355d6e..0c768ce40a 100644 --- a/Projects/Webserver/Lib/uip/uip-split.h +++ b/Projects/Webserver/Lib/uip/uip-split.h @@ -77,7 +77,7 @@ #include "../../USBHostMode.h" -#include +#include /** * Handle outgoing packets.