commit 986024b8b9330f2221543015920bc0b6d288cd1a
author Garmond Leung <garmondl@codeaurora.org> Fri Apr 28 14:41:10 2017 -0700
committer Garmond Leung <garmondl@codeaurora.org> Fri Apr 28 15:11:42 2017 -0700
tree 3bb871e171b6fb814dfc4d5756d15718369dc82b
parent a2c5c4eea777d8ed1461ee0affa756781bd84c24

hal: update msmskunk references to msm845

Update makefiles and defines to refer to sdm845 instead
of msmskunk

CRs-Fixed: 2039156

Change-Id: Ib6ddbe4657fd20bec4d8ec177d06ea9fd4b9b438

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 50b94e3..5dbada0 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -34,7 +34,7 @@
   LOCAL_CFLAGS := -DPLATFORM_MSM8998
 endif
 ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),)
-  LOCAL_CFLAGS := -DPLATFORM_MSMSKUNK
+  LOCAL_CFLAGS := -DPLATFORM_SDM845
 endif
 endif
 

hal/audio_extn/hfp.c

diff --git a/hal/audio_extn/hfp.c b/hal/audio_extn/hfp.c
index 62f3676..3c1d0ef 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_MSM8998) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSMSKUNK)
+#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMFALCON) || defined (PLATFORM_SDM845)
 #define HFP_RX_VOLUME     "SLIMBUS_7 LOOPBACK Volume"
 #else
 #define HFP_RX_VOLUME     "Internal HFP RX Volume"

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 03b3c2e..0ce72c6 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -333,11 +333,11 @@
 #define PLAYBACK_OFFLOAD_DEVICE 9
 
 // Direct_PCM
-#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996) || defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMSKUNK)
+#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996) || defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845)
 #define PLAYBACK_OFFLOAD_DEVICE2 17
 #endif
 
-#if defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8996) || defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMSKUNK)
+#if defined (PLATFORM_APQ8084) || defined (PLATFORM_MSM8996) || defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845)
 #define PLAYBACK_OFFLOAD_DEVICE3 18
 #define PLAYBACK_OFFLOAD_DEVICE4 34
 #define PLAYBACK_OFFLOAD_DEVICE5 35
@@ -434,7 +434,7 @@
 #define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"
 #elif PLATFORM_MSM8996
 #define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume"
-#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_MSMSKUNK)
+#elif defined (PLATFORM_MSM8998) || defined (PLATFORM_SDM845)
 #define FM_RX_VOLUME "SLIMBUS_8 LOOPBACK Volume"
 #else
 #define FM_RX_VOLUME "Internal FM RX Volume"