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

Commit 89c6a7f4 authored by Mingming Yin's avatar Mingming Yin
Browse files

audio: renaming thulium to msm8996 

Use appropriate SOC name.

Change-Id: I08e17ec9b240869c5357ad181f1fb17a0d06b969
parent 94a5bdc4

Android.mk

+1 −1
Original line number Diff line number Diff line 
ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 thulium,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996,$(TARGET_BOARD_PLATFORM)),)



MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_ARM_MODE := arm 


AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 thulium,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8610 apq8084 msm8994 msm8992 msm8996,$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -27,8 +27,8 @@ endif 
ifneq ($(filter msm8992,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8994

endif

ifneq ($(filter thulium,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_THULIUM

ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_MSM8996

endif

endif

hal/msm8916/platform.h

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ enum { 
#define PLAYBACK_OFFLOAD_DEVICE8 38

#define PLAYBACK_OFFLOAD_DEVICE9 39

#endif

#if defined (PLATFORM_MSM8994) || defined (PLATFORM_THULIUM)

#if defined (PLATFORM_MSM8994)

#define PLAYBACK_OFFLOAD_DEVICE2 17

#define PLAYBACK_OFFLOAD_DEVICE3 18

#define PLAYBACK_OFFLOAD_DEVICE4 37

hal/msm8974/hw_info.c

+16 −16
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static const snd_device_t tomtom_msm8994_CDP_variant_devices[] = { 
    SND_DEVICE_IN_HANDSET_MIC,

};



static const snd_device_t tomtom_thulium_CDP_variant_devices[] = {

static const snd_device_t tomtom_8996_CDP_variant_devices[] = {

};



static const snd_device_t tomtom_liquid_variant_devices[] = {
@@ -252,34 +252,34 @@ static void update_hardware_info_8994(struct hardware_info *hw_info, const char 
    }

}



static void  update_hardware_info_thulium(struct hardware_info *hw_info, const char *snd_card_name)

static void  update_hardware_info_8996(struct hardware_info *hw_info, const char *snd_card_name)

{

    if (!strcmp(snd_card_name, "msmthulium-tomtom-mtp-snd-card")) {

    if (!strcmp(snd_card_name, "msm8996-tomtom-mtp-snd-card")) {

        strlcpy(hw_info->type, " mtp", sizeof(hw_info->type));

        strlcpy(hw_info->name, "msmthulium", sizeof(hw_info->name));

        strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));

        hw_info->snd_devices = NULL;

        hw_info->num_snd_devices = 0;

        strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));

    } else if (!strcmp(snd_card_name, "msmthulium-tomtom-cdp-snd-card")) {

    } else if (!strcmp(snd_card_name, "msm8996-tomtom-cdp-snd-card")) {

        strlcpy(hw_info->type, " cdp", sizeof(hw_info->type));

        strlcpy(hw_info->name, "msmthulium", sizeof(hw_info->name));

        hw_info->snd_devices = (snd_device_t *)tomtom_thulium_CDP_variant_devices;

        hw_info->num_snd_devices = ARRAY_SIZE(tomtom_thulium_CDP_variant_devices);

        strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));

        hw_info->snd_devices = (snd_device_t *)tomtom_8996_CDP_variant_devices;

        hw_info->num_snd_devices = ARRAY_SIZE(tomtom_8996_CDP_variant_devices);

        strlcpy(hw_info->dev_extn, "-cdp", sizeof(hw_info->dev_extn));

    } else if (!strcmp(snd_card_name, "msmthulium-tomtom-stp-snd-card")) {

    } else if (!strcmp(snd_card_name, "msm8996-tomtom-stp-snd-card")) {

        strlcpy(hw_info->type, " stp", sizeof(hw_info->type));

        strlcpy(hw_info->name, "msmthulium", sizeof(hw_info->name));

        strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));

        hw_info->snd_devices = (snd_device_t *)tomtom_stp_variant_devices;

        hw_info->num_snd_devices = ARRAY_SIZE(tomtom_stp_variant_devices);

        strlcpy(hw_info->dev_extn, "-stp", sizeof(hw_info->dev_extn));

    } else if (!strcmp(snd_card_name, "msmthulium-tomtom-liquid-snd-card")) {

    } else if (!strcmp(snd_card_name, "msm8996-tomtom-liquid-snd-card")) {

        strlcpy(hw_info->type, " liquid", sizeof(hw_info->type));

        strlcpy(hw_info->name, "msmthulium", sizeof(hw_info->name));

        strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));

        hw_info->snd_devices = (snd_device_t *)tomtom_liquid_variant_devices;

        hw_info->num_snd_devices = ARRAY_SIZE(tomtom_liquid_variant_devices);

        strlcpy(hw_info->dev_extn, "-liquid", sizeof(hw_info->dev_extn));

    } else {

        ALOGW("%s: Not a thulium device", __func__);

        ALOGW("%s: Not a 8996 device", __func__);

    }

}
@@ -408,9 +408,9 @@ void *hw_info_init(const char *snd_card_name) 
    } else if(strstr(snd_card_name, "msm8994")) {

        ALOGV("8994 - variant soundcard");

        update_hardware_info_8994(hw_info, snd_card_name);

    } else if(strstr(snd_card_name, "thulium")) {

        ALOGV("thulium - variant soundcard");

        update_hardware_info_thulium(hw_info, snd_card_name);

    } else if(strstr(snd_card_name, "msm8996")) {

        ALOGV("8996 - variant soundcard");

        update_hardware_info_8996(hw_info, snd_card_name);

    } else {

        ALOGE("%s: Unsupported target %s:",__func__, snd_card_name);

        free(hw_info);

hal/msm8974/platform.h

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ enum { 
#define PLAYBACK_OFFLOAD_DEVICE8 38

#define PLAYBACK_OFFLOAD_DEVICE9 39

#endif

#if defined (PLATFORM_MSM8994) || defined (PLATFORM_THULIUM)

#if defined (PLATFORM_MSM8994) || defined (PLATFORM_MSM8996)

#define PLAYBACK_OFFLOAD_DEVICE2 17

#define PLAYBACK_OFFLOAD_DEVICE3 18

#define PLAYBACK_OFFLOAD_DEVICE4 37
@@ -303,7 +303,7 @@ enum { 
#define FM_RX_VOLUME "Quat MI2S FM RX Volume"

#elif PLATFORM_MSM8994

#define FM_RX_VOLUME "PRI MI2S LOOPBACK Volume"

#elif PLATFORM_THULIUM

#elif PLATFORM_MSM8996

#define FM_RX_VOLUME "Tert MI2S LOOPBACK Volume"

#else

#define FM_RX_VOLUME "Internal FM RX Volume"