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
diff --git a/Android.mk b/Android.mk
index 42f202b..5163d9e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
diff --git a/configs/msmcobalt/aanc_tuning_mixer.txt b/configs/msm8998/aanc_tuning_mixer.txt
similarity index 100%
rename from configs/msmcobalt/aanc_tuning_mixer.txt
rename to configs/msm8998/aanc_tuning_mixer.txt
diff --git a/configs/msmcobalt/aanc_tuning_mixer_tavil.txt b/configs/msm8998/aanc_tuning_mixer_tavil.txt
similarity index 100%
rename from configs/msmcobalt/aanc_tuning_mixer_tavil.txt
rename to configs/msm8998/aanc_tuning_mixer_tavil.txt
diff --git a/configs/msmcobalt/audio_effects.conf b/configs/msm8998/audio_effects.conf
similarity index 100%
rename from configs/msmcobalt/audio_effects.conf
rename to configs/msm8998/audio_effects.conf
diff --git a/configs/msmcobalt/audio_output_policy.conf b/configs/msm8998/audio_output_policy.conf
similarity index 100%
rename from configs/msmcobalt/audio_output_policy.conf
rename to configs/msm8998/audio_output_policy.conf
diff --git a/configs/msmcobalt/audio_platform_info.xml b/configs/msm8998/audio_platform_info.xml
similarity index 100%
rename from configs/msmcobalt/audio_platform_info.xml
rename to configs/msm8998/audio_platform_info.xml
diff --git a/configs/msmcobalt/audio_platform_info_i2s.xml b/configs/msm8998/audio_platform_info_i2s.xml
similarity index 100%
rename from configs/msmcobalt/audio_platform_info_i2s.xml
rename to configs/msm8998/audio_platform_info_i2s.xml
diff --git a/configs/msmcobalt/audio_policy.conf b/configs/msm8998/audio_policy.conf
similarity index 100%
rename from configs/msmcobalt/audio_policy.conf
rename to configs/msm8998/audio_policy.conf
diff --git a/configs/msmcobalt/audio_policy_configuration.xml b/configs/msm8998/audio_policy_configuration.xml
similarity index 100%
rename from configs/msmcobalt/audio_policy_configuration.xml
rename to configs/msm8998/audio_policy_configuration.xml
diff --git a/configs/msmcobalt/graphite_ipc_platform_info.xml b/configs/msm8998/graphite_ipc_platform_info.xml
similarity index 100%
rename from configs/msmcobalt/graphite_ipc_platform_info.xml
rename to configs/msm8998/graphite_ipc_platform_info.xml
diff --git a/configs/msmcobalt/listen_platform_info.xml b/configs/msm8998/listen_platform_info.xml
similarity index 100%
rename from configs/msmcobalt/listen_platform_info.xml
rename to configs/msm8998/listen_platform_info.xml
diff --git a/configs/msmcobalt/mixer_paths.xml b/configs/msm8998/mixer_paths.xml
similarity index 100%
rename from configs/msmcobalt/mixer_paths.xml
rename to configs/msm8998/mixer_paths.xml
diff --git a/configs/msmcobalt/mixer_paths_dtp.xml b/configs/msm8998/mixer_paths_dtp.xml
similarity index 100%
rename from configs/msmcobalt/mixer_paths_dtp.xml
rename to configs/msm8998/mixer_paths_dtp.xml
diff --git a/configs/msmcobalt/mixer_paths_i2s.xml b/configs/msm8998/mixer_paths_i2s.xml
similarity index 100%
rename from configs/msmcobalt/mixer_paths_i2s.xml
rename to configs/msm8998/mixer_paths_i2s.xml
diff --git a/configs/msmcobalt/mixer_paths_skuk.xml b/configs/msm8998/mixer_paths_skuk.xml
similarity index 100%
rename from configs/msmcobalt/mixer_paths_skuk.xml
rename to configs/msm8998/mixer_paths_skuk.xml
diff --git a/configs/msmcobalt/mixer_paths_tasha.xml b/configs/msm8998/mixer_paths_tasha.xml
similarity index 100%
rename from configs/msmcobalt/mixer_paths_tasha.xml
rename to configs/msm8998/mixer_paths_tasha.xml
diff --git a/configs/msmcobalt/mixer_paths_tavil.xml b/configs/msm8998/mixer_paths_tavil.xml
similarity index 100%
rename from configs/msmcobalt/mixer_paths_tavil.xml
rename to configs/msm8998/mixer_paths_tavil.xml
diff --git a/configs/msmcobalt/msmcobalt.mk b/configs/msm8998/msm8998.mk
similarity index 73%
rename from configs/msmcobalt/msmcobalt.mk
rename to configs/msm8998/msm8998.mk
index 12a922c..5e4e0fc 100644
--- a/configs/msmcobalt/msmcobalt.mk
+++ b/configs/msm8998/msm8998.mk
@@ -65,28 +65,28 @@
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 @@
$(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 @@
# 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 += \
diff --git a/configs/msmcobalt/sound_trigger_mixer_paths.xml b/configs/msm8998/sound_trigger_mixer_paths.xml
similarity index 100%
rename from configs/msmcobalt/sound_trigger_mixer_paths.xml
rename to configs/msm8998/sound_trigger_mixer_paths.xml
diff --git a/configs/msmcobalt/sound_trigger_mixer_paths_wcd9330.xml b/configs/msm8998/sound_trigger_mixer_paths_wcd9330.xml
similarity index 100%
rename from configs/msmcobalt/sound_trigger_mixer_paths_wcd9330.xml
rename to configs/msm8998/sound_trigger_mixer_paths_wcd9330.xml
diff --git a/configs/msmcobalt/sound_trigger_mixer_paths_wcd9340.xml b/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
similarity index 100%
rename from configs/msmcobalt/sound_trigger_mixer_paths_wcd9340.xml
rename to configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
diff --git a/configs/msmcobalt/sound_trigger_platform_info.xml b/configs/msm8998/sound_trigger_platform_info.xml
similarity index 100%
rename from configs/msmcobalt/sound_trigger_platform_info.xml
rename to configs/msm8998/sound_trigger_platform_info.xml
diff --git a/hal/Android.mk b/hal/Android.mk
index daf7397..f971b85 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -8,7 +8,7 @@
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 @@
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
diff --git a/hal/audio_extn/hfp.c b/hal/audio_extn/hfp.c
index 243d48d..fa192e5 100644
--- a/hal/audio_extn/hfp.c
+++ b/hal/audio_extn/hfp.c
@@ -49,7 +49,7 @@
#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"
diff --git a/hal/msm8974/hw_info.c b/hal/msm8974/hw_info.c
index dae7ff3..f3ecd57 100644
--- a/hal/msm8974/hw_info.c
+++ b/hal/msm8974/hw_info.c
@@ -316,28 +316,28 @@
}
}
-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 @@
} 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);
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index c231843..24771b4 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -327,11 +327,11 @@
#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 @@
#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"
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index b1dd206..01805af 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -81,7 +81,7 @@
################################################################################
-ifneq ($(filter msm8992 msm8994 msm8996 msmcobalt msmfalcon,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8992 msm8994 msm8996 msm8998 msmfalcon,$(TARGET_BOARD_PLATFORM)),)
include $(CLEAR_VARS)
diff --git a/visualizer/Android.mk b/visualizer/Android.mk
index c9795ea..bc44139 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -21,8 +21,8 @@
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 := \
diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index f49c434..858fafa 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -179,7 +179,7 @@
#define MIXER_CARD 0
#define SOUND_CARD 0
-#ifdef PLATFORM_MSMCOBALT
+#ifdef PLATFORM_MSM8998
#define CAPTURE_DEVICE 7
#else
#define CAPTURE_DEVICE 8