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. --- Demos/Device/AudioInput/AudioInput.h | 2 +- Demos/Device/RNDISEthernet/ProtocolDecoders.h | 2 +- Demos/Device/RNDISEthernet/RNDISEthernet.h | 2 +- Demos/Device/RNDISEthernet/makefile | 4 +-- Demos/Device/USBtoSerial/USBtoSerial.h | 2 +- Demos/Device/USBtoSerial/makefile | 2 +- Demos/Host/CDCHost/CDCHost.h | 2 +- Demos/Host/CDCHost/makefile | 4 +-- Demos/Host/GenericHIDHost/GenericHIDHost.h | 2 +- Demos/Host/GenericHIDHost/makefile | 4 +-- Demos/Host/KeyboardHost/KeyboardHost.h | 2 +- Demos/Host/KeyboardHost/makefile | 4 +-- .../KeyboardHostWithParser.h | 2 +- Demos/Host/KeyboardHostWithParser/makefile | 4 +-- Demos/Host/MassStorageHost/MassStorageHost.h | 2 +- Demos/Host/MassStorageHost/makefile | 4 +-- Demos/Host/MouseHost/MouseHost.h | 2 +- Demos/Host/MouseHost/makefile | 4 +-- .../Host/MouseHostWithParser/MouseHostWithParser.h | 2 +- Demos/Host/MouseHostWithParser/makefile | 4 +-- Demos/Host/StillImageHost/StillImageHost.h | 2 +- Demos/Host/StillImageHost/makefile | 4 +-- Demos/OTG/TestApp/TestApp.c | 2 +- Demos/OTG/TestApp/TestApp.h | 4 +-- Demos/OTG/TestApp/TestEvents.h | 2 +- Demos/OTG/TestApp/makefile | 4 +-- LUFA.pnproj | 2 +- 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 +-- 38 files changed, 84 insertions(+), 66 deletions(-) diff --git a/Demos/Device/AudioInput/AudioInput.h b/Demos/Device/AudioInput/AudioInput.h index c068baff9..b7174d1f8 100644 --- a/Demos/Device/AudioInput/AudioInput.h +++ b/Demos/Device/AudioInput/AudioInput.h @@ -46,7 +46,7 @@ #include // Library Version Information #include // USB Functionality #include // LEDs driver - #include // ADC driver + #include // ADC driver #include // Simple scheduler for task management /* Macros: */ diff --git a/Demos/Device/RNDISEthernet/ProtocolDecoders.h b/Demos/Device/RNDISEthernet/ProtocolDecoders.h index 06e4c0ad4..c8101162d 100644 --- a/Demos/Device/RNDISEthernet/ProtocolDecoders.h +++ b/Demos/Device/RNDISEthernet/ProtocolDecoders.h @@ -39,7 +39,7 @@ /* Includes: */ #include - #include + #include #include "EthernetProtocols.h" #include "Ethernet.h" diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.h b/Demos/Device/RNDISEthernet/RNDISEthernet.h index f21ace774..732ad5380 100644 --- a/Demos/Device/RNDISEthernet/RNDISEthernet.h +++ b/Demos/Device/RNDISEthernet/RNDISEthernet.h @@ -56,7 +56,7 @@ #include // LEDs driver #include // Simple scheduler for task management - #include + #include /* Macros: */ /** Notification value to indicate that a frame is ready to be read by the host. */ diff --git a/Demos/Device/RNDISEthernet/makefile b/Demos/Device/RNDISEthernet/makefile index 1a068a033..23de96761 100644 --- a/Demos/Device/RNDISEthernet/makefile +++ b/Demos/Device/RNDISEthernet/makefile @@ -143,8 +143,8 @@ SRC = $(TARGET).c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ # List C++ source files here. (C dependencies are automatically generated.) diff --git a/Demos/Device/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h index 8fb2c1617..0352f5d75 100644 --- a/Demos/Device/USBtoSerial/USBtoSerial.h +++ b/Demos/Device/USBtoSerial/USBtoSerial.h @@ -47,7 +47,7 @@ #include // Library Version Information #include // USB Functionality - #include // USART driver + #include // USART driver #include // LEDs driver #include // Simple scheduler for task management diff --git a/Demos/Device/USBtoSerial/makefile b/Demos/Device/USBtoSerial/makefile index 62939ab60..650a67704 100644 --- a/Demos/Device/USBtoSerial/makefile +++ b/Demos/Device/USBtoSerial/makefile @@ -127,7 +127,7 @@ SRC = $(TARGET).c \ Descriptors.c \ RingBuff.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ diff --git a/Demos/Host/CDCHost/CDCHost.h b/Demos/Host/CDCHost/CDCHost.h index c348acaef..48f480791 100644 --- a/Demos/Host/CDCHost/CDCHost.h +++ b/Demos/Host/CDCHost/CDCHost.h @@ -46,7 +46,7 @@ #include // Library Version Information #include // ANSI Terminal Escape Codes #include // USB Functionality - #include // Serial stream driver + #include // Serial stream driver #include // LEDs driver #include // Simple scheduler for task management diff --git a/Demos/Host/CDCHost/makefile b/Demos/Host/CDCHost/makefile index 80b986ad5..4c5dc1e43 100644 --- a/Demos/Host/CDCHost/makefile +++ b/Demos/Host/CDCHost/makefile @@ -126,8 +126,8 @@ LUFA_PATH = ../../.. SRC = $(TARGET).c \ ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.h b/Demos/Host/GenericHIDHost/GenericHIDHost.h index 8483fa686..008188a61 100644 --- a/Demos/Host/GenericHIDHost/GenericHIDHost.h +++ b/Demos/Host/GenericHIDHost/GenericHIDHost.h @@ -47,7 +47,7 @@ #include // Library Version Information #include // ANSI Terminal Escape Codes #include // USB Functionality - #include // Serial stream driver + #include // Serial stream driver #include // LEDs driver #include // Simple scheduler for task management diff --git a/Demos/Host/GenericHIDHost/makefile b/Demos/Host/GenericHIDHost/makefile index 32e32aaea..d54317a69 100644 --- a/Demos/Host/GenericHIDHost/makefile +++ b/Demos/Host/GenericHIDHost/makefile @@ -126,8 +126,8 @@ LUFA_PATH = ../../.. SRC = $(TARGET).c \ ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ diff --git a/Demos/Host/KeyboardHost/KeyboardHost.h b/Demos/Host/KeyboardHost/KeyboardHost.h index 2c541f6a5..14d92c0c6 100644 --- a/Demos/Host/KeyboardHost/KeyboardHost.h +++ b/Demos/Host/KeyboardHost/KeyboardHost.h @@ -47,7 +47,7 @@ #include // Library Version Information #include // ANSI Terminal Escape Codes #include // USB Functionality - #include // Serial stream driver + #include // Serial stream driver #include // LEDs driver #include // Simple scheduler for task management diff --git a/Demos/Host/KeyboardHost/makefile b/Demos/Host/KeyboardHost/makefile index cb720f2bf..9d65c436e 100644 --- a/Demos/Host/KeyboardHost/makefile +++ b/Demos/Host/KeyboardHost/makefile @@ -126,8 +126,8 @@ LUFA_PATH = ../../.. SRC = $(TARGET).c \ ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ diff --git a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h index 112dbfdec..d142bda9d 100644 --- a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h +++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h @@ -41,7 +41,7 @@ #include // Library Version Information #include // ANSI Terminal Escape Codes #include // USB Functionality - #include // Serial stream driver + #include // Serial stream driver #include // LEDs driver #include // Simple scheduler for task management diff --git a/Demos/Host/KeyboardHostWithParser/makefile b/Demos/Host/KeyboardHostWithParser/makefile index 0a2e95eac..7a74768d7 100644 --- a/Demos/Host/KeyboardHostWithParser/makefile +++ b/Demos/Host/KeyboardHostWithParser/makefile @@ -127,8 +127,8 @@ SRC = $(TARGET).c \ ConfigDescriptor.c \ HIDReport.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h index 73a69c0d8..3791d2734 100644 --- a/Demos/Host/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/MassStorageHost/MassStorageHost.h @@ -50,7 +50,7 @@ #include // Library Version Information #include // ANSI Terminal Escape Codes #include // USB Functionality - #include // Serial stream driver + #include // Serial stream driver #include // LEDs driver #include // Hardware Button driver #include // Simple scheduler for task management diff --git a/Demos/Host/MassStorageHost/makefile b/Demos/Host/MassStorageHost/makefile index 5d853e4be..bfa40726f 100644 --- a/Demos/Host/MassStorageHost/makefile +++ b/Demos/Host/MassStorageHost/makefile @@ -127,8 +127,8 @@ SRC = $(TARGET).c \ ConfigDescriptor.c \ MassStoreCommands.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ diff --git a/Demos/Host/MouseHost/MouseHost.h b/Demos/Host/MouseHost/MouseHost.h index c7e5d2be2..a87d6f874 100644 --- a/Demos/Host/MouseHost/MouseHost.h +++ b/Demos/Host/MouseHost/MouseHost.h @@ -47,7 +47,7 @@ #include // Library Version Information #include // ANSI Terminal Escape Codes #include // USB Functionality - #include // Serial stream driver + #include // Serial stream driver #include // LEDs driver #include // Simple scheduler for task management diff --git a/Demos/Host/MouseHost/makefile b/Demos/Host/MouseHost/makefile index 65c9dd676..bde4df209 100644 --- a/Demos/Host/MouseHost/makefile +++ b/Demos/Host/MouseHost/makefile @@ -126,8 +126,8 @@ LUFA_PATH = ../../.. SRC = $(TARGET).c \ ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h index f808745d7..746ffe159 100644 --- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.h +++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h @@ -41,7 +41,7 @@ #include // Library Version Information #include // ANSI Terminal Escape Codes #include // USB Functionality - #include // Serial stream driver + #include // Serial stream driver #include // LEDs driver #include // Simple scheduler for task management diff --git a/Demos/Host/MouseHostWithParser/makefile b/Demos/Host/MouseHostWithParser/makefile index bc4ca6ca2..5d9d2da4c 100644 --- a/Demos/Host/MouseHostWithParser/makefile +++ b/Demos/Host/MouseHostWithParser/makefile @@ -127,8 +127,8 @@ SRC = $(TARGET).c \ ConfigDescriptor.c \ HIDReport.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ diff --git a/Demos/Host/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h index e4d2e85f8..a1ea47f62 100644 --- a/Demos/Host/StillImageHost/StillImageHost.h +++ b/Demos/Host/StillImageHost/StillImageHost.h @@ -48,7 +48,7 @@ #include // ANSI Terminal Escape Codes #include // USB Functionality - #include // Serial stream driver + #include // Serial stream driver #include // LED driver #include // Simple scheduler for task management diff --git a/Demos/Host/StillImageHost/makefile b/Demos/Host/StillImageHost/makefile index e34c18f39..82aa7284d 100644 --- a/Demos/Host/StillImageHost/makefile +++ b/Demos/Host/StillImageHost/makefile @@ -126,8 +126,8 @@ SRC = $(TARGET).c \ ConfigDescriptor.c \ StillImageCommands.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c index e72c191b3..d5a752322 100644 --- a/Demos/OTG/TestApp/TestApp.c +++ b/Demos/OTG/TestApp/TestApp.c @@ -130,7 +130,7 @@ TASK(TestApp_CheckTemp) if (Scheduler_HasDelayElapsed(10000, &DelayCounter)) { printf_P(PSTR("Current temperature: %d Degrees Celcius\r\n\r\n"), - (int)Temperature_GetTemperature()); + (int8_t)Temperature_GetTemperature()); /* Reset the delay counter, ready to count another 10000 tick interval */ Scheduler_ResetDelay(&DelayCounter); diff --git a/Demos/OTG/TestApp/TestApp.h b/Demos/OTG/TestApp/TestApp.h index bf2d56098..5e88dae61 100644 --- a/Demos/OTG/TestApp/TestApp.h +++ b/Demos/OTG/TestApp/TestApp.h @@ -47,8 +47,8 @@ #include // Simple scheduler for task management #include // Auto-defragmenting Dynamic Memory allocation #include // ANSI Terminal Escape Codes - #include // ADC driver - #include // USART Stream driver + #include // ADC driver + #include // USART Stream driver #include // Joystick driver #include // LED driver #include // Hardware Button driver diff --git a/Demos/OTG/TestApp/TestEvents.h b/Demos/OTG/TestApp/TestEvents.h index 6ba06aed8..adaf87595 100644 --- a/Demos/OTG/TestApp/TestEvents.h +++ b/Demos/OTG/TestApp/TestEvents.h @@ -42,7 +42,7 @@ #include // Commonly used macros #include // USB Functionality #include // LED driver - #include // USART Stream driver + #include // USART Stream driver #include // ANSI Terminal Escape Codes #include // Simple scheduler for task management diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile index 0d1983175..a7429669e 100644 --- a/Demos/OTG/TestApp/makefile +++ b/Demos/OTG/TestApp/makefile @@ -129,8 +129,8 @@ SRC = $(TARGET).c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/MemoryAllocator/DynAlloc.c \ $(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ - $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \ + $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ diff --git a/LUFA.pnproj b/LUFA.pnproj index d5bb11eeb..358cbf0b3 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/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