commit 22d4123dd4efeb4e931cf47d35ec7a4d2ee846d2
author Ben Romberger <bromberg@codeaurora.org> Wed Nov 16 14:55:25 2016 -0800
committer Ashwini Muduganti <amudug@codeaurora.org> Mon Nov 21 19:51:58 2016 -0800
tree 58606c304c40e83d070eb610bf1362c29cfc729a
parent 5b14a967f6dded41c275c4e4e19e24b378acb4e9

 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

hal/msm8974/hw_info.c

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);

hal/msm8974/platform.h

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"