diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2013-04-28 11:31:28 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-04-28 11:31:28 +0000 |
commit | 15fb6351e513a93ceaf8a2f249625437d6d4466c (patch) | |
tree | e72248e975c56a0609d7e655ba00433f3f7b8b07 /LUFA/Drivers/USB/Core/UC3 | |
parent | c757acf1f7f3f45522024af7adf8df71a42a1dc1 (diff) | |
download | lufa-15fb6351e513a93ceaf8a2f249625437d6d4466c.tar.gz lufa-15fb6351e513a93ceaf8a2f249625437d6d4466c.tar.bz2 lufa-15fb6351e513a93ceaf8a2f249625437d6d4466c.zip |
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).
Diffstat (limited to 'LUFA/Drivers/USB/Core/UC3')
-rw-r--r-- | LUFA/Drivers/USB/Core/UC3/USBController_UC3.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h index 049882852..b76605a11 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h @@ -87,13 +87,13 @@ #if (defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR)) #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. - #endif + #endif #else #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. - #endif + #endif #endif - + /* Public Interface - May be used in end-application: */ /* Macros: */ /** \name USB Controller Option Masks */ @@ -265,20 +265,6 @@ #define USB_Options USE_STATIC_OPTIONS #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: */ #if !defined(__DOXYGEN__) /* Macros: */ |