Loading Android.mk +1 −1 Original line number Diff line number Diff line ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084,$(TARGET_BOARD_PLATFORM)),) ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916,$(TARGET_BOARD_PLATFORM)),) MY_LOCAL_PATH := $(call my-dir) Loading hal/Android.mk +6 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ ifneq ($(filter apq8084,$(TARGET_BOARD_PLATFORM)),) endif endif ifneq ($(filter msm8916,$(TARGET_BOARD_PLATFORM)),) AUDIO_PLATFORM = msm8916 MULTIPLE_HW_VARIANTS_ENABLED := true LOCAL_CFLAGS := -DPLATFORM_MSM8916 endif LOCAL_SRC_FILES := \ audio_hw.c \ voice.c \ Loading hal/msm8916/hw_info.c 0 → 100644 +198 −0 Original line number Diff line number Diff line /* * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. * * Neither the name of The Linux Foundation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #define LOG_TAG "hardware_info" /*#define LOG_NDEBUG 0*/ #define LOG_NDDEBUG 0 #include <stdlib.h> #include <dlfcn.h> #include <cutils/log.h> #include <cutils/str_parms.h> #include "audio_hw.h" #include "platform.h" #include "platform_api.h" struct hardware_info { char name[HW_INFO_ARRAY_MAX_SIZE]; char type[HW_INFO_ARRAY_MAX_SIZE]; /* variables for handling target variants */ uint32_t num_snd_devices; char dev_extn[HW_INFO_ARRAY_MAX_SIZE]; snd_device_t *snd_devices; }; #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) static const snd_device_t taiko_fluid_variant_devices[] = { SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES, SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET, }; 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_apq8084_CDP_variant_devices[] = { SND_DEVICE_IN_HANDSET_MIC, }; static const snd_device_t taiko_liquid_variant_devices[] = { SND_DEVICE_OUT_SPEAKER, 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_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[] = { SND_DEVICE_OUT_SPEAKER, 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_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_HEADPHONES, SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES, 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[] = { SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES, SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET, }; static void update_hardware_info_8916(struct hardware_info *hw_info, const char *snd_card_name) { if (!strcmp(snd_card_name, "msm8916-snd-card")) { strlcpy(hw_info->type, "", sizeof(hw_info->type)); strlcpy(hw_info->name, "msm8916", 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, "msm8916-skuab-snd-card")) { strlcpy(hw_info->type, "skuab", sizeof(hw_info->type)); strlcpy(hw_info->name, "msm8916", sizeof(hw_info->name)); hw_info->snd_devices = (snd_device_t *)helicon_skuab_variant_devices; hw_info->num_snd_devices = ARRAY_SIZE(helicon_skuab_variant_devices); strlcpy(hw_info->dev_extn, "-skuab", sizeof(hw_info->dev_extn)); } else if (!strcmp(snd_card_name, "msm8916-skuaa-snd-card")) { strlcpy(hw_info->type, " skuaa", sizeof(hw_info->type)); strlcpy(hw_info->name, "msm8916", 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 { ALOGW("%s: Not an 8916 device", __func__); } } void *hw_info_init(const char *snd_card_name) { struct hardware_info *hw_info; hw_info = malloc(sizeof(struct hardware_info)); if(strstr(snd_card_name, "msm8916")) { ALOGV("8916 - variant soundcard"); update_hardware_info_8916(hw_info, snd_card_name); } else { ALOGE("%s: Unsupported target %s:",__func__, snd_card_name); free(hw_info); hw_info = NULL; } return hw_info; } void hw_info_deinit(void *hw_info) { struct hardware_info *my_data = (struct hardware_info*) hw_info; if(!my_data) free(my_data); } void hw_info_append_hw_type(void *hw_info, snd_device_t snd_device, char *device_name) { struct hardware_info *my_data = (struct hardware_info*) hw_info; uint32_t i = 0; snd_device_t *snd_devices = (snd_device_t *) my_data->snd_devices; if(snd_devices != NULL) { for (i = 0; i < my_data->num_snd_devices; i++) { if (snd_device == (snd_device_t)snd_devices[i]) { ALOGV("extract dev_extn device %d, extn = %s", (snd_device_t)snd_devices[i], my_data->dev_extn); CHECK(strlcat(device_name, my_data->dev_extn, DEVICE_NAME_MAX_SIZE) < DEVICE_NAME_MAX_SIZE); break; } } } ALOGD("%s : device_name = %s", __func__,device_name); } Loading
Android.mk +1 −1 Original line number Diff line number Diff line ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084,$(TARGET_BOARD_PLATFORM)),) ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916,$(TARGET_BOARD_PLATFORM)),) MY_LOCAL_PATH := $(call my-dir) Loading
hal/Android.mk +6 −0 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ ifneq ($(filter apq8084,$(TARGET_BOARD_PLATFORM)),) endif endif ifneq ($(filter msm8916,$(TARGET_BOARD_PLATFORM)),) AUDIO_PLATFORM = msm8916 MULTIPLE_HW_VARIANTS_ENABLED := true LOCAL_CFLAGS := -DPLATFORM_MSM8916 endif LOCAL_SRC_FILES := \ audio_hw.c \ voice.c \ Loading
hal/msm8916/hw_info.c 0 → 100644 +198 −0 Original line number Diff line number Diff line /* * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. * * Neither the name of The Linux Foundation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #define LOG_TAG "hardware_info" /*#define LOG_NDEBUG 0*/ #define LOG_NDDEBUG 0 #include <stdlib.h> #include <dlfcn.h> #include <cutils/log.h> #include <cutils/str_parms.h> #include "audio_hw.h" #include "platform.h" #include "platform_api.h" struct hardware_info { char name[HW_INFO_ARRAY_MAX_SIZE]; char type[HW_INFO_ARRAY_MAX_SIZE]; /* variables for handling target variants */ uint32_t num_snd_devices; char dev_extn[HW_INFO_ARRAY_MAX_SIZE]; snd_device_t *snd_devices; }; #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) static const snd_device_t taiko_fluid_variant_devices[] = { SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES, SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET, }; 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_apq8084_CDP_variant_devices[] = { SND_DEVICE_IN_HANDSET_MIC, }; static const snd_device_t taiko_liquid_variant_devices[] = { SND_DEVICE_OUT_SPEAKER, 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_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[] = { SND_DEVICE_OUT_SPEAKER, 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_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_HEADPHONES, SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES, 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[] = { SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES, SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET, }; static void update_hardware_info_8916(struct hardware_info *hw_info, const char *snd_card_name) { if (!strcmp(snd_card_name, "msm8916-snd-card")) { strlcpy(hw_info->type, "", sizeof(hw_info->type)); strlcpy(hw_info->name, "msm8916", 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, "msm8916-skuab-snd-card")) { strlcpy(hw_info->type, "skuab", sizeof(hw_info->type)); strlcpy(hw_info->name, "msm8916", sizeof(hw_info->name)); hw_info->snd_devices = (snd_device_t *)helicon_skuab_variant_devices; hw_info->num_snd_devices = ARRAY_SIZE(helicon_skuab_variant_devices); strlcpy(hw_info->dev_extn, "-skuab", sizeof(hw_info->dev_extn)); } else if (!strcmp(snd_card_name, "msm8916-skuaa-snd-card")) { strlcpy(hw_info->type, " skuaa", sizeof(hw_info->type)); strlcpy(hw_info->name, "msm8916", 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 { ALOGW("%s: Not an 8916 device", __func__); } } void *hw_info_init(const char *snd_card_name) { struct hardware_info *hw_info; hw_info = malloc(sizeof(struct hardware_info)); if(strstr(snd_card_name, "msm8916")) { ALOGV("8916 - variant soundcard"); update_hardware_info_8916(hw_info, snd_card_name); } else { ALOGE("%s: Unsupported target %s:",__func__, snd_card_name); free(hw_info); hw_info = NULL; } return hw_info; } void hw_info_deinit(void *hw_info) { struct hardware_info *my_data = (struct hardware_info*) hw_info; if(!my_data) free(my_data); } void hw_info_append_hw_type(void *hw_info, snd_device_t snd_device, char *device_name) { struct hardware_info *my_data = (struct hardware_info*) hw_info; uint32_t i = 0; snd_device_t *snd_devices = (snd_device_t *) my_data->snd_devices; if(snd_devices != NULL) { for (i = 0; i < my_data->num_snd_devices; i++) { if (snd_device == (snd_device_t)snd_devices[i]) { ALOGV("extract dev_extn device %d, extn = %s", (snd_device_t)snd_devices[i], my_data->dev_extn); CHECK(strlcat(device_name, my_data->dev_extn, DEVICE_NAME_MAX_SIZE) < DEVICE_NAME_MAX_SIZE); break; } } } ALOGD("%s : device_name = %s", __func__,device_name); }
