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

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"

LUFA/Drivers/USB/HighLevel/Events.h

@@ -47,7 +47,7 @@
 		#include <avr/io.h>
 		
 		#include "../../../Common/Common.h"
-		#include "../LowLevel/USBMode.h"
+		#include "USBMode.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)

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"

LUFA/Drivers/USB/HighLevel/StdDescriptors.h

@@ -52,7 +52,7 @@
 		#include <stdbool.h>
 
 		#include "../../../Common/Common.h"
-		#include "../LowLevel/USBMode.h"
+		#include "USBMode.h"
 		#include "Events.h"
 		
 		#if defined(USB_CAN_BE_DEVICE)

LUFA/Drivers/USB/HighLevel/USBInterrupt.c

@@ -28,7 +28,6 @@
   this software.
 */
 
-#include "../LowLevel/USBMode.h"
 #include "USBInterrupt.h"
 
 void USB_INT_DisableAllInterrupts(void)

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: */

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"

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"
 

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

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)

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

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: */

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"

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

LUFA/Drivers/USB/LowLevel/HostChapter9.h

@@ -44,7 +44,8 @@
 		#include <stdbool.h>
 		
 		#include "LowLevel.h"
-		#include "StdRequestType.h"
+		#include "../HighLevel/USBMode.h"
+		#include "../HighLevel/StdRequestType.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)

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

LUFA/Drivers/USB/LowLevel/LowLevel.h

@@ -42,8 +42,10 @@
 		#include <avr/interrupt.h>
 		#include <stdbool.h>
 		
-		#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"

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

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: */

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