diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-02-18 23:33:12 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-02-18 23:33:12 +0000 |
| commit | 1132488e8f80b43473ce4e53db9dd8ce12e87e13 (patch) | |
| tree | c0d138685f664d079e9218d611227aab5919bc15 /LUFA/Common | |
| parent | 04b8360b15e3f1a78cb74e97b0c9acbb068f025a (diff) | |
| download | lufa-1132488e8f80b43473ce4e53db9dd8ce12e87e13.tar.gz lufa-1132488e8f80b43473ce4e53db9dd8ce12e87e13.tar.bz2 lufa-1132488e8f80b43473ce4e53db9dd8ce12e87e13.zip | |
Add build tests to verify correct compilation of as many modules as possible under as many architectures as possible.
Fix broken compilation of LUFA under C++ compilers when the Serial peripheral module header file is included in a C++ source file.
Fix missing semicolon in the UC3 architecture host pipe functions.
Fix failed compilation for the XMEGA architecture if USB_DEVICE_ONLY us not specified.
Diffstat (limited to 'LUFA/Common')
| -rw-r--r-- | LUFA/Common/Common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h index 35c739a3a..4c9aa4932 100644 --- a/LUFA/Common/Common.h +++ b/LUFA/Common/Common.h @@ -89,6 +89,7 @@ #include <avr/pgmspace.h> #include <avr/eeprom.h> #include <avr/boot.h> + #include <math.h> #include <util/delay.h> typedef uint8_t uint_reg_t; @@ -119,6 +120,7 @@ #include <avr/interrupt.h> #include <avr/pgmspace.h> #include <avr/eeprom.h> + #include <math.h> #include <util/delay.h> typedef uint8_t uint_reg_t; @@ -256,7 +258,7 @@ while (Milliseconds--) { __builtin_mtsr(AVR32_COUNT, 0); - while (__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000)); + while ((uint32_t)__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000)); } #elif (ARCH == ARCH_XMEGA) if (GCC_IS_COMPILE_CONST(Milliseconds)) |