From 1c16ae399a9f924c15d9dec54cacb1320ff0a92f Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 16 Apr 2009 23:59:14 +0000 Subject: Partial commit: change references to Drivers/AT90USBXXX to Drivers/Peripheral. --- LUFA/ChangeLog.txt | 1 + LUFA/DirectorySummaries.txt | 4 ++-- LUFA/Drivers/Board/Dataflash.h | 2 +- LUFA/Drivers/Board/Temperature.h | 2 +- LUFA/Drivers/USB/LowLevel/Endpoint.h | 10 ++++++---- LUFA/Drivers/USB/LowLevel/Pipe.h | 15 ++++++++++----- LUFA/Drivers/USB/USB.h | 2 +- LUFA/Groups.txt | 2 +- LUFA/MigrationInformation.txt | 3 +++ LUFA/Scheduler/Scheduler.h | 29 ++++++++++++++++++----------- LUFA/makefile | 4 ++-- 11 files changed, 46 insertions(+), 28 deletions(-) (limited to 'LUFA') diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt index 4aa75cbf5..760aec241 100644 --- a/LUFA/ChangeLog.txt +++ b/LUFA/ChangeLog.txt @@ -47,6 +47,7 @@ * - Updated library doxygen documentation, added groups, changed documentation macro functions to real functions for clarity * - Removed old endpoint and pipe aliased read/write/discard routines which did not have an explicit endian specifier for clarity * - Removed the ButtLoadTag.h header file, as no one used for its intended purpose anyway + * - Renamed the main Drivers/AT90USBXXX directory to Drivers/Peripheral * * * \section Sec_ChangeLog090401 Version 090401 diff --git a/LUFA/DirectorySummaries.txt b/LUFA/DirectorySummaries.txt index eba413e2c..5288dbf9d 100644 --- a/LUFA/DirectorySummaries.txt +++ b/LUFA/DirectorySummaries.txt @@ -34,13 +34,13 @@ * * This folder contains drivers for aspects other than the USB interface, board hardware or AVR peripherals. * - * \dir Drivers/AT90USBXXX + * \dir Drivers/Peripheral * \brief USB AVR peripheral driver files. * * This folder contains drivers for several of the AVR internal peripherals such as the USART, compatible with * all USB AVR models. * - * \dir Drivers/AT90USBXXX/AT90USBXXX67 + * \dir Drivers/Peripheral/AT90USBXXX67 * \brief AT90USBXXX6, AT90USBXXX7 and ATMEGAXXU4 AVR model peripheral driver files. Its original name is due to legacy * reasons. * diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h index 4e61a6bce..c235cf319 100644 --- a/LUFA/Drivers/Board/Dataflash.h +++ b/LUFA/Drivers/Board/Dataflash.h @@ -58,7 +58,7 @@ #endif /* Includes: */ - #include "../AT90USBXXX/SPI.h" + #include "../Peripheral/SPI.h" #include "../../Common/Common.h" /* Enable C linkage for C++ Compilers: */ diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h index 6e1827edd..7069e3e99 100644 --- a/LUFA/Drivers/Board/Temperature.h +++ b/LUFA/Drivers/Board/Temperature.h @@ -52,8 +52,8 @@ /* Includes: */ #include - #include "../AT90USBXXX/ADC.h" #include "../../Common/Common.h" + #include "../Peripheral/ADC.h" #if !defined(BOARD) #error #error BOARD must be set in makefile to a value specified in BoardTypes.h. diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h index 2223f0ca4..a7a282258 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.h +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h @@ -416,9 +416,9 @@ #define Endpoint_HasEndpointInterrupted(n) ((UEINT & (1 << n)) ? true : false) - #define Endpoint_IsINReady() ((UEINTX & (1 << TXINI)) ? true : false) + #define Endpoint_IsINReady() ((UEINTX & (1 << TXINI)) ? true : false) - #define Endpoint_IsOUTReceived() ((UEINTX & (1 << RXOUTI)) ? true : false) + #define Endpoint_IsOUTReceived() ((UEINTX & (1 << RXOUTI)) ? true : false) #define Endpoint_IsSETUPReceived() ((UEINTX & (1 << RXSTPI)) ? true : false) @@ -428,9 +428,11 @@ #define Endpoint_ClearControlOUT() MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE - #define Endpoint_ClearIN() MACROS{ UEINTX &= ~(1 << TXINI); UEINTX &= ~(1 << FIFOCON); }MACROE + #define Endpoint_ClearIN() MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << TXINI)); \ + UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE - #define Endpoint_ClearOUT() MACROS{ UEINTX &= ~(1 << RXOUTI); UEINTX &= ~(1 << FIFOCON); }MACROE + #define Endpoint_ClearOUT() MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << RXOUTI)); \ + UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE #define Endpoint_StallTransaction() MACROS{ UECONX |= (1 << STALLRQ); }MACROE diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index 253ce2a93..9d8dded04 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -553,15 +553,20 @@ #define Pipe_IsSETUPSent() ((UPINTX & (1 << TXSTPI)) ? true : false) - #define Pipe_ClearIN() MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE + #define Pipe_ClearIN() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << RXINI)); \ + UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE - #define Pipe_ClearControlIN() MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE + #define Pipe_ClearControlIN() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << RXINI)); \ + UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE - #define Pipe_ClearOUT() MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE + #define Pipe_ClearOUT() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXOUTI)); \ + UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE - #define Pipe_ClearControlOUT() MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE + #define Pipe_ClearControlOUT() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXOUTI)); \ + UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE - #define Pipe_ClearControlSETUP() MACROS{ UPINTX &= ~(1 << TXSTPI); UPINTX &= ~(1 << FIFOCON); }MACROE + #define Pipe_ClearControlSETUP() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXSTPI)); \ + UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE #define Pipe_IsNAKReceived() ((UPINTX & (1 << NAKEDI)) ? true : false) diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h index 75fff2fcd..4d1408849 100644 --- a/LUFA/Drivers/USB/USB.h +++ b/LUFA/Drivers/USB/USB.h @@ -60,7 +60,7 @@ #endif /* Includes: */ - #include "Highlevel/USBMode.h" + #include "HighLevel/USBMode.h" #include "HighLevel/USBTask.h" #include "HighLevel/USBInterrupt.h" #include "HighLevel/Events.h" diff --git a/LUFA/Groups.txt b/LUFA/Groups.txt index 352d92e7f..dec615bf8 100644 --- a/LUFA/Groups.txt +++ b/LUFA/Groups.txt @@ -9,7 +9,7 @@ * Functions, macros, variables, enums and types related to the control of physical board hardware. */ -/** @defgroup Group_SubsystemDrivers Subsystem Drivers +/** @defgroup Group_ChipPeripheralDrivers On-chip Peripheral Drivers * * Functions, macros, variables, enums and types related to the control of AVR subsystems. */ diff --git a/LUFA/MigrationInformation.txt b/LUFA/MigrationInformation.txt index e8e3065fa..8b8e416f5 100644 --- a/LUFA/MigrationInformation.txt +++ b/LUFA/MigrationInformation.txt @@ -15,6 +15,7 @@ * All * - The ButtLoadTag.h header has been removed, as it was never used for its intended purpose. Projects should either remove all * BUTTLOADTAG elements, or download and extract ButtLoadTag.h header from the ButtLoad project. + * - The Drivers/AT90USBXXX directory has been renamed to Drivers/Peripheral. * * Library Demos * - Most demos, bootloaders and applications have had significant changes from previous versions. Applications built off of any @@ -53,6 +54,8 @@ * been removed for clarity. Existing projects should use the "_LE" suffix on such calls to use the explicit Little Endian versions. * - The Host_IsResetBusDone() macro has been renamed to Host_IsBusResetComplete(). * - The Pipe_Ignore_Word() function has been renamed to Pipe_Discard_Word() to remain consistent with the rest of the pipe API. + * - It is no longer needed to manually include the headers from LUFA/Drivers/USB/Class, as they are now included along with the rest + * of the USB headers when LUFA/Drivers/USB/USB.h is included. * * * \section Sec_Migration090401 Migrating from 090209 to 090401 diff --git a/LUFA/Scheduler/Scheduler.h b/LUFA/Scheduler/Scheduler.h index 979156e7c..904380cd3 100644 --- a/LUFA/Scheduler/Scheduler.h +++ b/LUFA/Scheduler/Scheduler.h @@ -114,7 +114,7 @@ * } * \endcode */ - #define TASK_LIST extern TaskEntry_t Scheduler_TaskList[]; TaskEntry_t Scheduler_TaskList[] = + #define TASK_LIST TaskEntry_t Scheduler_TaskList[] = /** Constant, giving the maximum delay in scheduler ticks which can be stored in a variable of type * SchedulerDelayCounter_t. @@ -127,16 +127,23 @@ /** Task status mode constant, for passing to Scheduler_SetTaskMode() or Scheduler_SetGroupTaskMode(). */ #define TASK_STOP false - /** Starts the scheduler in its infinite loop, executing running tasks. This should be placed at the end - * of the user application's main() function, as it can never return to the calling function. - */ - #define Scheduler_Start() Scheduler_GoSchedule(TOTAL_TASKS); - - /** Initializes the scheduler so that the scheduler functions can be called before the scheduler itself - * is started. This must be executed before any scheduler function calls other than Scheduler_Start(), - * and can be omitted if no such functions could be called before the scheduler is started. - */ - #define Scheduler_Init() Scheduler_InitScheduler(TOTAL_TASKS); + /* Psuedo-Functions: */ + #if defined(__DOXYGEN__) + /** Starts the scheduler in its infinite loop, executing running tasks. This should be placed at the end + * of the user application's main() function, as it can never return to the calling function. + */ + void Scheduler_Start(void); + + /** Initializes the scheduler so that the scheduler functions can be called before the scheduler itself + * is started. This must be executed before any scheduler function calls other than Scheduler_Start(), + * and can be omitted if no such functions could be called before the scheduler is started. + */ + void Scheduler_Init(void); + #else + #define Scheduler_Start() Scheduler_GoSchedule(TOTAL_TASKS); + + #define Scheduler_Init() Scheduler_InitScheduler(TOTAL_TASKS); + #endif /* Type Defines: */ /** Type define for a pointer to a scheduler task. */ diff --git a/LUFA/makefile b/LUFA/makefile index 4020936f5..25f7b3787 100644 --- a/LUFA/makefile +++ b/LUFA/makefile @@ -23,8 +23,8 @@ LUFA_SRC_FILES = ./Drivers/USB/LowLevel/LowLevel.c \ ./Scheduler/Scheduler.c \ ./MemoryAllocator/DynAlloc.c \ ./Drivers/Board/Temperature.c \ - ./Drivers/AT90USBXXX/Serial.c \ - ./Drivers/AT90USBXXX/Serial_Stream.c \ + ./Drivers/Peripheral/Serial.c \ + ./Drivers/Peripheral/Serial_Stream.c \ all: -- cgit v1.2.3