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

pull/1469/head
Dean Camera 14 years ago
parent cad5e9ffca
commit b6a3c78fa3

File diff suppressed because one or more lines are too long

@ -68,7 +68,7 @@
/* Includes: */ /* Includes: */
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/ADC.h" #include "AVR8/ADC_AVR8.h"
#else #else
#error The ADC peripheral driver is not currently available for your selected architecture. #error The ADC peripheral driver is not currently available for your selected architecture.
#endif #endif

@ -67,7 +67,7 @@
/* Includes: */ /* Includes: */
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/SPI.h" #include "AVR8/SPI_AVR8.h"
#else #else
#error The SPI peripheral driver is not currently available for your selected architecture. #error The SPI peripheral driver is not currently available for your selected architecture.
#endif #endif

@ -44,7 +44,7 @@
* *
* \section Sec_Dependencies Module Source Dependencies * \section Sec_Dependencies Module Source Dependencies
* The following files must be built with any user project that uses this module: * 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 * \section Sec_ModDescription Module Description
* Hardware serial USART driver. This module provides an easy to use driver for the setup and transfer * Hardware serial USART driver. This module provides an easy to use driver for the setup and transfer
@ -67,7 +67,7 @@
/* Includes: */ /* Includes: */
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/Serial.h" #include "AVR8/Serial_AVR8.h"
#else #else
#error The Serial peripheral driver is not currently available for your selected architecture. #error The Serial peripheral driver is not currently available for your selected architecture.
#endif #endif

@ -44,7 +44,7 @@
* *
* \section Sec_Dependencies Module Source Dependencies * \section Sec_Dependencies Module Source Dependencies
* The following files must be built with any user project that uses this module: * 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 * \section Sec_ModDescription Module Description
* Hardware TWI driver. This module provides an easy to use driver for the setup and transfer of data over * Hardware TWI driver. This module provides an easy to use driver for the setup and transfer of data over
@ -67,7 +67,7 @@
/* Includes: */ /* Includes: */
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/TWI.h" #include "AVR8/TWI_AVR8.h"
#else #else
#error The TWI peripheral driver is not currently available for your selected architecture. #error The TWI peripheral driver is not currently available for your selected architecture.
#endif #endif

