dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hal: Update devices that are different across variants. 

-Update devices that are different across 8974/8x26 variants.
-Use extension as cdp for 8974 cdp device instead of liquid.

Change-Id: Ic0844577743303dc6bd1508a40beeb616abb76d3
This commit is contained in:
Krishnankutty Kolathappilly 2013-11-03 15:48:42 -08:00 committed by Ravi Kumar Alamanda
parent 9381e58a75
commit d801ae34b5
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hal/msm8974/hw_info.c
View File

@ -66,6 +66,7 @@ static const snd_device_t taiko_CDP_variant_devices[] = {
SND_DEVICE_OUT_SPEAKER,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET,
SND_DEVICE_IN_QUAD_MIC,
};
static const snd_device_t taiko_liquid_variant_devices[] = {
@ -74,6 +75,13 @@ static const snd_device_t taiko_liquid_variant_devices[] = {
SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET,
SND_DEVICE_IN_SPEAKER_MIC,
SND_DEVICE_IN_HEADSET_MIC,
SND_DEVICE_IN_VOICE_DMIC,
SND_DEVICE_IN_VOICE_SPEAKER_DMIC,
SND_DEVICE_IN_VOICE_REC_DMIC_STEREO,
SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE,
SND_DEVICE_IN_QUAD_MIC,
SND_DEVICE_IN_HANDSET_STEREO_DMIC,
SND_DEVICE_IN_SPEAKER_STEREO_DMIC,
};
static const snd_device_t taiko_DB_variant_devices[] = {
@ -81,28 +89,33 @@ static const snd_device_t taiko_DB_variant_devices[] = {
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET,
SND_DEVICE_IN_SPEAKER_MIC,
SND_DEVICE_IN_HEADSET_MIC,
SND_DEVICE_IN_QUAD_MIC,
};
static const snd_device_t tapan_lite_variant_devices[] = {
SND_DEVICE_OUT_SPEAKER,
SND_DEVICE_OUT_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET,
SND_DEVICE_OUT_VOICE_HEADPHONES,
SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES,
SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,
};
static const snd_device_t tapan_skuf_variant_devices[] = {
SND_DEVICE_OUT_SPEAKER,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET,
/*SND_DEVICE_OUT_SPEAKER_AND_ANC_FB_HEADSET,*/
};
static const snd_device_t tapan_lite_skuf_variant_devices[] = {
SND_DEVICE_OUT_SPEAKER,
SND_DEVICE_OUT_ANC_HANDSET,
SND_DEVICE_OUT_ANC_HEADSET,
SND_DEVICE_OUT_ANC_FB_HEADSET,
SND_DEVICE_OUT_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET,
SND_DEVICE_IN_AANC_HANDSET_MIC,
SND_DEVICE_OUT_VOICE_HEADPHONES,
SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES,
SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,
};
static const snd_device_t helicon_skuab_variant_devices[] = {
@ -149,7 +162,7 @@ static void update_hardware_info_8974(struct hardware_info *hw_info, const char
strlcpy(hw_info->name, "msm8974", sizeof(hw_info->name));
hw_info->snd_devices = (snd_device_t *)taiko_CDP_variant_devices;
hw_info->num_snd_devices = ARRAY_SIZE(taiko_CDP_variant_devices);
strlcpy(hw_info->dev_extn, "-fluid", sizeof(hw_info->dev_extn));
strlcpy(hw_info->dev_extn, "-cdp", sizeof(hw_info->dev_extn));
} else if (!strcmp(snd_card_name, "msm8974-taiko-fluid-snd-card")) {
strlcpy(hw_info->type, " fluid", sizeof(hw_info->type));
strlcpy(hw_info->name, "msm8974", sizeof(hw_info->name));