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

Commit 7b4b129f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Add initial definition for lahaina"

parents 0e0d8c1d 2c3f3642

hal/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -70,11 +70,16 @@ ifneq ($(filter msmnile sdmshrike,$(TARGET_BOARD_PLATFORM)),) 
  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_KONA

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter lahaina,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_LAHAINA

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter $(MSMSTEPPE) ,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSMSTEPPE

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

hal/audio_extn/hfp.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ 
      defined (PLATFORM_KONA) || defined (PLATFORM_MSMSTEPPE) || \

      defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || \

      defined (PLATFORM_LITO) || defined(PLATFORM_ATOLL) || \

      defined (PLATFORM_BENGAL)

      defined (PLATFORM_BENGAL) || defined (PLATFORM_LAHAINA)

#define HFP_RX_VOLUME     "SLIMBUS_7 LOOPBACK Volume"

#else

#define HFP_RX_VOLUME     "Internal HFP RX Volume"

hal/msm8974/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
    defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || \

    defined (PLATFORM_LITO) || defined (PLATFORM_MSMFALCON) || \

    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL) || \

    defined (PLATFORM_HOLI)

    defined (PLATFORM_HOLI) || defined (PLATFORM_LAHAINA)









#include <sound/devdep_params.h>









#endif








@@ -12126,7 +12126,7 @@ int platform_get_supported_copp_sampling_rate(uint32_t stream_sr)







    defined (PLATFORM_QCS405) || defined (PLATFORM_TRINKET) || \









    defined (PLATFORM_LITO) || defined (PLATFORM_MSMFALCON) || \









    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL) || \









    defined (PLATFORM_HOLI)









    defined (PLATFORM_HOLI) || defined (PLATFORM_LAHAINA)









int platform_get_mmap_data_fd(void *platform, int fe_dev, int dir, int *fd,









                              uint32_t *size)









{
































hal/msm8974/platform.h



+3
−3






























Original line number
Diff line number
Diff line







@@ -466,7 +466,7 @@ enum {







#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 34









#elif PLATFORM_MSMNILE









#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 27









#elif PLATFORM_KONA || PLATFORM_HOLI









#elif PLATFORM_KONA || PLATFORM_HOLI || PLATFORM_LAHAINA









#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 23









#else









#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 35








@@ -494,7 +494,7 @@ enum {







    defined (PLATFORM_MSMSTEPPE) || defined (PLATFORM_QCS405) || \









    defined (PLATFORM_TRINKET) || defined (PLATFORM_LITO) || \









    defined (PLATFORM_ATOLL) || defined (PLATFORM_BENGAL) || \









    defined (PLATFORM_HOLI)









    defined (PLATFORM_HOLI) || defined (PLATFORM_LAHAINA)









#define PLAYBACK_OFFLOAD_DEVICE2 17









#elif defined (PLATFORM_MSMFALCON) || defined (PLATFORM_MSM8937) || \









      defined (PLATFORM_MSM8953)








@@ -510,7 +510,7 @@ enum {







    defined (PLATFORM_LITO) || defined (PLATFORM_MSMFALCON) || \









    defined (PLATFORM_MSM8937) || defined (PLATFORM_ATOLL) || \









    defined (PLATFORM_BENGAL) || defined (PLATFORM_MSM8953) || \









    defined (PLATFORM_HOLI)









    defined (PLATFORM_HOLI) || defined (PLATFORM_LAHAINA)









#define PLAYBACK_OFFLOAD_DEVICE3 18









#define PLAYBACK_OFFLOAD_DEVICE4 34









#define PLAYBACK_OFFLOAD_DEVICE5 35