From b6a3c78fa3e46fea1dd6f4b93352686837983dfd Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 20 Feb 2011 18:21:04 +0000 Subject: [PATCH] Rename architecture specific driver files, to make them appear with uniquely identifying filenames in the documentation. --- LUFA.pnproj | 2 +- LUFA/Drivers/Peripheral/ADC.h | 2 +- .../Peripheral/AVR8/{ADC.h => ADC_AVR8.h} | 0 .../Peripheral/AVR8/{SPI.h => SPI_AVR8.h} | 0 .../AVR8/{Serial.c => Serial_AVR8.c} | 0 .../AVR8/{Serial.h => Serial_AVR8.h} | 0 .../Peripheral/AVR8/{TWI.c => TWI_AVR8.c} | 0 .../Peripheral/AVR8/{TWI.h => TWI_AVR8.h} | 0 LUFA/Drivers/Peripheral/SPI.h | 2 +- LUFA/Drivers/Peripheral/Serial.h | 4 +- LUFA/Drivers/Peripheral/TWI.h | 4 +- .../USB/Core/AVR8/{Device.c => Device_AVR8.c} | 2 +- .../USB/Core/AVR8/{Device.h => Device_AVR8.h} | 0 .../Core/AVR8/{Endpoint.c => Endpoint_AVR8.c} | 2 +- .../Core/AVR8/{Endpoint.h => Endpoint_AVR8.h} | 0 .../USB/Core/AVR8/{Host.c => Host_AVR8.c} | 2 +- .../USB/Core/AVR8/{Host.h => Host_AVR8.h} | 0 .../USB/Core/AVR8/{OTG.h => OTG_AVR8.h} | 0 .../USB/Core/AVR8/{Pipe.c => Pipe_AVR8.c} | 2 +- .../USB/Core/AVR8/{Pipe.h => Pipe_AVR8.h} | 0 .../{USBController.c => USBController_AVR8.c} | 2 +- .../{USBController.h => USBController_AVR8.h} | 0 .../{USBInterrupt.c => USBInterrupt_AVR8.c} | 2 +- .../{USBInterrupt.h => USBInterrupt_AVR8.h} | 0 LUFA/Drivers/USB/Core/Device.h | 4 +- LUFA/Drivers/USB/Core/Endpoint.h | 4 +- LUFA/Drivers/USB/Core/Host.h | 4 +- LUFA/Drivers/USB/Core/OTG.h | 4 +- LUFA/Drivers/USB/Core/Pipe.h | 4 +- .../USB/Core/UC3B/{Device.c => Device_UC3B.c} | 2 +- .../USB/Core/UC3B/{Device.h => Device_UC3B.h} | 0 .../Core/UC3B/{Endpoint.c => Endpoint_UC3B.c} | 2 +- .../Core/UC3B/{Endpoint.h => Endpoint_UC3B.h} | 0 .../USB/Core/UC3B/{Host.c => Host_UC3B.c} | 2 +- .../USB/Core/UC3B/{Host.h => Host_UC3B.h} | 0 .../USB/Core/UC3B/{OTG.h => OTG_UC3B.h} | 0 .../USB/Core/UC3B/{Pipe.c => Pipe_UC3B.c} | 2 +- .../USB/Core/UC3B/{Pipe.h => Pipe_UC3B.h} | 0 .../{USBController.c => USBController_UC3B.c} | 2 +- .../{USBController.h => USBController_UC3B.h} | 0 .../{USBInterrupt.c => USBInterrupt_UC3B.c} | 2 +- .../{USBInterrupt.h => USBInterrupt_UC3B.h} | 0 LUFA/Drivers/USB/Core/USBController.h | 4 +- LUFA/Drivers/USB/Core/USBInterrupt.h | 4 +- LUFA/Drivers/USB/USB.h | 12 ++--- LUFA/makefile | 54 +++++++++---------- 46 files changed, 66 insertions(+), 66 deletions(-) rename LUFA/Drivers/Peripheral/AVR8/{ADC.h => ADC_AVR8.h} (100%) rename LUFA/Drivers/Peripheral/AVR8/{SPI.h => SPI_AVR8.h} (100%) rename LUFA/Drivers/Peripheral/AVR8/{Serial.c => Serial_AVR8.c} (100%) rename LUFA/Drivers/Peripheral/AVR8/{Serial.h => Serial_AVR8.h} (100%) rename LUFA/Drivers/Peripheral/AVR8/{TWI.c => TWI_AVR8.c} (100%) rename LUFA/Drivers/Peripheral/AVR8/{TWI.h => TWI_AVR8.h} (100%) rename LUFA/Drivers/USB/Core/AVR8/{Device.c => Device_AVR8.c} (98%) rename LUFA/Drivers/USB/Core/AVR8/{Device.h => Device_AVR8.h} (100%) rename LUFA/Drivers/USB/Core/AVR8/{Endpoint.c => Endpoint_AVR8.c} (99%) rename LUFA/Drivers/USB/Core/AVR8/{Endpoint.h => Endpoint_AVR8.h} (100%) rename LUFA/Drivers/USB/Core/AVR8/{Host.c => Host_AVR8.c} (99%) rename LUFA/Drivers/USB/Core/AVR8/{Host.h => Host_AVR8.h} (100%) rename LUFA/Drivers/USB/Core/AVR8/{OTG.h => OTG_AVR8.h} (100%) rename LUFA/Drivers/USB/Core/AVR8/{Pipe.c => Pipe_AVR8.c} (99%) rename LUFA/Drivers/USB/Core/AVR8/{Pipe.h => Pipe_AVR8.h} (100%) rename LUFA/Drivers/USB/Core/AVR8/{USBController.c => USBController_AVR8.c} (99%) rename LUFA/Drivers/USB/Core/AVR8/{USBController.h => USBController_AVR8.h} (100%) rename LUFA/Drivers/USB/Core/AVR8/{USBInterrupt.c => USBInterrupt_AVR8.c} (99%) rename LUFA/Drivers/USB/Core/AVR8/{USBInterrupt.h => USBInterrupt_AVR8.h} (100%) rename LUFA/Drivers/USB/Core/UC3B/{Device.c => Device_UC3B.c} (95%) rename LUFA/Drivers/USB/Core/UC3B/{Device.h => Device_UC3B.h} (100%) rename LUFA/Drivers/USB/Core/UC3B/{Endpoint.c => Endpoint_UC3B.c} (95%) rename LUFA/Drivers/USB/Core/UC3B/{Endpoint.h => Endpoint_UC3B.h} (100%) rename LUFA/Drivers/USB/Core/UC3B/{Host.c => Host_UC3B.c} (95%) rename LUFA/Drivers/USB/Core/UC3B/{Host.h => Host_UC3B.h} (100%) rename LUFA/Drivers/USB/Core/UC3B/{OTG.h => OTG_UC3B.h} (100%) rename LUFA/Drivers/USB/Core/UC3B/{Pipe.c => Pipe_UC3B.c} (95%) rename LUFA/Drivers/USB/Core/UC3B/{Pipe.h => Pipe_UC3B.h} (100%) rename LUFA/Drivers/USB/Core/UC3B/{USBController.c => USBController_UC3B.c} (95%) rename LUFA/Drivers/USB/Core/UC3B/{USBController.h => USBController_UC3B.h} (100%) rename LUFA/Drivers/USB/Core/UC3B/{USBInterrupt.c => USBInterrupt_UC3B.c} (95%) rename LUFA/Drivers/USB/Core/UC3B/{USBInterrupt.h => USBInterrupt_UC3B.h} (100%) diff --git a/LUFA.pnproj b/LUFA.pnproj index 2df46223c11..4d7c3a98309 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/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h index fe766458c8c..5a1d33032c4 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 similarity index 100% rename from LUFA/Drivers/Peripheral/AVR8/ADC.h rename to LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h diff --git a/LUFA/Drivers/Peripheral/AVR8/SPI.h b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h similarity index 100% rename from LUFA/Drivers/Peripheral/AVR8/SPI.h rename to LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial.c b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c similarity index 100% rename from LUFA/Drivers/Peripheral/AVR8/Serial.c rename to LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial.h b/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h similarity index 100% rename from LUFA/Drivers/Peripheral/AVR8/Serial.h rename to LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI.c b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c similarity index 100% rename from LUFA/Drivers/Peripheral/AVR8/TWI.c rename to LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI.h b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h similarity index 100% rename from LUFA/Drivers/Peripheral/AVR8/TWI.h rename to LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h index 3fcf05aafc5..3fdc69d672f 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 8e549ff3b6e..addee07e407 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/ARCH/Serial.c (Makefile source module name: LUFA_SRC_SERIAL) + * - LUFA/Drivers/Peripheral/ARCH/Serial_ARCH.c (Makefile source module name: LUFA_SRC_SERIAL) * * \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 e6fdd488e89..ae2672575d7 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/ARCH/TWI.c (Makefile source module name: LUFA_SRC_TWI) + * - LUFA/Drivers/Peripheral/ARCH/TWI_ARCH.c (Makefile source module name: LUFA_SRC_TWI) * * \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 similarity index 98% rename from LUFA/Drivers/USB/Core/AVR8/Device.c rename to LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c index c1b37f4533a..2473327b34c 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 similarity index 100% rename from LUFA/Drivers/USB/Core/AVR8/Device.h rename to 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 similarity index 99% rename from LUFA/Drivers/USB/Core/AVR8/Endpoint.c rename to LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c index c4e32c028bf..2ec49a5d50a 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 similarity index 100% rename from LUFA/Drivers/USB/Core/AVR8/Endpoint.h rename to 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 similarity index 99% rename from LUFA/Drivers/USB/Core/AVR8/Host.c rename to LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c index 214d1939857..e4220e3954e 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 similarity index 100% rename from LUFA/Drivers/USB/Core/AVR8/Host.h rename to 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 similarity index 100% rename from LUFA/Drivers/USB/Core/AVR8/OTG.h rename to 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 similarity index 99% rename from LUFA/Drivers/USB/Core/AVR8/Pipe.c rename to LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c index 11751321c82..2073c8ef28d 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 similarity index 100% rename from LUFA/Drivers/USB/Core/AVR8/Pipe.h rename to 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 similarity index 99% rename from LUFA/Drivers/USB/Core/AVR8/USBController.c rename to LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c index f41b5cc110c..7979811076a 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 similarity index 100% rename from LUFA/Drivers/USB/Core/AVR8/USBController.h rename to 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 similarity index 99% rename from LUFA/Drivers/USB/Core/AVR8/USBInterrupt.c rename to LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c index 34234fe84a3..f4f7ad988b2 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 similarity index 100% rename from LUFA/Drivers/USB/Core/AVR8/USBInterrupt.h rename to 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 8de719d7c2e..d6937a5c0b0 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 20754ebfc10..ddbba2737e8 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 32c27ce2233..7b5b50145d8 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 f50d618fdb9..296d7a080cd 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 2769aafdc9e..8c6e26bb763 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 similarity index 95% rename from LUFA/Drivers/USB/Core/UC3B/Device.c rename to LUFA/Drivers/USB/Core/UC3B/Device_UC3B.c index ab24b0638d2..fc6abc891e5 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 similarity index 100% rename from LUFA/Drivers/USB/Core/UC3B/Device.h rename to 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 similarity index 95% rename from LUFA/Drivers/USB/Core/UC3B/Endpoint.c rename to LUFA/Drivers/USB/Core/UC3B/Endpoint_UC3B.c index a479b43b854..a212543e0b3 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 similarity index 100% rename from LUFA/Drivers/USB/Core/UC3B/Endpoint.h rename to 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 similarity index 95% rename from LUFA/Drivers/USB/Core/UC3B/Host.c rename to LUFA/Drivers/USB/Core/UC3B/Host_UC3B.c index 03b8f60ddf1..6d49abbb258 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 similarity index 100% rename from LUFA/Drivers/USB/Core/UC3B/Host.h rename to 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 similarity index 100% rename from LUFA/Drivers/USB/Core/UC3B/OTG.h rename to 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 similarity index 95% rename from LUFA/Drivers/USB/Core/UC3B/Pipe.c rename to LUFA/Drivers/USB/Core/UC3B/Pipe_UC3B.c index ceacdfe1633..e2fa2b96011 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 similarity index 100% rename from LUFA/Drivers/USB/Core/UC3B/Pipe.h rename to 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 similarity index 95% rename from LUFA/Drivers/USB/Core/UC3B/USBController.c rename to LUFA/Drivers/USB/Core/UC3B/USBController_UC3B.c index 7b95683753b..1a80c5b0588 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 similarity index 100% rename from LUFA/Drivers/USB/Core/UC3B/USBController.h rename to 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 similarity index 95% rename from LUFA/Drivers/USB/Core/UC3B/USBInterrupt.c rename to LUFA/Drivers/USB/Core/UC3B/USBInterrupt_UC3B.c index 1f2468d0ce8..a079e4c90b9 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 similarity index 100% rename from LUFA/Drivers/USB/Core/UC3B/USBInterrupt.h rename to 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 2df6df292e5..e17a2d73de6 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 f71c2d03600..252ad5061d5 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 2c590968a44..e995fc7b6ed 100644 --- a/LUFA/Drivers/USB/USB.h +++ b/LUFA/Drivers/USB/USB.h @@ -48,12 +48,12 @@ * - LUFA/Drivers/USB/Core/HostStandardReq.c (Makefile source module name: LUFA_SRC_USB) * - LUFA/Drivers/USB/Core/PipeStream.c (Makefile source module name: LUFA_SRC_USB) * - LUFA/Drivers/USB/Core/USBTask.c (Makefile source module name: LUFA_SRC_USB) - * - LUFA/Drivers/USB/Core/ARCH/Device.c (Makefile source module name: LUFA_SRC_USB) - * - LUFA/Drivers/USB/Core/ARCH/Endpoint.c (Makefile source module name: LUFA_SRC_USB) - * - LUFA/Drivers/USB/Core/ARCH/Host.c (Makefile source module name: LUFA_SRC_USB) - * - LUFA/Drivers/USB/Core/ARCH/Pipe.c (Makefile source module name: LUFA_SRC_USB) - * - LUFA/Drivers/USB/Core/ARCH/USBController.c (Makefile source module name: LUFA_SRC_USB) - * - LUFA/Drivers/USB/Core/ARCH/USBInterrupt.c (Makefile source module name: LUFA_SRC_USB) + * - LUFA/Drivers/USB/Core/ARCH/Device_ARCH.c (Makefile source module name: LUFA_SRC_USB) + * - LUFA/Drivers/USB/Core/ARCH/Endpoint_ARCH.c (Makefile source module name: LUFA_SRC_USB) + * - LUFA/Drivers/USB/Core/ARCH/Host_ARCH.c (Makefile source module name: LUFA_SRC_USB) + * - LUFA/Drivers/USB/Core/ARCH/Pipe_ARCH.c (Makefile source module name: LUFA_SRC_USB) + * - LUFA/Drivers/USB/Core/ARCH/USBController_ARCH.c (Makefile source module name: LUFA_SRC_USB) + * - LUFA/Drivers/USB/Core/ARCH/USBInterrupt_ARCH.c (Makefile source module name: LUFA_SRC_USB) * - LUFA/Drivers/USB/Class/Common/HIDParser.c (Makefile source module name: LUFA_SRC_USB) * * \section Sec_ModDescription Module Description diff --git a/LUFA/makefile b/LUFA/makefile index 44808b9e96b..ff4dbd9ef25 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