Rename architecture specific driver files, to make them appear with uniquely identifying filenames in the documentation.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1677 d5102386-fcda-11dd-9fdb-3debd5008f28

45 files changed, 65 insertions, 65 deletions

diff --git a/LUFA/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h
index fe766458..5a1d3303 100644
--- a/LUFA/Drivers/Peripheral/ADC.h
+++ b/LUFA/Drivers/Peripheral/ADC.h
@@ -68,7 +68,7 @@
 
 	/* Includes: */
 		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/ADC.h"
+			#include "AVR8/ADC_AVR8.h"
 		#else
 			#error The ADC peripheral driver is not currently available for your selected architecture.
 		#endif
diff --git a/LUFA/Drivers/Peripheral/AVR8/ADC.h b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
index 99f70d14..99f70d14 100644
--- a/LUFA/Drivers/Peripheral/AVR8/ADC.h
+++ b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
diff --git a/LUFA/Drivers/Peripheral/AVR8/SPI.h b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
index d800fca1..d800fca1 100644
--- a/LUFA/Drivers/Peripheral/AVR8/SPI.h
+++ b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial.c b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c
index 3a8312d8..3a8312d8 100644
--- a/LUFA/Drivers/Peripheral/AVR8/Serial.c
+++ b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c
diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial.h b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h
index bb9ba856..bb9ba856 100644
--- a/LUFA/Drivers/Peripheral/AVR8/Serial.h
+++ b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h
diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI.c b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
index b5f258dd..b5f258dd 100644
--- a/LUFA/Drivers/Peripheral/AVR8/TWI.c
+++ b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI.h b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h
index e0342338..e0342338 100644
--- a/LUFA/Drivers/Peripheral/AVR8/TWI.h
+++ b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h
diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h
index 3fcf05aa..3fdc69d6 100644
--- a/LUFA/Drivers/Peripheral/SPI.h
+++ b/LUFA/Drivers/Peripheral/SPI.h
@@ -67,7 +67,7 @@
 
 	/* Includes: */
 		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/SPI.h"
+			#include "AVR8/SPI_AVR8.h"
 		#else
 			#error The SPI peripheral driver is not currently available for your selected architecture.
 		#endif
diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h
index 8e549ff3..addee07e 100644
--- a/LUFA/Drivers/Peripheral/Serial.h
+++ b/LUFA/Drivers/Peripheral/Serial.h
@@ -44,7 +44,7 @@
  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/Peripheral/<i>ARCH</i>/Serial.c <i>(Makefile source module name: LUFA_SRC_SERIAL)</i>
+ *    - LUFA/Drivers/Peripheral/<i>ARCH</i>/Serial_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_SERIAL)</i>
  *
  *  \section Sec_ModDescription Module Description
  *  Hardware serial USART driver. This module provides an easy to use driver for the setup and transfer
@@ -67,7 +67,7 @@
 
 	/* Includes: */
 		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/Serial.h"
+			#include "AVR8/Serial_AVR8.h"
 		#else
 			#error The Serial peripheral driver is not currently available for your selected architecture.
 		#endif
diff --git a/LUFA/Drivers/Peripheral/TWI.h b/LUFA/Drivers/Peripheral/TWI.h
index e6fdd488..ae267257 100644
--- a/LUFA/Drivers/Peripheral/TWI.h
+++ b/LUFA/Drivers/Peripheral/TWI.h
@@ -44,7 +44,7 @@
  *
  *  \section Sec_Dependencies Module Source Dependencies
  *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/Peripheral/<i>ARCH</i>/TWI.c <i>(Makefile source module name: LUFA_SRC_TWI)</i>
+ *    - LUFA/Drivers/Peripheral/<i>ARCH</i>/TWI_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_TWI)</i>
  *
  *  \section Sec_ModDescription Module Description
  *  Hardware TWI driver. This module provides an easy to use driver for the setup and transfer of data over
@@ -67,7 +67,7 @@
 
 	/* Includes: */
 		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/TWI.h"
+			#include "AVR8/TWI_AVR8.h"
 		#else
 			#error The TWI peripheral driver is not currently available for your selected architecture.
 		#endif
