diff options
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Host.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/LowLevel.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/USBInterrupt.c (renamed from LUFA/Drivers/USB/HighLevel/USBInterrupt.c) | 0 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/USBInterrupt.h (renamed from LUFA/Drivers/USB/HighLevel/USBInterrupt.h) | 0 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/USB.h | 11 | ||||
| -rw-r--r-- | LUFA/ManPages/MigrationInformation.txt | 4 | ||||
| -rw-r--r-- | LUFA/makefile | 4 |
7 files changed, 13 insertions, 10 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h index a8a5b0131..97d908dea 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.h +++ b/LUFA/Drivers/USB/LowLevel/Host.h @@ -55,9 +55,9 @@ #include <util/delay.h>
#include "../../../Common/Common.h"
- #include "../HighLevel/USBInterrupt.h"
#include "../HighLevel/StdDescriptors.h"
#include "Pipe.h"
+ #include "USBInterrupt.h"
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h index 337a004a5..efa605b72 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.h +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h @@ -60,7 +60,7 @@ #include "../HighLevel/USBMode.h"
#include "../HighLevel/Events.h"
#include "../HighLevel/USBTask.h"
- #include "../HighLevel/USBInterrupt.h"
+ #include "USBInterrupt.h"
#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
#include "Host.h"
diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c index 925248d13..925248d13 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c +++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h b/LUFA/Drivers/USB/LowLevel/USBInterrupt.h index c3f778fca..c3f778fca 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h +++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.h diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h index 63b03f73b..cb59cc6ac 100644 --- a/LUFA/Drivers/USB/USB.h +++ b/LUFA/Drivers/USB/USB.h @@ -47,10 +47,10 @@ * - LUFA/Drivers/USB/LowLevel/HostChapter9.c
* - LUFA/Drivers/USB/LowLevel/LowLevel.c
* - LUFA/Drivers/USB/LowLevel/Pipe.c
+ * - LUFA/Drivers/USB/LowLevel/USBInterrupt.c
+ * - LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
* - LUFA/Drivers/USB/HighLevel/Events.c
- * - LUFA/Drivers/USB/HighLevel/USBInterrupt.c
* - LUFA/Drivers/USB/HighLevel/USBTask.c
- * - LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
*
* \section Module Description
* Driver and framework for the USB controller hardware on the USB series of AVR microcontrollers. This module
@@ -368,11 +368,12 @@ /* Includes: */
#include "HighLevel/USBTask.h"
- #include "HighLevel/USBInterrupt.h"
#include "HighLevel/Events.h"
#include "HighLevel/StdDescriptors.h"
+ #include "HighLevel/ConfigDescriptor.h"
#include "LowLevel/LowLevel.h"
+ #include "LowLevel/USBInterrupt.h"
#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
#include "LowLevel/Host.h"
@@ -389,8 +390,6 @@ #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
#include "LowLevel/OTG.h"
#endif
-
- #include "HighLevel/ConfigDescriptor.h"
-
+
#endif
diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt index baed50987..11dd346e4 100644 --- a/LUFA/ManPages/MigrationInformation.txt +++ b/LUFA/ManPages/MigrationInformation.txt @@ -21,12 +21,16 @@ * to perform other initialization before it is ready to handle global interrupts. The user application is now responsible
* for enabling global interrupts before or shortly after calling \ref USB_Init() to ensure that the enumeration process
* functions correctly.
+ * - The USBInterrupt.c USB driver source file has been relocated from LUFA/Drivers/USB/HighLevel/ to LUFA/Drivers/USB/LowLevel.
+ * Projects must update their makefile SRC values accordingly.
*
* <b>Host Mode</b>
* - The \ref USB_Init() function no longer calls sei() to enable global interrupts, as the user application may need
* to perform other initialization before it is ready to handle global interrupts. The user application is now responsible
* for enabling global interrupts before or shortly after calling \ref USB_Init() to ensure that the enumeration process
* functions correctly.
+ * - The USBInterrupt.c USB driver source file has been relocated from LUFA/Drivers/USB/HighLevel/ to LUFA/Drivers/USB/LowLevel.
+ * Projects must update their makefile SRC values accordingly.
*
* \section Sec_Migration100219 Migrating from 091223 to 100219
*
diff --git a/LUFA/makefile b/LUFA/makefile index ed1c55aa2..2a106c176 100644 --- a/LUFA/makefile +++ b/LUFA/makefile @@ -14,10 +14,10 @@ LUFA_SRC_FILES = ./Drivers/USB/LowLevel/DevChapter9.c \ ./Drivers/USB/LowLevel/HostChapter9.c \
./Drivers/USB/LowLevel/LowLevel.c \
./Drivers/USB/LowLevel/Pipe.c \
+ ./Drivers/USB/LowLevel/USBInterrupt.c \
+ ./Drivers/USB/HighLevel/ConfigDescriptor.c \
./Drivers/USB/HighLevel/Events.c \
- ./Drivers/USB/HighLevel/USBInterrupt.c \
./Drivers/USB/HighLevel/USBTask.c \
- ./Drivers/USB/HighLevel/ConfigDescriptor.c \
./Drivers/USB/Class/Device/Audio.c \
./Drivers/USB/Class/Device/CDC.c \
./Drivers/USB/Class/Device/HID.c \
|