@ -33,7 +33,7 @@
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Device.h" #include "../Device.h"
void USB_Device_SendRemoteWakeup(void) void USB_Device_SendRemoteWakeup(void)
{ {

@ -33,7 +33,7 @@
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Endpoint.h" #include "../Endpoint.h"
#if !defined(FIXED_CONTROL_ENDPOINT_SIZE) #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE; uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;

@ -34,7 +34,7 @@
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#define __INCLUDE_FROM_HOST_C #define __INCLUDE_FROM_HOST_C
#include "Host.h" #include "../Host.h"
void USB_Host_ProcessNextHostState(void) void USB_Host_ProcessNextHostState(void)
{ {

@ -33,7 +33,7 @@
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Pipe.h" #include "../Pipe.h"
uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE; uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;

@ -30,7 +30,7 @@
#define __INCLUDE_FROM_USB_DRIVER #define __INCLUDE_FROM_USB_DRIVER
#define __INCLUDE_FROM_USB_CONTROLLER_C #define __INCLUDE_FROM_USB_CONTROLLER_C
#include "USBController.h" #include "../USBController.h"
#if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY)) #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
volatile uint8_t USB_CurrentMode = USB_MODE_None; volatile uint8_t USB_CurrentMode = USB_MODE_None;

@ -29,7 +29,7 @@
*/ */
#define __INCLUDE_FROM_USB_DRIVER #define __INCLUDE_FROM_USB_DRIVER
#include "USBInterrupt.h" #include "../USBInterrupt.h"
void USB_INT_DisableAllInterrupts(void) void USB_INT_DisableAllInterrupts(void)
{ {

@ -56,9 +56,9 @@
#include "Endpoint.h" #include "Endpoint.h"
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/Device.h" #include "AVR8/Device_AVR8.h"
#elif (ARCH == ARCH_UC3B) #elif (ARCH == ARCH_UC3B)
#include "UC3B/Device.h" #include "UC3B/Device_UC3B.h"
#endif #endif
/* Preprocessor Checks: */ /* Preprocessor Checks: */

@ -76,9 +76,9 @@
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/Endpoint.h" #include "AVR8/Endpoint_AVR8.h"
#elif (ARCH == ARCH_UC3B) #elif (ARCH == ARCH_UC3B)
#include "UC3B/Endpoint.h" #include "UC3B/Endpoint_UC3B.h"
#endif #endif
/* Preprocessor Checks: */ /* Preprocessor Checks: */

@ -53,9 +53,9 @@
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/Host.h" #include "AVR8/Host_AVR8.h"
#elif (ARCH == ARCH_UC3B) #elif (ARCH == ARCH_UC3B)
#include "UC3B/Host.h" #include "UC3B/Host_UC3B.h"
#endif #endif
/* Preprocessor Checks: */ /* Preprocessor Checks: */

@ -54,9 +54,9 @@
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/OTG.h" #include "AVR8/OTG_AVR8.h"
#elif (ARCH == ARCH_UC3B) #elif (ARCH == ARCH_UC3B)
#include "UC3B/OTG.h" #include "UC3B/OTG_UC3B.h"
#endif #endif
/* Preprocessor Checks: */ /* Preprocessor Checks: */

@ -86,9 +86,9 @@
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/Pipe.h" #include "AVR8/Pipe_AVR8.h"
#elif (ARCH == ARCH_UC3B) #elif (ARCH == ARCH_UC3B)
#include "UC3B/Pipe.h" #include "UC3B/Pipe_UC3B.h"
#endif #endif
/* Preprocessor Checks: */ /* Preprocessor Checks: */

@ -33,7 +33,7 @@
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Device.h" #include "../Device.h"
void USB_Device_SendRemoteWakeup(void) void USB_Device_SendRemoteWakeup(void)
{ {

@ -33,7 +33,7 @@
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Endpoint.h" #include "../Endpoint.h"
#if !defined(FIXED_CONTROL_ENDPOINT_SIZE) #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE; uint8_t USB_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;

@ -34,7 +34,7 @@
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#define __INCLUDE_FROM_HOST_C #define __INCLUDE_FROM_HOST_C
#include "Host.h" #include "../Host.h"
void USB_Host_ProcessNextHostState(void) void USB_Host_ProcessNextHostState(void)
{ {

@ -33,7 +33,7 @@
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Pipe.h" #include "../Pipe.h"
uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE; uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;

@ -30,7 +30,7 @@
#define __INCLUDE_FROM_USB_DRIVER #define __INCLUDE_FROM_USB_DRIVER
#define __INCLUDE_FROM_USB_CONTROLLER_C #define __INCLUDE_FROM_USB_CONTROLLER_C
#include "USBController.h" #include "../USBController.h"
#if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY)) #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
volatile uint8_t USB_CurrentMode = USB_MODE_None; volatile uint8_t USB_CurrentMode = USB_MODE_None;

@ -29,7 +29,7 @@
*/ */
#define __INCLUDE_FROM_USB_DRIVER #define __INCLUDE_FROM_USB_DRIVER
#include "USBInterrupt.h" #include "../USBInterrupt.h"
void USB_INT_DisableAllInterrupts(void) void USB_INT_DisableAllInterrupts(void)
{ {

@ -52,9 +52,9 @@
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/USBController.h" #include "AVR8/USBController_AVR8.h"
#elif (ARCH == ARCH_UC3B) #elif (ARCH == ARCH_UC3B)
#include "UC3B/USBController.h" #include "UC3B/USBController_UC3B.h"
#endif #endif
/* Preprocessor Checks and Defines: */ /* Preprocessor Checks and Defines: */

@ -45,9 +45,9 @@
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/USBInterrupt.h" #include "AVR8/USBInterrupt_AVR8.h"
#elif (ARCH == ARCH_UC3B) #elif (ARCH == ARCH_UC3B)
#include "UC3B/USBInterrupt.h" #include "UC3B/USBInterrupt_UC3B.h"
#endif #endif
/* Preprocessor Checks: */ /* Preprocessor Checks: */

@ -48,12 +48,12 @@
* - LUFA/Drivers/USB/Core/HostStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i> * - 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/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/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>/Device_<i>ARCH</i>.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>/Endpoint_<i>ARCH</i>.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>/Host_<i>ARCH</i>.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>/Pipe_<i>ARCH</i>.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>/USBController_<i>ARCH</i>.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>/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> * - LUFA/Drivers/USB/Class/Common/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
* *
* \section Sec_ModDescription Module Description * \section Sec_ModDescription Module Description

@ -22,36 +22,36 @@ ifeq ($(origin ARCH), undefined)
endif endif
# Define module source file lists # Define module source file lists
LUFA_SRC_USB = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device.c \ LUFA_SRC_USB = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint_$(ARCH).c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host_$(ARCH).c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe_$(ARCH).c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController_$(ARCH).c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt.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/ConfigDescriptor.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/EndpointStream.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/EndpointStream.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/PipeStream.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/PipeStream.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c
LUFA_SRC_USBCLASS = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/Audio.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/CDC.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HID.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/MassStorage.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDI.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/Device/RNDIS.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDC.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/HID.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorage.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/MIDI.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Printer.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/RNDIS.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImage.c $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImage.c
LUFA_SRC_TEMPERATURE = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c LUFA_SRC_TEMPERATURE = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c
LUFA_SRC_SERIAL = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial.c LUFA_SRC_SERIAL = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c
LUFA_SRC_TWI = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI.c LUFA_SRC_TWI = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c
LUFA_SRC_SCHEDULER = $(LUFA_ROOT_PATH)/Scheduler/Scheduler.c LUFA_SRC_SCHEDULER = $(LUFA_ROOT_PATH)/Scheduler/Scheduler.c

Loading…
Cancel
Save