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

Commit df817f5c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Remove mobile carrier specific ACDB devices"

parents e04e27fa ceb40823

hal/msm8960/platform.c

+2 −38
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_HDMI] = "hdmi",

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = "speaker-and-hdmi",

    [SND_DEVICE_OUT_BT_SCO] = "bt-sco-headset",

    [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = "voice-handset-tmus",

    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = "voice-tty-full-headphones",

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = "voice-tty-vco-headphones",

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = "voice-tty-hco-handset",
@@ -143,7 +142,6 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_BT_SCO_MIC] = "bt-sco-mic",

    [SND_DEVICE_IN_CAMCORDER_MIC] = "camcorder-mic",

    [SND_DEVICE_IN_VOICE_DMIC] = "voice-dmic-ef",

    [SND_DEVICE_IN_VOICE_DMIC_TMUS] = "voice-dmic-ef-tmus",

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = "voice-speaker-dmic-ef",

    [SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC] = "voice-tty-full-headset-mic",

    [SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC] = "voice-tty-vco-handset-mic",
@@ -166,7 +164,6 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_HDMI] = 18,

    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 14,

    [SND_DEVICE_OUT_BT_SCO] = 22,

    [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = 81,

    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = 37,
@@ -183,7 +180,6 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_BT_SCO_MIC] = 21,

    [SND_DEVICE_IN_CAMCORDER_MIC] = 61,

    [SND_DEVICE_IN_VOICE_DMIC] = 6,

    [SND_DEVICE_IN_VOICE_DMIC_TMUS] = 91,

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = 13,

    [SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC] = 16,

    [SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC] = 36,
