diff options
| author | Eric Laurent <elaurent@google.com> | 2015-08-24 19:33:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 19:33:19 +0000 |
| commit | 0e1bc4f66e80912677e190ec0e34f25572990688 (patch) | |
| tree | 0442b3ce66b6f5ea80946c13241fe79406f44419 | |
| parent | 12dfa17fabd653efe95f711df7bb0d7805d1eb08 (diff) | |
| parent | 788f41f13d5a4c592d124bd1dc0aa4d5ec18d595 (diff) | |
| download | hardware_qcom_audio-0e1bc4f66e80912677e190ec0e34f25572990688.tar.gz hardware_qcom_audio-0e1bc4f66e80912677e190ec0e34f25572990688.tar.bz2 hardware_qcom_audio-0e1bc4f66e80912677e190ec0e34f25572990688.zip | |
am 788f41f1: Fix build on msm8960 platform
* commit '788f41f13d5a4c592d124bd1dc0aa4d5ec18d595':
Fix build on msm8960 platform
| -rw-r--r-- | hal/msm8960/platform.c | 14 | ||||
| -rw-r--r-- | hal/msm8960/platform.h | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c index c75efbe6..c78d9434 100644 --- a/hal/msm8960/platform.c +++ b/hal/msm8960/platform.c @@ -126,6 +126,8 @@ static const char * const device_table[SND_DEVICE_MAX] = { [SND_DEVICE_OUT_BT_SCO] = "bt-sco-headset", [SND_DEVICE_OUT_BT_SCO_WB] = "bt-sco-headset-wb", [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = "voice-handset-tmus", + [SND_DEVICE_OUT_VOICE_HANDSET] = "voice-handset-tmus", + [SND_DEVICE_OUT_VOICE_HAC_HANDSET] = "voice-handset-tmus", [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = "voice-tty-full-headphones", [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = "voice-tty-vco-headphones", [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = "voice-tty-hco-handset", @@ -173,6 +175,8 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { [SND_DEVICE_OUT_BT_SCO] = 22, [SND_DEVICE_OUT_BT_SCO_WB] = 39, [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = 81, + [SND_DEVICE_OUT_VOICE_HANDSET] = 81, + [SND_DEVICE_OUT_VOICE_HAC_HANDSET] = 81, [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = 17, [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = 17, [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = 37, @@ -423,10 +427,10 @@ int platform_get_snd_device_acdb_id(snd_device_t snd_device __unused) return -ENOSYS; } -void platform_add_operator_specific_device(snd_device_t snd_device, - const char *operator, - const char *mixer_path, - unsigned int acdb_id) +void platform_add_operator_specific_device(snd_device_t snd_device __unused, + const char *operator __unused, + const char *mixer_path __unused, + unsigned int acdb_id __unused) { } @@ -548,7 +552,7 @@ int platform_stop_voice_call(void *platform, uint32_t vsid __unused) } void platform_set_speaker_gain_in_combo(struct audio_device *adev __unused, - snd_device_t snd_device, + snd_device_t snd_device __unused, bool enable __unused) { } diff --git a/hal/msm8960/platform.h b/hal/msm8960/platform.h index 02017723..b879c0b4 100644 --- a/hal/msm8960/platform.h +++ b/hal/msm8960/platform.h @@ -48,6 +48,8 @@ enum { SND_DEVICE_OUT_BT_SCO, SND_DEVICE_OUT_BT_SCO_WB, SND_DEVICE_OUT_VOICE_HANDSET_TMUS, + SND_DEVICE_OUT_VOICE_HANDSET, + SND_DEVICE_OUT_VOICE_HAC_HANDSET, SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES, SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES, SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET, @@ -92,7 +94,7 @@ enum { #define MIXER_CARD 0 #define SOUND_CARD 0 - +#define MIXER_PATH_MAX_LENGTH 100 #define DEFAULT_OUTPUT_SAMPLING_RATE 48000 /* |