From 8768896d6b0ddb35568ad996781a33fd3a0df94f Mon Sep 17 00:00:00 2001 From: jepler Date: Sun, 8 Sep 2019 21:17:36 -0500 Subject: audiomixer: Supply constants in a way "-Og" optimization expects These arguments are constrained to be compile-time constants, a fact that gcc complains about under "-Og" optimization, but not in normal builds. Declare them as enumerated types --- shared-module/audiomixer/Mixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shared-module') diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c index e0fb4fab8..a52489f85 100644 --- a/shared-module/audiomixer/Mixer.c +++ b/shared-module/audiomixer/Mixer.c @@ -262,8 +262,8 @@ static inline uint32_t mult16signed(uint32_t val, int32_t mul) { } #if (defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1)) //Cortex-M4 w/FPU int32_t hi, lo; - int32_t bits = 16; // saturate to 16 bits - int32_t shift = 0; // shift is done automatically + enum { bits = 16 }; // saturate to 16 bits + enum { shift = 0 }; // shift is done automatically asm volatile("smulwb %0, %1, %2" : "=r" (lo) : "r" (mul), "r" (val)); asm volatile("smulwt %0, %1, %2" : "=r" (hi) : "r" (mul), "r" (val)); asm volatile("ssat %0, %1, %2, asr %3" : "=r" (lo) : "I" (bits), "r" (lo), "I" (shift)); -- cgit v1.2.3