@@ -197,32 +193,6 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { 
#define DEEP_BUFFER_PLATFORM_DELAY (29*1000LL)

#define LOW_LATENCY_PLATFORM_DELAY (13*1000LL)



static pthread_once_t check_op_once_ctl = PTHREAD_ONCE_INIT;

static bool is_tmus = false;



static void check_operator()

{

    char value[PROPERTY_VALUE_MAX];

    int mccmnc;

    property_get("gsm.sim.operator.numeric",value,"0");

    mccmnc = atoi(value);

    ALOGD("%s: tmus mccmnc %d", __func__, mccmnc);

    switch(mccmnc) {

    /* TMUS MCC(310), MNC(490, 260, 026) */

    case 310490:

    case 310260:

    case 310026:

        is_tmus = true;

        break;

    }

}



bool is_operator_tmus()

{

    pthread_once(&check_op_once_ctl, check_operator);

    return is_tmus;

}



static int set_echo_reference(struct mixer *mixer, const char* ec_ref)

{

    struct mixer_ctl *ctl;
@@ -611,9 +581,6 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
        } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {

            snd_device = SND_DEVICE_OUT_VOICE_SPEAKER;

        } else if (devices & AUDIO_DEVICE_OUT_EARPIECE) {

            if (is_operator_tmus())

                snd_device = SND_DEVICE_OUT_VOICE_HANDSET_TMUS;

            else

            snd_device = SND_DEVICE_OUT_HANDSET;

        }

        if (snd_device != SND_DEVICE_NONE) {
@@ -714,9 +681,6 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                my_data->fluence_in_voice_call == false) {

                snd_device = SND_DEVICE_IN_HANDSET_MIC;

            } else {

                if (is_operator_tmus())

                    snd_device = SND_DEVICE_IN_VOICE_DMIC_TMUS;

                else

                snd_device = SND_DEVICE_IN_VOICE_DMIC;

                adev->acdb_settings |= DMIC_FLAG;

            }

hal/msm8960/platform.h

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ enum { 
    SND_DEVICE_OUT_HDMI,

    SND_DEVICE_OUT_SPEAKER_AND_HDMI,

    SND_DEVICE_OUT_BT_SCO,

    SND_DEVICE_OUT_VOICE_HANDSET_TMUS,

    SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,
@@ -79,7 +78,6 @@ enum { 
    SND_DEVICE_IN_BT_SCO_MIC,

    SND_DEVICE_IN_CAMCORDER_MIC,

    SND_DEVICE_IN_VOICE_DMIC,

    SND_DEVICE_IN_VOICE_DMIC_TMUS,

    SND_DEVICE_IN_VOICE_SPEAKER_DMIC,

    SND_DEVICE_IN_VOICE_SPEAKER_QMIC,

    SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC,

hal/msm8974/platform.c

+2 −50
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = "speaker-and-hdmi",

    [SND_DEVICE_OUT_BT_SCO] = "bt-sco-headset",

    [SND_DEVICE_OUT_BT_SCO_WB] = "bt-sco-headset-wb",

    [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = "voice-handset-tmus",

    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = "voice-tty-full-headphones",

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = "voice-tty-vco-headphones",

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = "voice-tty-hco-handset",
@@ -173,7 +172,6 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_BT_SCO_MIC_WB] = "bt-sco-mic-wb",

    [SND_DEVICE_IN_CAMCORDER_MIC] = "camcorder-mic",

    [SND_DEVICE_IN_VOICE_DMIC] = "voice-dmic-ef",

    [SND_DEVICE_IN_VOICE_DMIC_TMUS] = "voice-dmic-ef-tmus",

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = "voice-speaker-dmic-ef",

    [SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC] = "voice-tty-full-headset-mic",

    [SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC] = "voice-tty-vco-handset-mic",
@@ -205,7 +203,6 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 15,

    [SND_DEVICE_OUT_BT_SCO] = 22,

    [SND_DEVICE_OUT_BT_SCO_WB] = 39,

    [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = 88,

    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = 37,
@@ -234,7 +231,6 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_BT_SCO_MIC_WB] = 38,

    [SND_DEVICE_IN_CAMCORDER_MIC] = 61,

    [SND_DEVICE_IN_VOICE_DMIC] = 41,

    [SND_DEVICE_IN_VOICE_DMIC_TMUS] = 89,

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = 43,

    [SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC] = 16,

    [SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC] = 36,
@@ -255,45 +251,6 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { 
#define DEEP_BUFFER_PLATFORM_DELAY (29*1000LL)

#define LOW_LATENCY_PLATFORM_DELAY (13*1000LL)



static pthread_once_t check_op_once_ctl = PTHREAD_ONCE_INIT;

static bool is_tmus = false;



static void check_operator()

{

    char value[PROPERTY_VALUE_MAX];

    int mccmnc;

    property_get("gsm.sim.operator.numeric",value,"0");

    mccmnc = atoi(value);

    ALOGD("%s: tmus mccmnc %d", __func__, mccmnc);

    switch(mccmnc) {

    /* TMUS MCC(310), MNC(490, 260, 026) */

    case 310490:

    case 310260:

    case 310026:

    /* Add new TMUS MNC(800, 660, 580, 310, 270, 250, 240, 230, 220, 210, 200, 160) */

    case 310800:

    case 310660:

    case 310580:

    case 310310:

    case 310270:

    case 310250:

    case 310240:

    case 310230:

    case 310220:

    case 310210:

    case 310200:

    case 310160:

        is_tmus = true;

        break;

    }

}



bool is_operator_tmus()

{

    pthread_once(&check_op_once_ctl, check_operator);

    return is_tmus;

}



static int set_echo_reference(struct mixer *mixer, const char* ec_ref)

{

    struct mixer_ctl *ctl;
@@ -648,9 +605,7 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
        } else if (devices & AUDIO_DEVICE_OUT_FM_TX) {

            snd_device = SND_DEVICE_OUT_TRANSMISSION_FM;

        } else if (devices & AUDIO_DEVICE_OUT_EARPIECE) {

            if (is_operator_tmus())

                snd_device = SND_DEVICE_OUT_VOICE_HANDSET_TMUS;

            else if (audio_extn_should_use_handset_anc(channel_count))

            if (audio_extn_should_use_handset_anc(channel_count))

                snd_device = SND_DEVICE_OUT_ANC_HANDSET;

            else

                snd_device = SND_DEVICE_OUT_VOICE_HANDSET;
@@ -784,9 +739,6 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                my_data->fluence_in_voice_call == false) {

                snd_device = SND_DEVICE_IN_HANDSET_MIC;

            } else {

                if (is_operator_tmus())

                    snd_device = SND_DEVICE_IN_VOICE_DMIC_TMUS;

                else

                snd_device = SND_DEVICE_IN_VOICE_DMIC;

                adev->acdb_settings |= DMIC_FLAG;

            }

hal/msm8974/platform.h

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ enum { 
    SND_DEVICE_OUT_SPEAKER_AND_HDMI,

    SND_DEVICE_OUT_BT_SCO,

    SND_DEVICE_OUT_BT_SCO_WB,

    SND_DEVICE_OUT_VOICE_HANDSET_TMUS,

    SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,
@@ -93,7 +92,6 @@ enum { 
    SND_DEVICE_IN_BT_SCO_MIC_WB,

    SND_DEVICE_IN_CAMCORDER_MIC,

    SND_DEVICE_IN_VOICE_DMIC,

    SND_DEVICE_IN_VOICE_DMIC_TMUS,

    SND_DEVICE_IN_VOICE_SPEAKER_DMIC,

    SND_DEVICE_IN_VOICE_SPEAKER_QMIC,

    SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC,