diff options
Diffstat (limited to 'firmware/sound.c')
-rw-r--r-- | firmware/sound.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/sound.c b/firmware/sound.c index dccca12264..76f1dd0df6 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "system.h" | 27 | #include "system.h" |
28 | #include "i2c.h" | 28 | #include "i2c.h" |
29 | #include "mas.h" | 29 | #include "mas.h" |
30 | #ifndef SIMULATOR | 30 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
31 | #if CONFIG_CPU == PNX0101 | 31 | #if CONFIG_CPU == PNX0101 |
32 | #include "pnx0101.h" | 32 | #include "pnx0101.h" |
33 | #endif | 33 | #endif |
@@ -257,7 +257,7 @@ static void set_prescaled_volume(void) | |||
257 | dsp_callback(DSP_CALLBACK_SET_SW_VOLUME, 0); | 257 | dsp_callback(DSP_CALLBACK_SET_SW_VOLUME, 0); |
258 | #endif | 258 | #endif |
259 | 259 | ||
260 | #ifndef SIMULATOR | 260 | #ifndef HAVE_SDL_AUDIO |
261 | #if CONFIG_CODEC == MAS3507D | 261 | #if CONFIG_CODEC == MAS3507D |
262 | dac_volume(tenthdb2reg(l), tenthdb2reg(r), false); | 262 | dac_volume(tenthdb2reg(l), tenthdb2reg(r), false); |
263 | #elif defined(HAVE_UDA1380) || defined(HAVE_WM8975) || defined(HAVE_WM8758) \ | 263 | #elif defined(HAVE_UDA1380) || defined(HAVE_WM8975) || defined(HAVE_WM8758) \ |
@@ -276,9 +276,9 @@ static void set_prescaled_volume(void) | |||
276 | #elif defined(HAVE_JZ4740_CODEC) || defined(HAVE_SDL_AUDIO) | 276 | #elif defined(HAVE_JZ4740_CODEC) || defined(HAVE_SDL_AUDIO) |
277 | audiohw_set_volume(current_volume); | 277 | audiohw_set_volume(current_volume); |
278 | #endif | 278 | #endif |
279 | #else /* SIMULATOR */ | 279 | #else /* HAVE_SDL_AUDIO */ |
280 | audiohw_set_volume(current_volume); | 280 | audiohw_set_volume(current_volume); |
281 | #endif /* !SIMULATOR */ | 281 | #endif /* !HAVE_SDL_AUDIO */ |
282 | } | 282 | } |
283 | #endif /* (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 */ | 283 | #endif /* (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 */ |
284 | 284 | ||
@@ -714,7 +714,7 @@ void sound_set(int setting, int value) | |||
714 | && !defined(HAVE_WM8758) && !defined(HAVE_TSC2100) \ | 714 | && !defined(HAVE_WM8758) && !defined(HAVE_TSC2100) \ |
715 | && !defined (HAVE_WM8711) && !defined (HAVE_WM8721) \ | 715 | && !defined (HAVE_WM8711) && !defined (HAVE_WM8721) \ |
716 | && !defined (HAVE_WM8731) && !defined (HAVE_WM8978) \ | 716 | && !defined (HAVE_WM8731) && !defined (HAVE_WM8978) \ |
717 | && !defined(HAVE_AK4537)) || defined(SIMULATOR) | 717 | && !defined(HAVE_AK4537)) || (CONFIG_PLATFORM & PLATFORM_HOSTED) |
718 | int sound_val2phys(int setting, int value) | 718 | int sound_val2phys(int setting, int value) |
719 | { | 719 | { |
720 | #if CONFIG_CODEC == MAS3587F | 720 | #if CONFIG_CODEC == MAS3587F |
@@ -820,7 +820,7 @@ int sound_val2phys(int setting, int value) | |||
820 | return value; | 820 | return value; |
821 | #endif | 821 | #endif |
822 | } | 822 | } |
823 | #endif /* !defined(HAVE_AS3514) || defined(SIMULATOR) */ | 823 | #endif /* CONFIG_CODECs || PLATFORM_HOSTED */ |
824 | 824 | ||
825 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 825 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
826 | /* This function works by telling the decoder that we have another | 826 | /* This function works by telling the decoder that we have another |