forked from mfulz_github/qmk_firmware
Move StdRequestType.h, StreamCallbacks.h, USBMode.h from the LowLevel USB driver directory to the HighLevel USB driver directory, where they are more suited.
This commit is contained in:
parent
01d388f293
commit
7d4cccc22d
File diff suppressed because one or more lines are too long
|
@ -15,8 +15,11 @@
|
||||||
* time options
|
* time options
|
||||||
* - All comments in the library, bootloaders, demos and projects have now been spell-checked and spelling mistakes/typos corrected
|
* - 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
|
* - 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
|
* - Add call to MassStore_WaitForDataReceived() in MassStore_GetReturnedStatus() to ensure that the CSW has been received in the
|
||||||
* MSC timeout period before continuing, to prevent long processing delays from causing the MassStore_GetReturnedStatus() to early-abort
|
* 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
|
* \section Sec_ChangeLog090401 Version 090401
|
||||||
*
|
*
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../LowLevel/USBMode.h"
|
#include "USBMode.h"
|
||||||
|
|
||||||
#define INCLUDE_FROM_EVENTS_C
|
#define INCLUDE_FROM_EVENTS_C
|
||||||
#include "Events.h"
|
#include "Events.h"
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
#include <avr/io.h>
|
#include <avr/io.h>
|
||||||
|
|
||||||
#include "../../../Common/Common.h"
|
#include "../../../Common/Common.h"
|
||||||
#include "../LowLevel/USBMode.h"
|
#include "USBMode.h"
|
||||||
|
|
||||||
/* Enable C linkage for C++ Compilers: */
|
/* Enable C linkage for C++ Compilers: */
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../LowLevel/USBMode.h"
|
#include "USBMode.h"
|
||||||
|
|
||||||
#if defined(USB_CAN_BE_DEVICE)
|
#if defined(USB_CAN_BE_DEVICE)
|
||||||
|
|
||||||
#include "StdDescriptors.h"
|
#include "StdDescriptors.h"
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#include "../../../Common/Common.h"
|
#include "../../../Common/Common.h"
|
||||||
#include "../LowLevel/USBMode.h"
|
#include "USBMode.h"
|
||||||
#include "Events.h"
|
#include "Events.h"
|
||||||
|
|
||||||
#if defined(USB_CAN_BE_DEVICE)
|
#if defined(USB_CAN_BE_DEVICE)
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../LowLevel/USBMode.h"
|
|
||||||
#include "USBInterrupt.h"
|
#include "USBInterrupt.h"
|
||||||
|
|
||||||
void USB_INT_DisableAllInterrupts(void)
|
void USB_INT_DisableAllInterrupts(void)
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
|
|
||||||
#include "../../../Common/Common.h"
|
#include "../../../Common/Common.h"
|
||||||
#include "../LowLevel/LowLevel.h"
|
#include "../LowLevel/LowLevel.h"
|
||||||
#include "../LowLevel/USBMode.h"
|
#include "USBMode.h"
|
||||||
#include "Events.h"
|
#include "Events.h"
|
||||||
|
|
||||||
/* Enable C linkage for C++ Compilers: */
|
/* Enable C linkage for C++ Compilers: */
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../LowLevel/USBMode.h"
|
#include "USBMode.h"
|
||||||
|
|
||||||
#define INCLUDE_FROM_USBTASK_C
|
#define INCLUDE_FROM_USBTASK_C
|
||||||
#include "USBTask.h"
|
#include "USBTask.h"
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
|
|
||||||
#include "../../../Scheduler/Scheduler.h"
|
#include "../../../Scheduler/Scheduler.h"
|
||||||
#include "../LowLevel/LowLevel.h"
|
#include "../LowLevel/LowLevel.h"
|
||||||
#include "../LowLevel/USBMode.h"
|
#include "USBMode.h"
|
||||||
#include "Events.h"
|
#include "Events.h"
|
||||||
#include "StdDescriptors.h"
|
#include "StdDescriptors.h"
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "USBMode.h"
|
#include "../HighLevel/USBMode.h"
|
||||||
|
|
||||||
#if defined(USB_CAN_BE_DEVICE)
|
#if defined(USB_CAN_BE_DEVICE)
|
||||||
|
|
||||||
#define INCLUDE_FROM_DEVCHAPTER9_C
|
#define INCLUDE_FROM_DEVCHAPTER9_C
|
||||||
|
|
|
@ -46,8 +46,8 @@
|
||||||
|
|
||||||
#include "../HighLevel/StdDescriptors.h"
|
#include "../HighLevel/StdDescriptors.h"
|
||||||
#include "../HighLevel/Events.h"
|
#include "../HighLevel/Events.h"
|
||||||
|
#include "../HighLevel/StdRequestType.h"
|
||||||
#include "LowLevel.h"
|
#include "LowLevel.h"
|
||||||
#include "StdRequestType.h"
|
|
||||||
|
|
||||||
/* Enable C linkage for C++ Compilers: */
|
/* Enable C linkage for C++ Compilers: */
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "USBMode.h"
|
#include "../HighLevel/USBMode.h"
|
||||||
|
|
||||||
#if defined(USB_CAN_BE_DEVICE)
|
#if defined(USB_CAN_BE_DEVICE)
|
||||||
|
|
||||||
#define INCLUDE_FROM_ENDPOINT_C
|
#define INCLUDE_FROM_ENDPOINT_C
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
#include "../HighLevel/USBTask.h"
|
#include "../HighLevel/USBTask.h"
|
||||||
|
|
||||||
#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
|
#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
|
||||||
#include "StreamCallbacks.h"
|
#include "../HighLevel/StreamCallbacks.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Enable C linkage for C++ Compilers: */
|
/* Enable C linkage for C++ Compilers: */
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "USBMode.h"
|
#include "../HighLevel/USBMode.h"
|
||||||
|
|
||||||
#if defined(USB_CAN_BE_HOST)
|
#if defined(USB_CAN_BE_HOST)
|
||||||
|
|
||||||
#include "Host.h"
|
#include "Host.h"
|
||||||
|
|
|
@ -28,7 +28,8 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "USBMode.h"
|
#include "../HighLevel/USBMode.h"
|
||||||
|
|
||||||
#if defined(USB_CAN_BE_HOST)
|
#if defined(USB_CAN_BE_HOST)
|
||||||
|
|
||||||
#define INCLUDE_FROM_HOSTCHAPTER9_C
|
#define INCLUDE_FROM_HOSTCHAPTER9_C
|
||||||
|
|
|
@ -44,7 +44,8 @@
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#include "LowLevel.h"
|
#include "LowLevel.h"
|
||||||
#include "StdRequestType.h"
|
#include "../HighLevel/USBMode.h"
|
||||||
|
#include "../HighLevel/StdRequestType.h"
|
||||||
|
|
||||||
/* Enable C linkage for C++ Compilers: */
|
/* Enable C linkage for C++ Compilers: */
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
|
|
|
@ -28,8 +28,6 @@
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "USBMode.h"
|
|
||||||
|
|
||||||
#include "LowLevel.h"
|
#include "LowLevel.h"
|
||||||
|
|
||||||
#if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
|
#if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))
|
||||||
|
|
|
@ -42,8 +42,10 @@
|
||||||
#include <avr/interrupt.h>
|
#include <avr/interrupt.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#include "USBMode.h"
|
#include "../HighLevel/USBMode.h"
|
||||||
|
|
||||||
#include "../../../Common/Common.h"
|
#include "../../../Common/Common.h"
|
||||||
|
#include "../HighLevel/USBMode.h"
|
||||||
#include "../HighLevel/Events.h"
|
#include "../HighLevel/Events.h"
|
||||||
#include "../HighLevel/USBTask.h"
|
#include "../HighLevel/USBTask.h"
|
||||||
#include "../HighLevel/USBInterrupt.h"
|
#include "../HighLevel/USBInterrupt.h"
|
||||||
|
|
|
@ -27,7 +27,9 @@
|
||||||
arising out of or in connection with the use or performance of
|
arising out of or in connection with the use or performance of
|
||||||
this software.
|
this software.
|
||||||
*/
|
*/
|
||||||
#include "USBMode.h"
|
|
||||||
|
#include "../HighLevel/USBMode.h"
|
||||||
|
|
||||||
#if defined(USB_CAN_BE_HOST)
|
#if defined(USB_CAN_BE_HOST)
|
||||||
|
|
||||||
#define INCLUDE_FROM_PIPE_C
|
#define INCLUDE_FROM_PIPE_C
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
#include "../HighLevel/USBTask.h"
|
#include "../HighLevel/USBTask.h"
|
||||||
|
|
||||||
#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
|
#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
|
||||||
#include "StreamCallbacks.h"
|
#include "../HighLevel/StreamCallbacks.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Enable C linkage for C++ Compilers: */
|
/* Enable C linkage for C++ Compilers: */
|
||||||
|
|
|
@ -55,7 +55,13 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Includes: */
|
/* 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__)
|
#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
|
||||||
#include "LowLevel/Host.h"
|
#include "LowLevel/Host.h"
|
||||||
|
@ -72,12 +78,6 @@
|
||||||
#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
|
#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
|
||||||
#include "LowLevel/OTG.h"
|
#include "LowLevel/OTG.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "LowLevel/LowLevel.h"
|
|
||||||
#include "HighLevel/USBTask.h"
|
|
||||||
#include "HighLevel/USBInterrupt.h"
|
|
||||||
#include "HighLevel/Events.h"
|
|
||||||
#include "HighLevel/StdDescriptors.h"
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue