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

Merge "hal: 8939: add support for 8939 skuk device"

This commit is contained in:
Linux Build Service Account 2014-06-10 01:46:48 -07:00 committed by Gerrit - the friendly Code Review server
parent da682c43cf f00485b15f
commit 77a0d1183e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hal/msm8916/hw_info.c
View File

@ -161,14 +161,8 @@ 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, "msm8939-skuh-snd-card")) {
strlcpy(hw_info->type, "skuh", sizeof(hw_info->type));
strlcpy(hw_info->name, "msm8939", 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-skui-snd-card")) {
strlcpy(hw_info->type, "skui", sizeof(hw_info->type));
} else if (!strcmp(snd_card_name, "msm8939-snd-card-skuk")) {
strlcpy(hw_info->type, "skuk", sizeof(hw_info->type));
strlcpy(hw_info->name, "msm8939", sizeof(hw_info->name));
hw_info->snd_devices = NULL;
hw_info->num_snd_devices = 0;

6
hal/msm8916/platform.c
View File

@ -36,6 +36,8 @@
#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_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"
#define PLATFORM_INFO_XML_PATH "/system/etc/audio_platform_info.xml"
#define LIB_ACDB_LOADER "libacdbloader.so"
@ -421,6 +423,10 @@ static void query_platform(const char *snd_card_name,
sizeof("msm8939-snd-card-mtp"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH,
sizeof(MIXER_XML_PATH));
} else if (!strncmp(snd_card_name, "msm8939-snd-card-skuk",
sizeof("msm8939-snd-card-skuk"))) {
strlcpy(mixer_xml_path, MIXER_XML_PATH_SKUK,
sizeof(MIXER_XML_PATH_SKUK));
} else {
strlcpy(mixer_xml_path, MIXER_XML_PATH,
sizeof(MIXER_XML_PATH));