Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 986024b8 authored by Garmond Leung's avatar Garmond Leung
Browse files

hal: update msmskunk references to msm845 

Update makefiles and defines to refer to sdm845 instead
of msmskunk

CRs-Fixed: 2039156

Change-Id: Ib6ddbe4657fd20bec4d8ec177d06ea9fd4b9b438
parent a2c5c4ee

hal/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ ifneq ($(filter msm8998,$(TARGET_BOARD_PLATFORM)),) 
  LOCAL_CFLAGS := -DPLATFORM_MSM8998

  LOCAL_CFLAGS := -DPLATFORM_MSM8998

endif

endif

ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSMSKUNK

  LOCAL_CFLAGS := -DPLATFORM_SDM845

endif

endif

endif

endif

hal/audio_extn/hfp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ 
#define HFP_RX_VOLUME     "SEC AUXPCM LOOPBACK Volume"

#define HFP_RX_VOLUME     "SEC AUXPCM LOOPBACK Volume"

#elif defined PLATFORM_MSM8996

#elif defined PLATFORM_MSM8996

#define HFP_RX_VOLUME     "PRI AUXPCM LOOPBACK Volume"

#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"

#define HFP_RX_VOLUME     "SLIMBUS_7 LOOPBACK Volume"

#else

#else

#define HFP_RX_VOLUME     "Internal HFP RX Volume"

#define HFP_RX_VOLUME     "Internal HFP RX Volume"

hal/msm8974/platform.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -333,11 +333,11 @@ enum { 
#define PLAYBACK_OFFLOAD_DEVICE 9

#define PLAYBACK_OFFLOAD_DEVICE 9





// Direct_PCM

// 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

#define PLAYBACK_OFFLOAD_DEVICE2 17

#endif

#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_DEVICE3 18

#define PLAYBACK_OFFLOAD_DEVICE4 34

#define PLAYBACK_OFFLOAD_DEVICE4 34

#define PLAYBACK_OFFLOAD_DEVICE5 35

#define PLAYBACK_OFFLOAD_DEVICE5 35
@@ -434,7 +434,7 @@ enum { 
#define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"

#define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"

#elif PLATFORM_MSM8996

#elif PLATFORM_MSM8996

#define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume"

#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"

#define FM_RX_VOLUME "SLIMBUS_8 LOOPBACK Volume"

#else

#else

#define FM_RX_VOLUME "Internal FM RX Volume"

#define FM_RX_VOLUME "Internal FM RX Volume"