Added Class, ClassDevice, ClassHost and ClassCommon to the internal class...

Added Class, ClassDevice, ClassHost and ClassCommon to the internal class driver source filenames to prevent ambiguities.

Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h

@@ -40,7 +40,7 @@
 		#include <avr/io.h>
 		#include <string.h>
 
-		#include <LUFA/Drivers/USB/Class/RNDIS.h>
+		#include <LUFA/Drivers/USB/USB.h>
 
 		#include "EthernetProtocols.h"
 		#include "ProtocolDecoders.h"

Demos/Device/ClassDriver/RNDISEthernet/Lib/EthernetProtocols.h

@@ -38,7 +38,7 @@
 #define _ETHERNET_PROTOCOLS_H_
 
 	/* Includes: */
-		#include <LUFA/Drivers/USB/Class/RNDIS.h>
+		#include <LUFA/Drivers/USB/USB.h>
 
 	/* Macros: */
 		#define ETHERTYPE_IPV4                   0x0800

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
   *

LUFA/DoxygenPages/MigrationInformation.txt

@@ -14,6 +14,10 @@
  *  <b>USB Core</b>
  *    - 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
  *  <b>Non-USB Library Components</b>

LUFA/Drivers/USB/Class/Audio.h → 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

LUFA/Drivers/USB/Class/CDC.h → 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

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)

LUFA/Drivers/USB/Class/Common/MIDI.h → 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)

LUFA/Drivers/USB/Class/Common/RNDIS.h → 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)

LUFA/Drivers/USB/Class/Device/Audio.c → 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)
 {

LUFA/Drivers/USB/Class/Device/Audio.h → 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)

LUFA/Drivers/USB/Class/Device/CDC.c → 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)
 {

LUFA/Drivers/USB/Class/Device/CDC.h → LUFA/Drivers/USB/Class/Device/CDCClassDevice.h

@@ -72,7 +72,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/CDC.h"
+		#include "../Common/CDCClassCommon.h"
 
 		#include <stdio.h>