diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-14 07:44:02 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-14 07:44:02 +0000 |
commit | 4d3a594f3e26447ba223ac58292c9a77480ceed3 (patch) | |
tree | 1bf9da2a2290ccdb594dffd8af29cfafae231900 /LUFA/Drivers/USB/LowLevel/Device.h | |
parent | 9798440ca4f694e7cd8312a51b82e59589f1ebeb (diff) | |
download | lufa-4d3a594f3e26447ba223ac58292c9a77480ceed3.tar.gz lufa-4d3a594f3e26447ba223ac58292c9a77480ceed3.tar.bz2 lufa-4d3a594f3e26447ba223ac58292c9a77480ceed3.zip |
Changed per-device controller preprocessor checks over to per-device series for better device control.
Fixed error in Endpoint.c using HSOFI rather than SOFI for counting elapsed milliseconds.
Diffstat (limited to 'LUFA/Drivers/USB/LowLevel/Device.h')
-rw-r--r-- | LUFA/Drivers/USB/LowLevel/Device.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h index 31d612c0a..6661b9e0c 100644 --- a/LUFA/Drivers/USB/LowLevel/Device.h +++ b/LUFA/Drivers/USB/LowLevel/Device.h @@ -48,9 +48,14 @@ #include "../HighLevel/StdDescriptors.h"
#include "Endpoint.h"
+ /* Preprocessor Checks: */
+ #if (defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))
+ #error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
+ #endif
+
/* Public Interface - May be used in end-application: */
/* Macros: */
- #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) || defined(__DOXYGEN__)
+ #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__)
/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
* USB interface should be initialized in low speed (1.5Mb/s) mode.
*
|