aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-04-28 08:15:16 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-04-28 08:15:16 +0000
commite977774d4e529ff2f668549197323924ff2a53d4 (patch)
tree77d56fd87a08545ae147aa7a8419819fb09b3ffc /LUFA/Drivers/USB
parent1090e767f111121fb3e22fde3c66326f369f80cd (diff)
downloadlufa-e977774d4e529ff2f668549197323924ff2a53d4.tar.gz
lufa-e977774d4e529ff2f668549197323924ff2a53d4.tar.bz2
lufa-e977774d4e529ff2f668549197323924ff2a53d4.zip
Relocate USBInterrupt.c/.h from the HighLevel USB driver directory to the LowLevel directory as it is hardware-dependent.
Diffstat (limited to 'LUFA/Drivers/USB')
-rw-r--r--LUFA/Drivers/USB/LowLevel/Host.h2
-rw-r--r--LUFA/Drivers/USB/LowLevel/LowLevel.h2
-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.h11
5 files changed, 7 insertions, 8 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