aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2011-02-20 18:21:04 +0000
committerDean Camera <dean@fourwalledcubicle.com>2011-02-20 18:21:04 +0000
commitb6a3c78fa3e46fea1dd6f4b93352686837983dfd (patch)
tree146ab396b543ebbcd521a932763b5e0217e75edc /LUFA/Drivers
parentcad5e9ffca70f4f5d3b486049088fd77dfa8f0ca (diff)
downloadlufa-b6a3c78fa3e46fea1dd6f4b93352686837983dfd.tar.gz
lufa-b6a3c78fa3e46fea1dd6f4b93352686837983dfd.tar.bz2
lufa-b6a3c78fa3e46fea1dd6f4b93352686837983dfd.zip
Rename architecture specific driver files, to make them appear with uniquely identifying filenames in the documentation.
Diffstat (limited to 'LUFA/Drivers')
-rw-r--r--LUFA/Drivers/Peripheral/ADC.h2
-rw-r--r--LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h (renamed from LUFA/Drivers/Peripheral/AVR8/ADC.h)0
-rw-r--r--LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h (renamed from LUFA/Drivers/Peripheral/AVR8/SPI.h)0
-rw-r--r--LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c (renamed from LUFA/Drivers/Peripheral/AVR8/Serial.c)0
-rw-r--r--LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h (renamed from LUFA/Drivers/Peripheral/AVR8/Serial.h)0
-rw-r--r--LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c (renamed from LUFA/Drivers/Peripheral/AVR8/TWI.c)0
-rw-r--r--LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h (renamed from LUFA/Drivers/Peripheral/AVR8/TWI.h)0
-rw-r--r--LUFA/Drivers/Peripheral/SPI.h2
-rw-r--r--LUFA/Drivers/Peripheral/Serial.h4
-rw-r--r--LUFA/Drivers/Peripheral/TWI.h4
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c (renamed from LUFA/Drivers/USB/Core/AVR8/Device.c)2
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h (renamed from LUFA/Drivers/USB/Core/AVR8/Device.h)0
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c (renamed from LUFA/Drivers/USB/Core/AVR8/Endpoint.c)2
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h (renamed from LUFA/Drivers/USB/Core/AVR8/Endpoint.h)0
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c (renamed from LUFA/Drivers/USB/Core/AVR8/Host.c)2
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Host_AVR8.h (renamed from LUFA/Drivers/USB/Core/AVR8/Host.h)0
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/OTG_AVR8.h (renamed from LUFA/Drivers/USB/Core/AVR8/OTG.h)0
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c (renamed from LUFA/Drivers/USB/Core/AVR8/Pipe.c)2
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h (renamed from LUFA/Drivers/USB/Core/AVR8/Pipe.h)0
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c (renamed from LUFA/Drivers/USB/Core/AVR8/USBController.c)2
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h (renamed from LUFA/Drivers/USB/Core/AVR8/USBController.h)0
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c (renamed from LUFA/Drivers/USB/Core/AVR8/USBInterrupt.c)2
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h (renamed from LUFA/Drivers/USB/Core/AVR8/USBInterrupt.h)0
-rw-r--r--LUFA/Drivers/USB/Core/Device.h4
-rw-r--r--LUFA/Drivers/USB/Core/Endpoint.h4
-rw-r--r--LUFA/Drivers/USB/Core/Host.h4
-rw-r--r--LUFA/Drivers/USB/Core/OTG.h4
-rw-r--r--LUFA/Drivers/USB/Core/Pipe.h4
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/Device_UC3B.c (renamed from LUFA/Drivers/USB/Core/UC3B/Device.c)2
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/Device_UC3B.h (renamed from LUFA/Drivers/USB/Core/UC3B/Device.h)0
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.c (renamed from LUFA/Drivers/USB/Core/UC3B/Endpoint.c)2
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.h (renamed from LUFA/Drivers/USB/Core/UC3B/Endpoint.h)0
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/Host_UC3B.c (renamed from LUFA/Drivers/USB/Core/UC3B/Host.c)2
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/Host_UC3B.h (renamed from LUFA/Drivers/USB/Core/UC3B/Host.h)0
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/OTG_UC3B.h (renamed from LUFA/Drivers/USB/Core/UC3B/OTG.h)0
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.c (renamed from LUFA/Drivers/USB/Core/UC3B/Pipe.c)2
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.h (renamed from LUFA/Drivers/USB/Core/UC3B/Pipe.h)0
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c (renamed from LUFA/Drivers/USB/Core/UC3B/USBController.c)2
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.h (renamed from LUFA/Drivers/USB/Core/UC3B/USBController.h)0
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/USBInterrupt_UC3B.c (renamed from LUFA/Drivers/USB/Core/UC3B/USBInterrupt.c)2
-rw-r--r--LUFA/Drivers/USB/Core/UC3B/USBInterrupt_UC3B.h (renamed from LUFA/Drivers/USB/Core/UC3B/USBInterrupt.h)0
-rw-r--r--LUFA/Drivers/USB/Core/USBController.h4
-rw-r--r--LUFA/Drivers/USB/Core/USBInterrupt.h4
-rw-r--r--LUFA/Drivers/USB/USB.h12
44 files changed, 38 insertions, 38 deletions
diff --git a/LUFA/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h
index fe766458c..5a1d33032 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 99f70d14b..99f70d14b 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 d800fca1a..d800fca1a 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 3a8312d85..3a8312d85 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 bb9ba856e..bb9ba856e 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 b5f258dd3..b5f258dd3 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 e03423385..e03423385 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 3fcf05aaf..3fdc69d67 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 8e549ff3b..addee07e4 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 e6fdd488e..ae2672575 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 c1b37f453..2473327b3 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 d1ced57d4..d1ced57d4 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 c4e32c028..2ec49a5d5 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 ea13a6db0..ea13a6db0 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 214d19398..e4220e395 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 0c50a39c3..0c50a39c3 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 a79033753..a79033753 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 11751321c..2073c8ef2 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 201ac0bd2..201ac0bd2 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 f41b5cc11..797981107 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 77e92cb27..77e92cb27 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 34234fe84..f4f7ad988 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 940fa195e..940fa195e 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 8de719d7c..d6937a5c0 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 20754ebfc..ddbba2737 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 32c27ce22..7b5b50145 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 f50d618fd..296d7a080 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 2769aafdc..8c6e26bb7 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 ab24b0638..fc6abc891 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 d68b6e893..d68b6e893 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 a479b43b8..a212543e0 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 e0fee630b..e0fee630b 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 03b8f60dd..6d49abbb2 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 14cc62474..14cc62474 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 92ec38a28..92ec38a28 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 ceacdfe16..e2fa2b960 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 9b24c5c84..9b24c5c84 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 7b9568375..1a80c5b05 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 4c903621a..4c903621a 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 1f2468d0c..a079e4c90 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 5de68ed3e..5de68ed3e 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 2df6df292..e17a2d73d 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 f71c2d036..252ad5061 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 2c590968a..e995fc7b6 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