gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 04:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move USB mode enum into the top level USB controller header, as it is common to all architectures (even if not all modes are supported).

Browse Source
This commit is contained in:
Dean Camera 2013-04-28 11:31:28 +00:00
parent c757acf1f7
commit 15fb6351e5
4 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
View File

@ -302,20 +302,6 @@
#define USB_Options USE_STATIC_OPTIONS #define USB_Options USE_STATIC_OPTIONS
#endif #endif
/* Enums: */
/** Enum for the possible USB controller modes, for initialization via \ref USB_Init() and indication back to the
* user application via \ref USB_CurrentMode.
*/
enum USB_Modes_t
{
USB_MODE_None = 0, /**< Indicates that the controller is currently not initialized in any specific USB mode. */
USB_MODE_Device = 1, /**< Indicates that the controller is currently initialized in USB Device mode. */
USB_MODE_Host = 2, /**< Indicates that the controller is currently initialized in USB Host mode. */
USB_MODE_UID = 3, /**< Indicates that the controller should determine the USB mode from the UID pin of the
* USB connector.
*/
};
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Function Prototypes: */ /* Function Prototypes: */

20
LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
View File

@ -87,13 +87,13 @@
#if (defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR)) #if (defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR))
#if ((F_USB < 12000000) || (F_USB % 12000000)) #if ((F_USB < 12000000) || (F_USB % 12000000))
#error Invalid F_USB specified. F_USB must be a multiple of 12MHz for UC3A3 and UC3A4 devices. #error Invalid F_USB specified. F_USB must be a multiple of 12MHz for UC3A3 and UC3A4 devices.
#endif #endif
#else #else
#if ((F_USB < 48000000) || (F_USB % 48000000)) #if ((F_USB < 48000000) || (F_USB % 48000000))
#error Invalid F_USB specified. F_USB must be a multiple of 48MHz for UC3A and UC3B devices. #error Invalid F_USB specified. F_USB must be a multiple of 48MHz for UC3A and UC3B devices.
#endif #endif
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */
/* Macros: */ /* Macros: */
/** \name USB Controller Option Masks */ /** \name USB Controller Option Masks */
@ -265,20 +265,6 @@
#define USB_Options USE_STATIC_OPTIONS #define USB_Options USE_STATIC_OPTIONS
#endif #endif
/* Enums: */
/** Enum for the possible USB controller modes, for initialization via \ref USB_Init() and indication back to the
* user application via \ref USB_CurrentMode.
*/
enum USB_Modes_t
{
USB_MODE_None = 0, /**< Indicates that the controller is currently not initialized in any specific USB mode. */
USB_MODE_Device = 1, /**< Indicates that the controller is currently initialized in USB Device mode. */
USB_MODE_Host = 2, /**< Indicates that the controller is currently initialized in USB Host mode. */
USB_MODE_UID = 3, /**< Indicates that the controller should determine the USB mode from the UID pin of the
* USB connector.
*/
};
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Macros: */ /* Macros: */

14
LUFA/Drivers/USB/Core/USBController.h
View File

@ -131,6 +131,20 @@
#define EP_TYPE_INTERRUPT 0x03 #define EP_TYPE_INTERRUPT 0x03
//@} //@}
/* Enums: */
/** Enum for the possible USB controller modes, for initialization via \ref USB_Init() and indication back to the
* user application via \ref USB_CurrentMode.
*/
enum USB_Modes_t
{
USB_MODE_None = 0, /**< Indicates that the controller is currently not initialized in any specific USB mode. */
USB_MODE_Device = 1, /**< Indicates that the controller is currently initialized in USB Device mode. */
USB_MODE_Host = 2, /**< Indicates that the controller is currently initialized in USB Host mode. */
USB_MODE_UID = 3, /**< Indicates that the controller should determine the USB mode from the UID pin of the
* USB connector.
*/
};
/* Architecture Includes: */ /* Architecture Includes: */
#if (ARCH == ARCH_AVR8) #if (ARCH == ARCH_AVR8)
#include "AVR8/USBController_AVR8.h" #include "AVR8/USBController_AVR8.h"

10
LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h
View File

@ -273,16 +273,6 @@
#define USB_Options USE_STATIC_OPTIONS #define USB_Options USE_STATIC_OPTIONS
#endif #endif
/* Enums: */
/** Enum for the possible USB controller modes, for initialization via \ref USB_Init() and indication back to the
* user application via \ref USB_CurrentMode.
*/
enum USB_Modes_t
{
USB_MODE_None = 0, /**< Indicates that the controller is currently not initialized in any specific USB mode. */
USB_MODE_Device = 1, /**< Indicates that the controller is currently initialized in USB Device mode. */
};
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Function Prototypes: */ /* Function Prototypes: */