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

Merge "hal: Add 8916 qrd skuhf sound card detection"

This commit is contained in:
Linux Build Service Account 2014-06-20 02:52:05 -07:00 committed by Gerrit - the friendly Code Review server
parent 33ab96f81e 19f244a278
commit 61267c8a6c
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hal/msm8916/hw_info.c
View File

@ -149,6 +149,12 @@ static void update_hardware_info_8x16(struct hardware_info *hw_info, const char
hw_info->snd_devices = NULL;
hw_info->num_snd_devices = 0;
strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));
} else if (!strcmp(snd_card_name, "msm8x16-skuhf-snd-card")) {
strlcpy(hw_info->type, "skuhf", sizeof(hw_info->type));
strlcpy(hw_info->name, "msm8x16", sizeof(hw_info->name));
hw_info->snd_devices = NULL;
hw_info->num_snd_devices = 0;
strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));
} else if (!strcmp(snd_card_name, "msm8939-snd-card")) {
strlcpy(hw_info->type, "", sizeof(hw_info->type));
strlcpy(hw_info->name, "msm8939", sizeof(hw_info->name));

5
hal/msm8916/platform.c
View File

@ -36,6 +36,7 @@
#define MIXER_XML_PATH_MTP "/system/etc/mixer_paths_mtp.xml"
#define MIXER_XML_PATH_QRD_SKUH "/system/etc/mixer_paths_qrd_skuh.xml"
#define MIXER_XML_PATH_QRD_SKUI "/system/etc/mixer_paths_qrd_skui.xml"
#define MIXER_XML_PATH_QRD_SKUHF "/system/etc/mixer_paths_qrd_skuhf.xml"
#define MIXER_XML_PATH_SKUK "/system/etc/mixer_paths_skuk.xml"
#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"
#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"
@ -419,6 +420,10 @@ static void query_platform(const char *snd_card_name,
sizeof("msm8x16-skui-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_QRD_SKUI,
sizeof(MIXER_XML_PATH_QRD_SKUI));
} else if (!strncmp(snd_card_name, "msm8x16-skuhf-snd-card",
sizeof("msm8x16-skuhf-snd-card"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_QRD_SKUHF,
sizeof(MIXER_XML_PATH_QRD_SKUHF));
} else if (!strncmp(snd_card_name, "msm8939-snd-card-mtp",
sizeof("msm8939-snd-card-mtp"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH,