From e32d91c7619a0938ae48bd149ac5431379250068 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Fri, 9 Dec 2011 19:09:48 +0100 Subject: [PATCH] Maemo/pandora: Hack to enable assembler optimized software mixing --- firmware/pcm_mixer.c | 4 ---- tools/configure | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/firmware/pcm_mixer.c b/firmware/pcm_mixer.c index c84762938e..35ac4e03f0 100644 --- a/firmware/pcm_mixer.c +++ b/firmware/pcm_mixer.c @@ -75,8 +75,6 @@ static unsigned int idle_counter = 0; ({ start = (void *)(((uintptr_t)start + 3) & ~3); \ size &= ~3; }) -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) - /* Include any implemented CPU-optimized mixdown routines */ #if defined(CPU_ARM) #if ARM_ARCH >= 6 @@ -90,8 +88,6 @@ static unsigned int idle_counter = 0; #include "pcm-mixer-coldfire.c" #endif /* CPU_* */ -#endif /* CONFIG_PLATFORM */ - /** Generic mixing routines **/ #ifndef MIXER_OPTIMIZED_MIX_SAMPLES diff --git a/tools/configure b/tools/configure index 222d1dcd1c..b7dfb9d37b 100755 --- a/tools/configure +++ b/tools/configure @@ -3639,10 +3639,15 @@ if test -n "$t_cpu"; then # Maemo needs the SDL port, too TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl/app" TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl" + TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/arm" elif [ "$t_cpu" = "hosted" ] && [ "$t_manufacturer" = "pandora" ]; then # Pandora needs the SDL port, too TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl/app" TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl" + TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/arm" + elif [ "$t_cpu" = "hosted" ] && [ "$t_manufacturer" = "android" ]; then + # Include target/arm directory for native PCM mixer routines + TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/arm" elif [ "$simulator" = "yes" ]; then # a few more includes for the sim target tree TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl" TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted" -- 2.11.4.GIT