me/qmk_firmware
1
0
Fork 0
forked from mirror/qmk_firmware
Code Pull Requests Activity

Relocate USBInterrupt.c/.h from the HighLevel USB driver directory to the LowLevel directory as it is hardware-dependent.

Browse Source
This commit is contained in:
Dean Camera
2010-04-28 08:15:16 +00:00
parent 1090e767f1
commit e977774d4e
75 changed files with 217 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA/Drivers/USB/LowLevel/Host.h
View File

@@ -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)

2
LUFA/Drivers/USB/LowLevel/LowLevel.h
View File

@@ -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"

0
LUFA/Drivers/USB/HighLevel/USBInterrupt.c → LUFA/Drivers/USB/LowLevel/USBInterrupt.c
View File

0
LUFA/Drivers/USB/HighLevel/USBInterrupt.h → LUFA/Drivers/USB/LowLevel/USBInterrupt.h
View File

13
LUFA/Drivers/USB/USB.h
View File

@@ -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/HighLevel/Events.c
* - LUFA/Drivers/USB/HighLevel/USBInterrupt.c
* - LUFA/Drivers/USB/HighLevel/USBTask.c
* - LUFA/Drivers/USB/LowLevel/USBInterrupt.c
* - LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
* - LUFA/Drivers/USB/HighLevel/Events.c
* - LUFA/Drivers/USB/HighLevel/USBTask.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

4
LUFA/ManPages/MigrationInformation.txt
View File

@@ -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
*

6
LUFA/makefile
View File

@@ -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/HighLevel/Events.c \
./Drivers/USB/HighLevel/USBInterrupt.c \
./Drivers/USB/HighLevel/USBTask.c \
./Drivers/USB/LowLevel/USBInterrupt.c \
./Drivers/USB/HighLevel/ConfigDescriptor.c \
./Drivers/USB/HighLevel/Events.c \
./Drivers/USB/HighLevel/USBTask.c \
./Drivers/USB/Class/Device/Audio.c \
./Drivers/USB/Class/Device/CDC.c \
./Drivers/USB/Class/Device/HID.c \