diff --git a/LUFA/Drivers/USB/Core/AVR8/Device.c b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c
index c1b37f45..2473327b 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Device.c
+++ b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c
@@ -33,7 +33,7 @@
 
 #if defined(USB_CAN_BE_DEVICE)
 
-#include "Device.h"
+#include "../Device.h"
 
 void USB_Device_SendRemoteWakeup(void)
 {
diff --git a/LUFA/Drivers/USB/Core/AVR8/Device.h b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
index d1ced57d..d1ced57d 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Device.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
diff --git a/LUFA/Drivers/USB/Core/AVR8/Endpoint.c b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c
index c4e32c02..2ec49a5d 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Endpoint.c
+++ b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c
@@ -33,7 +33,7 @@
 
 #if defined(USB_CAN_BE_DEVICE)
 
-#include "Endpoint.h"
+#include "../Endpoint.h"
 
 #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
 uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;
diff --git a/LUFA/Drivers/USB/Core/AVR8/Endpoint.h b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
index ea13a6db..ea13a6db 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Endpoint.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
diff --git a/LUFA/Drivers/USB/Core/AVR8/Host.c b/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c
index 214d1939..e4220e39 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Host.c
+++ b/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c
@@ -34,7 +34,7 @@
 #if defined(USB_CAN_BE_HOST)
 
 #define  __INCLUDE_FROM_HOST_C
-#include "Host.h"
+#include "../Host.h"
 
 void USB_Host_ProcessNextHostState(void)
 {
diff --git a/LUFA/Drivers/USB/Core/AVR8/Host.h b/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.h
index 0c50a39c..0c50a39c 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Host.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.h
diff --git a/LUFA/Drivers/USB/Core/AVR8/OTG.h b/LUFA/Drivers/USB/Core/AVR8/OTG_AVR8.h
index a7903375..a7903375 100644
--- a/LUFA/Drivers/USB/Core/AVR8/OTG.h
+++ b/LUFA/Drivers/USB/Core/AVR8/OTG_AVR8.h
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe.c b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c
index 11751321..2073c8ef 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Pipe.c
+++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c
@@ -33,7 +33,7 @@
 
 #if defined(USB_CAN_BE_HOST)
 
-#include "Pipe.h"
+#include "../Pipe.h"
 
 uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
 
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
index 201ac0bd..201ac0bd 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Pipe.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
diff --git a/LUFA/Drivers/USB/Core/AVR8/USBController.c b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c
index f41b5cc1..79798110 100644
--- a/LUFA/Drivers/USB/Core/AVR8/USBController.c
+++ b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c
@@ -30,7 +30,7 @@
 
 #define  __INCLUDE_FROM_USB_DRIVER
 #define  __INCLUDE_FROM_USB_CONTROLLER_C
-#include "USBController.h"
+#include "../USBController.h"
 
 #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
 volatile uint8_t USB_CurrentMode = USB_MODE_None;
diff --git a/LUFA/Drivers/USB/Core/AVR8/USBController.h b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
index 77e92cb2..77e92cb2 100644
--- a/LUFA/Drivers/USB/Core/AVR8/USBController.h
+++ b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
diff --git a/LUFA/Drivers/USB/Core/AVR8/USBInterrupt.c b/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c
index 34234fe8..f4f7ad98 100644
--- a/LUFA/Drivers/USB/Core/AVR8/USBInterrupt.c
+++ b/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c
@@ -29,7 +29,7 @@
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER
-#include "USBInterrupt.h"
+#include "../USBInterrupt.h"
 
 void USB_INT_DisableAllInterrupts(void)
 {
diff --git a/LUFA/Drivers/USB/Core/AVR8/USBInterrupt.h b/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h
index 940fa195..940fa195 100644
--- a/LUFA/Drivers/USB/Core/AVR8/USBInterrupt.h
+++ b/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h
diff --git a/LUFA/Drivers/USB/Core/Device.h b/LUFA/Drivers/USB/Core/Device.h
index 8de719d7..d6937a5c 100644
--- a/LUFA/Drivers/USB/Core/Device.h
+++ b/LUFA/Drivers/USB/Core/Device.h
@@ -56,9 +56,9 @@
 		#include "Endpoint.h"

 		

 		#if (ARCH == ARCH_AVR8)

-			#include "AVR8/Device.h"

+			#include "AVR8/Device_AVR8.h"

 		#elif (ARCH == ARCH_UC3B)

-			#include "UC3B/Device.h"		

+			#include "UC3B/Device_UC3B.h"

 		#endif

 

 	/* Preprocessor Checks: */

diff --git a/LUFA/Drivers/USB/Core/Endpoint.h b/LUFA/Drivers/USB/Core/Endpoint.h
index 20754ebf..ddbba273 100644
--- a/LUFA/Drivers/USB/Core/Endpoint.h
+++ b/LUFA/Drivers/USB/Core/Endpoint.h
@@ -76,9 +76,9 @@
 		#include "../../../Common/Common.h"

 

 		#if (ARCH == ARCH_AVR8)

-			#include "AVR8/Endpoint.h"

+			#include "AVR8/Endpoint_AVR8.h"

 		#elif (ARCH == ARCH_UC3B)

-			#include "UC3B/Endpoint.h"		

+			#include "UC3B/Endpoint_UC3B.h"

 		#endif

 

 	/* Preprocessor Checks: */

diff --git a/LUFA/Drivers/USB/Core/Host.h b/LUFA/Drivers/USB/Core/Host.h
index 32c27ce2..7b5b5014 100644
--- a/LUFA/Drivers/USB/Core/Host.h
+++ b/LUFA/Drivers/USB/Core/Host.h
@@ -53,9 +53,9 @@
 		#include "../../../Common/Common.h"

 

 		#if (ARCH == ARCH_AVR8)

-			#include "AVR8/Host.h"

+			#include "AVR8/Host_AVR8.h"

 		#elif (ARCH == ARCH_UC3B)

-			#include "UC3B/Host.h"		

+			#include "UC3B/Host_UC3B.h"

 		#endif

 

 	/* Preprocessor Checks: */

diff --git a/LUFA/Drivers/USB/Core/OTG.h b/LUFA/Drivers/USB/Core/OTG.h
index f50d618f..296d7a08 100644
--- a/LUFA/Drivers/USB/Core/OTG.h
+++ b/LUFA/Drivers/USB/Core/OTG.h
@@ -54,9 +54,9 @@
 		#include "../../../Common/Common.h"

 

 		#if (ARCH == ARCH_AVR8)

-			#include "AVR8/OTG.h"

+			#include "AVR8/OTG_AVR8.h"

 		#elif (ARCH == ARCH_UC3B)

-			#include "UC3B/OTG.h"		

+			#include "UC3B/OTG_UC3B.h"

 		#endif

 

 	/* Preprocessor Checks: */

diff --git a/LUFA/Drivers/USB/Core/Pipe.h b/LUFA/Drivers/USB/Core/Pipe.h
index 2769aafd..8c6e26bb 100644
--- a/LUFA/Drivers/USB/Core/Pipe.h
+++ b/LUFA/Drivers/USB/Core/Pipe.h
@@ -86,9 +86,9 @@
 		#include "../../../Common/Common.h"

 

 		#if (ARCH == ARCH_AVR8)

-			#include "AVR8/Pipe.h"

+			#include "AVR8/Pipe_AVR8.h"

 		#elif (ARCH == ARCH_UC3B)

-			#include "UC3B/Pipe.h"		

+			#include "UC3B/Pipe_UC3B.h"

 		#endif

 

 	/* Preprocessor Checks: */

diff --git a/LUFA/Drivers/USB/Core/UC3B/Device.c b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.c
index ab24b063..fc6abc89 100644
--- a/LUFA/Drivers/USB/Core/UC3B/Device.c
+++ b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.c
@@ -33,7 +33,7 @@
 

 #if defined(USB_CAN_BE_DEVICE)

 

-#include "Device.h"

+#include "../Device.h"

 

 void USB_Device_SendRemoteWakeup(void)

 {

diff --git a/LUFA/Drivers/USB/Core/UC3B/Device.h b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
index d68b6e89..d68b6e89 100644
--- a/LUFA/Drivers/USB/Core/UC3B/Device.h
+++ b/LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h
diff --git a/LUFA/Drivers/USB/Core/UC3B/Endpoint.c b/LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.c
index a479b43b..a212543e 100644
--- a/LUFA/Drivers/USB/Core/UC3B/Endpoint.c
+++ b/LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.c
@@ -33,7 +33,7 @@
 

 #if defined(USB_CAN_BE_DEVICE)

 

-#include "Endpoint.h"

+#include "../Endpoint.h"

 

 #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)

 uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;

diff --git a/LUFA/Drivers/USB/Core/UC3B/Endpoint.h b/LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.h
index e0fee630..e0fee630 100644
--- a/LUFA/Drivers/USB/Core/UC3B/Endpoint.h
+++ b/LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.h
diff --git a/LUFA/Drivers/USB/Core/UC3B/Host.c b/LUFA/Drivers/USB/Core/UC3B/Host_UC3B.c
index 03b8f60d..6d49abbb 100644
--- a/LUFA/Drivers/USB/Core/UC3B/Host.c
+++ b/LUFA/Drivers/USB/Core/UC3B/Host_UC3B.c
@@ -34,7 +34,7 @@
 #if defined(USB_CAN_BE_HOST)

 

 #define  __INCLUDE_FROM_HOST_C

-#include "Host.h"

+#include "../Host.h"

 

 void USB_Host_ProcessNextHostState(void)

 {

diff --git a/LUFA/Drivers/USB/Core/UC3B/Host.h b/LUFA/Drivers/USB/Core/UC3B/Host_UC3B.h
index 14cc6247..14cc6247 100644
--- a/LUFA/Drivers/USB/Core/UC3B/Host.h
+++ b/LUFA/Drivers/USB/Core/UC3B/Host_UC3B.h
diff --git a/LUFA/Drivers/USB/Core/UC3B/OTG.h b/LUFA/Drivers/USB/Core/UC3B/OTG_UC3B.h
index 92ec38a2..92ec38a2 100644
--- a/LUFA/Drivers/USB/Core/UC3B/OTG.h
+++ b/LUFA/Drivers/USB/Core/UC3B/OTG_UC3B.h
diff --git a/LUFA/Drivers/USB/Core/UC3B/Pipe.c b/LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.c
index ceacdfe1..e2fa2b96 100644
--- a/LUFA/Drivers/USB/Core/UC3B/Pipe.c
+++ b/LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.c
@@ -33,7 +33,7 @@
 

 #if defined(USB_CAN_BE_HOST)

 

-#include "Pipe.h"

+#include "../Pipe.h"

 

 uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;

 

diff --git a/LUFA/Drivers/USB/Core/UC3B/Pipe.h b/LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h
index 9b24c5c8..9b24c5c8 100644
--- a/LUFA/Drivers/USB/Core/UC3B/Pipe.h
+++ b/LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h
diff --git a/LUFA/Drivers/USB/Core/UC3B/USBController.c b/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
index 7b956837..1a80c5b0 100644
--- a/LUFA/Drivers/USB/Core/UC3B/USBController.c
+++ b/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c
@@ -30,7 +30,7 @@
 

 #define  __INCLUDE_FROM_USB_DRIVER

 #define  __INCLUDE_FROM_USB_CONTROLLER_C

-#include "USBController.h"

+#include "../USBController.h"

 

 #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))

 volatile uint8_t USB_CurrentMode = USB_MODE_None;

diff --git a/LUFA/Drivers/USB/Core/UC3B/USBController.h b/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.h
index 4c903621..4c903621 100644
--- a/LUFA/Drivers/USB/Core/UC3B/USBController.h
+++ b/LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.h
diff --git a/LUFA/Drivers/USB/Core/UC3B/USBInterrupt.c b/LUFA/Drivers/USB/Core/UC3B/USBInterrupt_UC3B.c
index 1f2468d0..a079e4c9 100644
--- a/LUFA/Drivers/USB/Core/UC3B/USBInterrupt.c
+++ b/LUFA/Drivers/USB/Core/UC3B/USBInterrupt_UC3B.c
@@ -29,7 +29,7 @@
 */

 

 #define  __INCLUDE_FROM_USB_DRIVER

-#include "USBInterrupt.h"

+#include "../USBInterrupt.h"

 

 void USB_INT_DisableAllInterrupts(void)

 {

diff --git a/LUFA/Drivers/USB/Core/UC3B/USBInterrupt.h b/LUFA/Drivers/USB/Core/UC3B/USBInterrupt_UC3B.h
index 5de68ed3..5de68ed3 100644
--- a/LUFA/Drivers/USB/Core/UC3B/USBInterrupt.h
+++ b/LUFA/Drivers/USB/Core/UC3B/USBInterrupt_UC3B.h
diff --git a/LUFA/Drivers/USB/Core/USBController.h b/LUFA/Drivers/USB/Core/USBController.h
index 2df6df29..e17a2d73 100644
--- a/LUFA/Drivers/USB/Core/USBController.h
+++ b/LUFA/Drivers/USB/Core/USBController.h
@@ -52,9 +52,9 @@
 		#include "../../../Common/Common.h"

 

 		#if (ARCH == ARCH_AVR8)

-			#include "AVR8/USBController.h"

+			#include "AVR8/USBController_AVR8.h"

 		#elif (ARCH == ARCH_UC3B)

-			#include "UC3B/USBController.h"		

+			#include "UC3B/USBController_UC3B.h"	

 		#endif

 

 	/* Preprocessor Checks and Defines: */

diff --git a/LUFA/Drivers/USB/Core/USBInterrupt.h b/LUFA/Drivers/USB/Core/USBInterrupt.h
index f71c2d03..252ad506 100644
--- a/LUFA/Drivers/USB/Core/USBInterrupt.h
+++ b/LUFA/Drivers/USB/Core/USBInterrupt.h
@@ -45,9 +45,9 @@
 		#include "../../../Common/Common.h"

 

 		#if (ARCH == ARCH_AVR8)

-			#include "AVR8/USBInterrupt.h"

+			#include "AVR8/USBInterrupt_AVR8.h"

 		#elif (ARCH == ARCH_UC3B)

-			#include "UC3B/USBInterrupt.h"		

+			#include "UC3B/USBInterrupt_UC3B.h"

 		#endif

 		

 	/* Preprocessor Checks: */

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index 2c590968..e995fc7b 100644
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -48,12 +48,12 @@
  *    - LUFA/Drivers/USB/Core/HostStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/PipeStream.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Core/USBTask.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Device.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Endpoint.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Host.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Pipe.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBController.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBInterrupt.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Device_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Endpoint_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Host_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Pipe_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBController_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
+ *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBInterrupt_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *    - LUFA/Drivers/USB/Class/Common/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
  *
  *  \section Sec_ModDescription Module Description
diff --git a/LUFA/makefile b/LUFA/makefile
index 44808b9e..ff4dbd9e 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -22,36 +22,36 @@ ifeq ($(origin ARCH), undefined)
 endif
 
 # Define module source file lists
-LUFA_SRC_USB          = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device.c         \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint.c       \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host.c           \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe.c           \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController.c  \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt.c   \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/ConfigDescriptor.c       \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c      \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                 \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/EndpointStream.c         \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c        \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/PipeStream.c             \
-                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c                \
+LUFA_SRC_USB          = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c        \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint_$(ARCH).c      \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host_$(ARCH).c          \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe_$(ARCH).c          \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController_$(ARCH).c \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt_$(ARCH).c  \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/ConfigDescriptor.c              \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c             \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                        \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/EndpointStream.c                \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c               \
+                        $(LUFA_ROOT_PATH)/Drivers/USB/Core/PipeStream.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/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_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/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_TEMPERATURE  = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c
-LUFA_SRC_SERIAL       = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial.c
-LUFA_SRC_TWI          = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI.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
 LUFA_SRC_SCHEDULER    = $(LUFA_ROOT_PATH)/Scheduler/Scheduler.c