diff options
| author | Arne Coucheron <arco68@gmail.com> | 2016-04-24 06:45:11 +0200 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2016-05-11 00:12:22 +0200 |
| commit | 1b545a9d06580f89b85b36513937fb308102df4d (patch) | |
| tree | 1e20d9c2546707cf540bb8186ccec5cd2513c4a2 | |
| parent | d3a91d3d45c4d7af2ecf6d646d0f1ac5da9160a5 (diff) | |
| download | hardware_qcom_audio-1b545a9d06580f89b85b36513937fb308102df4d.tar.gz hardware_qcom_audio-1b545a9d06580f89b85b36513937fb308102df4d.tar.bz2 hardware_qcom_audio-1b545a9d06580f89b85b36513937fb308102df4d.zip | |
hal: Remove obsolete FM_ENABLED flag
Change-Id: I920d49b21f5d70a7234e750d5d7dd5d37eeccfc6
| -rw-r--r-- | hal/msm8960/platform.c | 6 | ||||
| -rw-r--r-- | hal/msm8974/platform.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c index 24ef1b99..f7d591af 100644 --- a/hal/msm8960/platform.c +++ b/hal/msm8960/platform.c @@ -1433,10 +1433,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi } else if (devices & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET || devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) { snd_device = SND_DEVICE_OUT_USB_HEADSET; -#ifdef FM_ENABLED } else if (devices & AUDIO_DEVICE_OUT_FM_TX) { snd_device = SND_DEVICE_OUT_TRANSMISSION_FM; -#endif } else if (devices & AUDIO_DEVICE_OUT_EARPIECE) { if (audio_extn_should_use_handset_anc(channel_count)) snd_device = SND_DEVICE_OUT_ANC_HANDSET; @@ -1482,10 +1480,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi ALOGD("%s: setting USB hadset channel capability(2) for Proxy", __func__); audio_extn_set_afe_proxy_channel_mixer(adev, 2); snd_device = SND_DEVICE_OUT_USB_HEADSET; -#ifdef FM_ENABLED } else if (devices & AUDIO_DEVICE_OUT_FM_TX) { snd_device = SND_DEVICE_OUT_TRANSMISSION_FM; -#endif } else if (devices & AUDIO_DEVICE_OUT_EARPIECE) { snd_device = SND_DEVICE_OUT_HANDSET; #ifdef AFE_PROXY_ENABLED @@ -2061,9 +2057,7 @@ bool platform_listen_update_status(snd_device_t snd_device) { if ((snd_device >= SND_DEVICE_IN_BEGIN) && (snd_device < SND_DEVICE_IN_END) && -#ifdef FM_ENABLED (snd_device != SND_DEVICE_IN_CAPTURE_FM) && -#endif (snd_device != SND_DEVICE_IN_CAPTURE_VI_FEEDBACK)) return true; else diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 640229e0..41078d8f 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -1424,10 +1424,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi } else if (devices & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET || devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) { snd_device = SND_DEVICE_OUT_USB_HEADSET; -#ifdef FM_ENABLED } else if (devices & AUDIO_DEVICE_OUT_FM_TX) { snd_device = SND_DEVICE_OUT_TRANSMISSION_FM; -#endif } else if (devices & AUDIO_DEVICE_OUT_EARPIECE) { if (audio_extn_should_use_handset_anc(channel_count)) snd_device = SND_DEVICE_OUT_ANC_HANDSET; @@ -1473,10 +1471,8 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi ALOGD("%s: setting USB hadset channel capability(2) for Proxy", __func__); audio_extn_set_afe_proxy_channel_mixer(adev, 2); snd_device = SND_DEVICE_OUT_USB_HEADSET; -#ifdef FM_ENABLED } else if (devices & AUDIO_DEVICE_OUT_FM_TX) { snd_device = SND_DEVICE_OUT_TRANSMISSION_FM; -#endif } else if (devices & AUDIO_DEVICE_OUT_EARPIECE) { snd_device = SND_DEVICE_OUT_HANDSET; #ifdef AFE_PROXY_ENABLED @@ -2073,9 +2069,7 @@ bool platform_listen_update_status(snd_device_t snd_device) { if ((snd_device >= SND_DEVICE_IN_BEGIN) && (snd_device < SND_DEVICE_IN_END) && -#ifdef FM_ENABLED (snd_device != SND_DEVICE_IN_CAPTURE_FM) && -#endif (snd_device != SND_DEVICE_IN_CAPTURE_VI_FEEDBACK)) return true; else |