Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
fef185a4
Commit
fef185a4
authored
Jul 29, 2009
by
Dean Camera
Browse files
Cleanup USBMode.h to simplify preprocessor logic.
parent
bb05712e
Changes
2
Hide whitespace changes
Inline
Side-by-side
LUFA/Drivers/USB/HighLevel/USBMode.h
View file @
fef185a4
...
...
@@ -33,15 +33,8 @@
/* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__)
/* Macros: */
#if ((defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \
defined
(
__AVR_AT90USB162__
)
||
defined
(
__AVR_AT90USB82__
)
||
\
defined
(
__AVR_ATmega16U4__
)
||
defined
(
__AVR_ATmega32U4__
)
||
\
defined
(
__AVR_ATmega32U6__
))
&&
!
defined
(
USB_DEVICE_ONLY
))
#define USB_DEVICE_ONLY
#endif
#if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \
/* Macros: */
#if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \
defined
(
__AVR_ATmega32U2__
)
||
defined
(
__AVR_ATmega16U2__
)
||
defined
(
__AVR_ATmega8U2__
))
#define USB_SERIES_2_AVR
#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
...
...
@@ -52,31 +45,27 @@
#define USB_SERIES_7_AVR
#endif
#if !defined(USB_SERIES_7_AVR)
#if defined(USB_HOST_ONLY)
#error USB_HOST_ONLY is not available for the currently selected USB AVR model.
#endif
#define USB_DEVICE_ONLY
#endif
#if (!defined(USB_DEVICE_ONLY) && !defined(USB_HOST_ONLY))
#define USB_CAN_BE_BOTH
#define USB_CAN_BE_HOST
#define USB_CAN_BE_DEVICE
#elif defined(USB_HOST_ONLY)
#define USB_CAN_BE_HOST
#define USB_CurrentMode USB_MODE_HOST
#elif defined(USB_DEVICE_ONLY)
#define USB_CAN_BE_DEVICE
#define USB_CurrentMode USB_MODE_DEVICE
#endif
#if (!defined(USB_SERIES_7_AVR) && defined(USB_HOST_ONLY))
#error USB_HOST_ONLY is not available for the currently selected USB AVR model.
#endif
#if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
#error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
#endif
#if defined(USE_STATIC_OPTIONS)
#define USB_Options USE_STATIC_OPTIONS
#endif
#endif
#endif
LUFA/Drivers/USB/LowLevel/LowLevel.h
View file @
fef185a4
...
...
@@ -301,6 +301,10 @@
* changed in value.
*/
extern
volatile
uint8_t
USB_CurrentMode
;
#elif defined(USB_HOST_ONLY)
#define USB_CurrentMode USB_MODE_HOST
#elif defined(USB_DEVICE_ONLY)
#define USB_CurrentMode USB_MODE_DEVICE
#endif
#if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)
...
...
@@ -311,6 +315,8 @@
* changed in value.
*/
extern
volatile
uint8_t
USB_Options
;
#elif defined(USE_STATIC_OPTIONS)
#define USB_Options USE_STATIC_OPTIONS
#endif
/* Private Interface - For use in library only: */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment