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

hal: Rename all instances of msmcobalt to msm8998 

Rename all instances of msmcobalt to msm8998. Rename
the config directory, defines, functions, and look for
the renamed target and soundcard.

Change-Id: Idbc4c5a425c837342069c2db17b6ec984021bf60
This commit is contained in:
Ben Romberger 2016-11-16 14:55:25 -08:00 committed by Ashwini Muduganti
parent 5b14a967f6
commit 22d4123dd4
29 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@ -1,4 +1,4 @@
ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msmcobalt msmfalcon,$(TARGET_BOARD_PLATFORM)),)
ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 msmfalcon,$(TARGET_BOARD_PLATFORM)),)
MY_LOCAL_PATH := $(call my-dir)

0
configs/msmcobalt/aanc_tuning_mixer.txt → configs/msm8998/aanc_tuning_mixer.txt
View File

0
configs/msmcobalt/aanc_tuning_mixer_tavil.txt → configs/msm8998/aanc_tuning_mixer_tavil.txt
View File

0
configs/msmcobalt/audio_effects.conf → configs/msm8998/audio_effects.conf
View File

0
configs/msmcobalt/audio_output_policy.conf → configs/msm8998/audio_output_policy.conf
View File

0
configs/msmcobalt/audio_platform_info.xml → configs/msm8998/audio_platform_info.xml
View File

0
configs/msmcobalt/audio_platform_info_i2s.xml → configs/msm8998/audio_platform_info_i2s.xml
View File

0
configs/msmcobalt/audio_policy.conf → configs/msm8998/audio_policy.conf
View File

0
configs/msmcobalt/audio_policy_configuration.xml → configs/msm8998/audio_policy_configuration.xml
View File

0
configs/msmcobalt/graphite_ipc_platform_info.xml → configs/msm8998/graphite_ipc_platform_info.xml
View File

0
configs/msmcobalt/listen_platform_info.xml → configs/msm8998/listen_platform_info.xml
View File

0
configs/msmcobalt/mixer_paths.xml → configs/msm8998/mixer_paths.xml
View File

0
configs/msmcobalt/mixer_paths_dtp.xml → configs/msm8998/mixer_paths_dtp.xml
View File

0
configs/msmcobalt/mixer_paths_i2s.xml → configs/msm8998/mixer_paths_i2s.xml
View File

0
configs/msmcobalt/mixer_paths_skuk.xml → configs/msm8998/mixer_paths_skuk.xml
View File

0
configs/msmcobalt/mixer_paths_tasha.xml → configs/msm8998/mixer_paths_tasha.xml
View File

0
configs/msmcobalt/mixer_paths_tavil.xml → configs/msm8998/mixer_paths_tavil.xml
View File

42
configs/msmcobalt/msmcobalt.mk → configs/msm8998/msm8998.mk
View File

@ -65,28 +65,28 @@ PRODUCT_COPY_FILES += \
device/qcom/common/media/audio_policy.conf:system/etc/audio_policy.conf
else
PRODUCT_COPY_FILES += \
hardware/qcom/audio/configs/msmcobalt/audio_policy.conf:system/etc/audio_policy.conf
hardware/qcom/audio/configs/msm8998/audio_policy.conf:system/etc/audio_policy.conf
endif
PRODUCT_COPY_FILES += \
hardware/qcom/audio/configs/msmcobalt/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \
hardware/qcom/audio/configs/msmcobalt/audio_effects.conf:system/vendor/etc/audio_effects.conf \
hardware/qcom/audio/configs/msmcobalt/mixer_paths.xml:system/etc/mixer_paths.xml \
hardware/qcom/audio/configs/msmcobalt/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \
hardware/qcom/audio/configs/msmcobalt/mixer_paths_tavil.xml:system/etc/mixer_paths_tavil.xml \
hardware/qcom/audio/configs/msmcobalt/mixer_paths_skuk.xml:system/etc/mixer_paths_skuk.xml \
hardware/qcom/audio/configs/msmcobalt/mixer_paths_skuk.xml:system/etc/mixer_paths_qvr.xml \
hardware/qcom/audio/configs/msmcobalt/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \
hardware/qcom/audio/configs/msmcobalt/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
hardware/qcom/audio/configs/msmcobalt/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt \
hardware/qcom/audio/configs/msmcobalt/aanc_tuning_mixer_tavil.txt:system/etc/aanc_tuning_mixer_tavil.txt \
hardware/qcom/audio/configs/msmcobalt/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
hardware/qcom/audio/configs/msmcobalt/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \
hardware/qcom/audio/configs/msmcobalt/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \
hardware/qcom/audio/configs/msmcobalt/sound_trigger_mixer_paths_wcd9340.xml:system/etc/sound_trigger_mixer_paths_wcd9340.xml \
hardware/qcom/audio/configs/msmcobalt/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \
hardware/qcom/audio/configs/msmcobalt/graphite_ipc_platform_info.xml:system/etc/graphite_ipc_platform_info.xml \
hardware/qcom/audio/configs/msmcobalt/audio_platform_info.xml:system/etc/audio_platform_info.xml
hardware/qcom/audio/configs/msm8998/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \
hardware/qcom/audio/configs/msm8998/audio_effects.conf:system/vendor/etc/audio_effects.conf \
hardware/qcom/audio/configs/msm8998/mixer_paths.xml:system/etc/mixer_paths.xml \
hardware/qcom/audio/configs/msm8998/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \
hardware/qcom/audio/configs/msm8998/mixer_paths_tavil.xml:system/etc/mixer_paths_tavil.xml \
hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:system/etc/mixer_paths_skuk.xml \
hardware/qcom/audio/configs/msm8998/mixer_paths_skuk.xml:system/etc/mixer_paths_qvr.xml \
hardware/qcom/audio/configs/msm8998/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \
hardware/qcom/audio/configs/msm8998/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
hardware/qcom/audio/configs/msm8998/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt \
hardware/qcom/audio/configs/msm8998/aanc_tuning_mixer_tavil.txt:system/etc/aanc_tuning_mixer_tavil.txt \
hardware/qcom/audio/configs/msm8998/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \
hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \
hardware/qcom/audio/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml:system/etc/sound_trigger_mixer_paths_wcd9340.xml \
hardware/qcom/audio/configs/msm8998/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \
hardware/qcom/audio/configs/msm8998/graphite_ipc_platform_info.xml:system/etc/graphite_ipc_platform_info.xml \
hardware/qcom/audio/configs/msm8998/audio_platform_info.xml:system/etc/audio_platform_info.xml
#XML Audio configuration files
ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
@ -95,7 +95,7 @@ PRODUCT_COPY_FILES += \
$(TOPDIR)hardware/qcom/audio/configs/common/audio_policy_configuration.xml:/system/etc/audio_policy_configuration.xml
else
PRODUCT_COPY_FILES += \
$(TOPDIR)hardware/qcom/audio/configs/msmcobalt/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml
$(TOPDIR)hardware/qcom/audio/configs/msm8998/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml
endif
PRODUCT_COPY_FILES += \
$(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:/system/etc/a2dp_audio_policy_configuration.xml \
@ -107,7 +107,7 @@ endif
# Listen configuration file
PRODUCT_COPY_FILES += \
hardware/qcom/audio/configs/msmcobalt/listen_platform_info.xml:system/etc/listen_platform_info.xml
hardware/qcom/audio/configs/msm8998/listen_platform_info.xml:system/etc/listen_platform_info.xml
# Reduce client buffer size for fast audio output tracks
PRODUCT_PROPERTY_OVERRIDES += \

0
configs/msmcobalt/sound_trigger_mixer_paths.xml → configs/msm8998/sound_trigger_mixer_paths.xml
View File

0
configs/msmcobalt/sound_trigger_mixer_paths_wcd9330.xml → configs/msm8998/sound_trigger_mixer_paths_wcd9330.xml
View File

0
configs/msmcobalt/sound_trigger_mixer_paths_wcd9340.xml → configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
View File

0
configs/msmcobalt/sound_trigger_platform_info.xml → configs/msm8998/sound_trigger_platform_info.xml
View File

6
hal/Android.mk
View File

@ -8,7 +8,7 @@ LOCAL_ARM_MODE := arm
AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msmcobalt,$(TARGET_BOARD_PLATFORM)),)
ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998,$(TARGET_BOARD_PLATFORM)),)
# B-family platform uses msm8974 code base
AUDIO_PLATFORM = msm8974
MULTIPLE_HW_VARIANTS_ENABLED := true
@ -30,8 +30,8 @@ endif
ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS := -DPLATFORM_MSM8996
endif
ifneq ($(filter msmcobalt,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS := -DPLATFORM_MSMCOBALT
ifneq ($(filter msm8998,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS := -DPLATFORM_MSM8998
endif
endif

2
hal/audio_extn/hfp.c
View File

@ -49,7 +49,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
#define HFP_RX_VOLUME "SEC AUXPCM LOOPBACK Volume"
#elif defined PLATFORM_MSM8996
#define HFP_RX_VOLUME "PRI AUXPCM LOOPBACK Volume"
#elif defined (PLATFORM_MSMCOBALT) || defined (PLATFORM_MSMFALCON)
#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMFALCON)
#define HFP_RX_VOLUME "SLIMBUS_7 LOOPBACK Volume"
#else
#define HFP_RX_VOLUME "Internal HFP RX Volume"

22
hal/msm8974/hw_info.c
View File

@ -316,28 +316,28 @@ static void update_hardware_info_8996(struct hardware_info *hw_info, const char
}
}
static void update_hardware_info_msmcobalt(struct hardware_info *hw_info, const char *snd_card_name)
static void update_hardware_info_msm8998(struct hardware_info *hw_info, const char *snd_card_name)
{
if (!strcmp(snd_card_name, "msmcobalt-tasha-fluid-snd-card")) {
if (!strcmp(snd_card_name, "msm8998-tasha-fluid-snd-card")) {
strlcpy(hw_info->type, " fluid", sizeof(hw_info->type));
strlcpy(hw_info->name, "msmcobalt", sizeof(hw_info->name));
strlcpy(hw_info->name, "msm8998", sizeof(hw_info->name));
hw_info->snd_devices = (snd_device_t *)tasha_fluid_variant_devices;
hw_info->num_snd_devices = ARRAY_SIZE(tasha_fluid_variant_devices);
strlcpy(hw_info->dev_extn, "-fluid", sizeof(hw_info->dev_extn));
} else if (!strcmp(snd_card_name, "msmcobalt-tasha-liquid-snd-card")) {
} else if (!strcmp(snd_card_name, "msm8998-tasha-liquid-snd-card")) {
strlcpy(hw_info->type, " liquid", sizeof(hw_info->type));
strlcpy(hw_info->name, "msmcobalt", sizeof(hw_info->name));
strlcpy(hw_info->name, "msm8998", sizeof(hw_info->name));
hw_info->snd_devices = (snd_device_t *)tasha_liquid_variant_devices;
hw_info->num_snd_devices = ARRAY_SIZE(tasha_liquid_variant_devices);
strlcpy(hw_info->dev_extn, "-liquid", sizeof(hw_info->dev_extn));
} else if (!strcmp(snd_card_name, "msmcobalt-tasha-db-snd-card")) {
} else if (!strcmp(snd_card_name, "msm8998-tasha-db-snd-card")) {
strlcpy(hw_info->type, " dragon-board", sizeof(hw_info->type));
strlcpy(hw_info->name, "msmcobalt", sizeof(hw_info->name));
strlcpy(hw_info->name, "msm8998", sizeof(hw_info->name));
hw_info->snd_devices = (snd_device_t *)tasha_DB_variant_devices;
hw_info->num_snd_devices = ARRAY_SIZE(tasha_DB_variant_devices);
strlcpy(hw_info->dev_extn, "-db", sizeof(hw_info->dev_extn));
} else {
ALOGW("%s: Not a msmcobalt device", __func__);
ALOGW("%s: Not a msm8998 device", __func__);
}
}
@ -469,9 +469,9 @@ void *hw_info_init(const char *snd_card_name)
} else if(strstr(snd_card_name, "msm8996")) {
ALOGV("8996 - variant soundcard");
update_hardware_info_8996(hw_info, snd_card_name);
} else if(strstr(snd_card_name, "msmcobalt")) {
ALOGV("MSMCOBALT - variant soundcard");
update_hardware_info_msmcobalt(hw_info, snd_card_name);
} else if(strstr(snd_card_name, "msm8998")) {
ALOGV("MSM8998 - variant soundcard");
update_hardware_info_msm8998(hw_info, snd_card_name);
} else {
ALOGE("%s: Unsupported target %s:",__func__, snd_card_name);
free(hw_info);

6
hal/msm8974/platform.h
View File

@ -327,11 +327,11 @@ enum {
#define PLAYBACK_OFFLOAD_DEVICE 9
// Direct_PCM
#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996) || defined (PLATFORM_APQ8084) || defined (PLATFORM_MSMCOBALT)
#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996) || defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8998)
#define PLAYBACK_OFFLOAD_DEVICE2 17
#endif
#if defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8996) || defined (PLATFORM_MSMCOBALT)
#if defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8996) || defined (PLATFORM_MSM8998)
#define PLAYBACK_OFFLOAD_DEVICE3 18
#define PLAYBACK_OFFLOAD_DEVICE4 34
#define PLAYBACK_OFFLOAD_DEVICE5 35
@ -428,7 +428,7 @@ enum {
#define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"
#elif PLATFORM_MSM8996
#define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume"
#elif PLATFORM_MSMCOBALT
#elif PLATFORM_MSM8998
#define FM_RX_VOLUME "SLIMBUS_8 LOOPBACK Volume"
#else
#define FM_RX_VOLUME "Internal FM RX Volume"

2
post_proc/Android.mk
View File

@ -81,7 +81,7 @@ endif
################################################################################
ifneq ($(filter msm8992 msm8994 msm8996 msmcobalt msmfalcon,$(TARGET_BOARD_PLATFORM)),)
ifneq ($(filter msm8992 msm8994 msm8996 msm8998 msmfalcon,$(TARGET_BOARD_PLATFORM)),)
include $(CLEAR_VARS)

4
visualizer/Android.mk
View File

@ -21,8 +21,8 @@ LOCAL_SRC_FILES:= \
LOCAL_CFLAGS+= -O2 -fvisibility=hidden
ifneq ($(filter msmcobalt,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS += -DPLATFORM_MSMCOBALT
ifneq ($(filter msm8998,$(TARGET_BOARD_PLATFORM)),)
LOCAL_CFLAGS += -DPLATFORM_MSM8998
endif
LOCAL_SHARED_LIBRARIES := \

2
visualizer/offload_visualizer.c
View File

@ -179,7 +179,7 @@ int thread_status;
#define MIXER_CARD 0
#define SOUND_CARD 0
#ifdef PLATFORM_MSMCOBALT
#ifdef PLATFORM_MSM8998
#define CAPTURE_DEVICE 7
#else
#define CAPTURE_DEVICE 8