From 7d4cccc22d60125fac111819df48af1873d11018 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 5 Apr 2009 06:27:49 +0000 Subject: [PATCH] Move StdRequestType.h, StreamCallbacks.h, USBMode.h from the LowLevel USB driver directory to the HighLevel USB driver directory, where they are more suited. --- LUFA.pnproj | 2 +- LUFA/ChangeLog.txt | 7 +++++-- LUFA/Drivers/USB/HighLevel/Events.c | 2 +- LUFA/Drivers/USB/HighLevel/Events.h | 2 +- LUFA/Drivers/USB/HighLevel/StdDescriptors.c | 3 ++- LUFA/Drivers/USB/HighLevel/StdDescriptors.h | 2 +- .../USB/{LowLevel => HighLevel}/StdRequestType.h | 0 .../USB/{LowLevel => HighLevel}/StreamCallbacks.h | 0 LUFA/Drivers/USB/HighLevel/USBInterrupt.c | 1 - LUFA/Drivers/USB/HighLevel/USBInterrupt.h | 2 +- LUFA/Drivers/USB/{LowLevel => HighLevel}/USBMode.h | 0 LUFA/Drivers/USB/HighLevel/USBTask.c | 2 +- LUFA/Drivers/USB/HighLevel/USBTask.h | 2 +- LUFA/Drivers/USB/LowLevel/DevChapter9.c | 3 ++- LUFA/Drivers/USB/LowLevel/DevChapter9.h | 2 +- LUFA/Drivers/USB/LowLevel/Endpoint.c | 3 ++- LUFA/Drivers/USB/LowLevel/Endpoint.h | 2 +- LUFA/Drivers/USB/LowLevel/Host.c | 3 ++- LUFA/Drivers/USB/LowLevel/HostChapter9.c | 3 ++- LUFA/Drivers/USB/LowLevel/HostChapter9.h | 3 ++- LUFA/Drivers/USB/LowLevel/LowLevel.c | 2 -- LUFA/Drivers/USB/LowLevel/LowLevel.h | 4 +++- LUFA/Drivers/USB/LowLevel/Pipe.c | 4 +++- LUFA/Drivers/USB/LowLevel/Pipe.h | 2 +- LUFA/Drivers/USB/USB.h | 14 +++++++------- 25 files changed, 40 insertions(+), 30 deletions(-) rename LUFA/Drivers/USB/{LowLevel => HighLevel}/StdRequestType.h (100%) rename LUFA/Drivers/USB/{LowLevel => HighLevel}/StreamCallbacks.h (100%) rename LUFA/Drivers/USB/{LowLevel => HighLevel}/USBMode.h (100%) diff --git a/LUFA.pnproj b/LUFA.pnproj index b5a5f90f1be..d2007eac4ec 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 cea1166b414..6d19e79624e 100644 --- a/LUFA/ChangeLog.txt +++ b/LUFA/ChangeLog.txt @@ -15,8 +15,11 @@ * time options * - All comments in the library, bootloaders, demos and projects have now been spell-checked and spelling mistakes/typos corrected * - Added new PIMA_DATA_SIZE() define to the Still Image Host demo - * - Add call to MassStore_WaitForDataReceived() in MassStore_GetReturnedStatus() to ensure that the CSW has been received in the extended - * MSC timeout period before continuing, to prevent long processing delays from causing the MassStore_GetReturnedStatus() to early-abort + * - Add call to MassStore_WaitForDataReceived() in MassStore_GetReturnedStatus() to ensure that the CSW has been received in the + * extended MSC timeout period before continuing, to prevent long processing delays from causing the MassStore_GetReturnedStatus() + * to early-abort + * - Move StdRequestType.h, StreamCallbacks.h, USBMode.h from the LowLevel USB driver directory to the HighLevel USB driver directory, + * where they are more suited * * \section Sec_ChangeLog090401 Version 090401 * diff --git a/LUFA/Drivers/USB/HighLevel/Events.c b/LUFA/Drivers/USB/HighLevel/Events.c index dbc428aaebc..12bf75dbe32 100644 --- a/LUFA/Drivers/USB/HighLevel/Events.c +++ b/LUFA/Drivers/USB/HighLevel/Events.c @@ -28,7 +28,7 @@ this software. */ -#include "../LowLevel/USBMode.h" +#include "USBMode.h" #define INCLUDE_FROM_EVENTS_C #include "Events.h" diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h index d53cd8eb08e..c9882cfc06d 100644 --- a/LUFA/Drivers/USB/HighLevel/Events.h +++ b/LUFA/Drivers/USB/HighLevel/Events.h @@ -47,7 +47,7 @@ #include #include "../../../Common/Common.h" - #include "../LowLevel/USBMode.h" + #include "USBMode.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.c b/LUFA/Drivers/USB/HighLevel/StdDescriptors.c index 5fdc72e809d..82ef7a7ce76 100644 --- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.c +++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.c @@ -28,7 +28,8 @@ this software. */ -#include "../LowLevel/USBMode.h" +#include "USBMode.h" + #if defined(USB_CAN_BE_DEVICE) #include "StdDescriptors.h" diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h index 491e817a96c..7a247cbda40 100644 --- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h +++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h @@ -52,7 +52,7 @@ #include #include "../../../Common/Common.h" - #include "../LowLevel/USBMode.h" + #include "USBMode.h" #include "Events.h" #if defined(USB_CAN_BE_DEVICE) diff --git a/LUFA/Drivers/USB/LowLevel/StdRequestType.h b/LUFA/Drivers/USB/HighLevel/StdRequestType.h similarity index 100% rename from LUFA/Drivers/USB/LowLevel/StdRequestType.h rename to LUFA/Drivers/USB/HighLevel/StdRequestType.h diff --git a/LUFA/Drivers/USB/LowLevel/StreamCallbacks.h b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h similarity index 100% rename from LUFA/Drivers/USB/LowLevel/StreamCallbacks.h rename to LUFA/Drivers/USB/HighLevel/StreamCallbacks.h diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c index 58faa69de4e..93bd6d084b9 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c +++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c @@ -28,7 +28,6 @@ this software. */ -#include "../LowLevel/USBMode.h" #include "USBInterrupt.h" void USB_INT_DisableAllInterrupts(void) diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h index 20b89eba186..d54de39205c 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h +++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h @@ -43,7 +43,7 @@ #include "../../../Common/Common.h" #include "../LowLevel/LowLevel.h" - #include "../LowLevel/USBMode.h" + #include "USBMode.h" #include "Events.h" /* Enable C linkage for C++ Compilers: */ diff --git a/LUFA/Drivers/USB/LowLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h similarity index 100% rename from LUFA/Drivers/USB/LowLevel/USBMode.h rename to LUFA/Drivers/USB/HighLevel/USBMode.h diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c index c58e237e34c..395f2d25e4d 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.c +++ b/LUFA/Drivers/USB/HighLevel/USBTask.c @@ -28,7 +28,7 @@ this software. */ -#include "../LowLevel/USBMode.h" +#include "USBMode.h" #define INCLUDE_FROM_USBTASK_C #include "USBTask.h" diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h index c8180f588ba..e0ca8ede827 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.h +++ b/LUFA/Drivers/USB/HighLevel/USBTask.h @@ -46,7 +46,7 @@ #include "../../../Scheduler/Scheduler.h" #include "../LowLevel/LowLevel.h" - #include "../LowLevel/USBMode.h" + #include "USBMode.h" #include "Events.h" #include "StdDescriptors.h" diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c index 44493e6989f..765627b151c 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c @@ -28,7 +28,8 @@ this software. */ -#include "USBMode.h" +#include "../HighLevel/USBMode.h" + #if defined(USB_CAN_BE_DEVICE) #define INCLUDE_FROM_DEVCHAPTER9_C diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h index 543c1a9406c..2b425e7e626 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h @@ -46,8 +46,8 @@ #include "../HighLevel/StdDescriptors.h" #include "../HighLevel/Events.h" + #include "../HighLevel/StdRequestType.h" #include "LowLevel.h" - #include "StdRequestType.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c index 3376098ed0e..aa18358c8e2 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.c +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c @@ -28,7 +28,8 @@ this software. */ -#include "USBMode.h" +#include "../HighLevel/USBMode.h" + #if defined(USB_CAN_BE_DEVICE) #define INCLUDE_FROM_ENDPOINT_C diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h index 8c22bb7f7b8..009d8622db5 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.h +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h @@ -46,7 +46,7 @@ #include "../HighLevel/USBTask.h" #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__) - #include "StreamCallbacks.h" + #include "../HighLevel/StreamCallbacks.h" #endif /* Enable C linkage for C++ Compilers: */ diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c index 04b06b3da68..52f19a5fd75 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.c +++ b/LUFA/Drivers/USB/LowLevel/Host.c @@ -28,7 +28,8 @@ this software. */ -#include "USBMode.h" +#include "../HighLevel/USBMode.h" + #if defined(USB_CAN_BE_HOST) #include "Host.h" diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.c b/LUFA/Drivers/USB/LowLevel/HostChapter9.c index fe168b72495..123a1d25f32 100644 --- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c @@ -28,7 +28,8 @@ this software. */ -#include "USBMode.h" +#include "../HighLevel/USBMode.h" + #if defined(USB_CAN_BE_HOST) #define INCLUDE_FROM_HOSTCHAPTER9_C diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.h b/LUFA/Drivers/USB/LowLevel/HostChapter9.h index 4e4fa4f08fb..84ee8ae8a82 100644 --- a/LUFA/Drivers/USB/LowLevel/HostChapter9.h +++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.h @@ -44,7 +44,8 @@ #include #include "LowLevel.h" - #include "StdRequestType.h" + #include "../HighLevel/USBMode.h" + #include "../HighLevel/StdRequestType.h" /* Enable C linkage for C++ Compilers: */ #if defined(__cplusplus) diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c index 61acf6deff0..4df8eee3b90 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.c +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c @@ -28,8 +28,6 @@ this software. */ -#include "USBMode.h" - #include "LowLevel.h" #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY)) diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h index 253d0180ef7..94d8c83c9da 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.h +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h @@ -42,8 +42,10 @@ #include #include - #include "USBMode.h" + #include "../HighLevel/USBMode.h" + #include "../../../Common/Common.h" + #include "../HighLevel/USBMode.h" #include "../HighLevel/Events.h" #include "../HighLevel/USBTask.h" #include "../HighLevel/USBInterrupt.h" diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c index 1bc08e1fb78..1218d2f2474 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.c +++ b/LUFA/Drivers/USB/LowLevel/Pipe.c @@ -27,7 +27,9 @@ arising out of or in connection with the use or performance of this software. */ -#include "USBMode.h" + +#include "../HighLevel/USBMode.h" + #if defined(USB_CAN_BE_HOST) #define INCLUDE_FROM_PIPE_C diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index 9a59dbca830..a4fdcfd20b0 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -46,7 +46,7 @@ #include "../HighLevel/USBTask.h" #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__) - #include "StreamCallbacks.h" + #include "../HighLevel/StreamCallbacks.h" #endif /* Enable C linkage for C++ Compilers: */ diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h index e90d397ce37..499c59be238 100644 --- a/LUFA/Drivers/USB/USB.h +++ b/LUFA/Drivers/USB/USB.h @@ -55,7 +55,13 @@ #endif /* Includes: */ - #include "LowLevel/USBMode.h" + #include "Highlevel/USBMode.h" + #include "HighLevel/USBTask.h" + #include "HighLevel/USBInterrupt.h" + #include "HighLevel/Events.h" + #include "HighLevel/StdDescriptors.h" + + #include "LowLevel/LowLevel.h" #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__) #include "LowLevel/Host.h" @@ -72,12 +78,6 @@ #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__) #include "LowLevel/OTG.h" #endif - - #include "LowLevel/LowLevel.h" - #include "HighLevel/USBTask.h" - #include "HighLevel/USBInterrupt.h" - #include "HighLevel/Events.h" - #include "HighLevel/StdDescriptors.h" #endif