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

Commit bd246a7a authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

fix msm8960 and msm8916 builds 

am: b1b07992

Change-Id: Ic3374976357ce30735c7a247acd981397665de8d
parents 33bd01ba b1b07992

hal/msm8916/platform.c

+8 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_AFE_PROXY] = "afe-proxy",

    [SND_DEVICE_OUT_USB_HEADSET] = "usb-headphones",

    [SND_DEVICE_OUT_USB_HEADPHONES] = "usb-headphones",

    [SND_DEVICE_OUT_VOICE_USB_HEADSET] = "usb-headphones",

    [SND_DEVICE_OUT_VOICE_USB_HEADPHONES] = "usb-headphones",

    [SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET] = "speaker-and-usb-headphones",

    [SND_DEVICE_OUT_SPEAKER_PROTECTED] = "speaker-protected",

    [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = "voice-speaker-protected",
@@ -303,6 +305,8 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_TX] = 45,

    [SND_DEVICE_OUT_AFE_PROXY] = 0,

    [SND_DEVICE_OUT_USB_HEADSET] = 45,

    [SND_DEVICE_OUT_VOICE_USB_HEADSET] = 45,

    [SND_DEVICE_OUT_VOICE_USB_HEADPHONES] = 45,

    [SND_DEVICE_OUT_USB_HEADPHONES] = 45,

    [SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET] = 14,

    [SND_DEVICE_OUT_SPEAKER_PROTECTED] = 124,
@@ -398,6 +402,8 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TX)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_AFE_PROXY)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_USB_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_USB_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_USB_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_USB_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_PROTECTED)},
@@ -666,7 +672,9 @@ static void set_platform_defaults() 
    backend_table[SND_DEVICE_IN_VOICE_RX] = strdup("afe-proxy");

    backend_table[SND_DEVICE_OUT_AFE_PROXY] = strdup("afe-proxy");

    backend_table[SND_DEVICE_OUT_USB_HEADSET] = strdup("usb-headphones");

    backend_table[SND_DEVICE_OUT_VOICE_USB_HEADSET] = strdup("usb-headphones");

    backend_table[SND_DEVICE_OUT_USB_HEADPHONES] = strdup("usb-headphones");

    backend_table[SND_DEVICE_OUT_VOICE_USB_HEADPHONES] = strdup("usb-headphones");

    backend_table[SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET] =

        strdup("speaker-and-usb-headphones");

    backend_table[SND_DEVICE_IN_USB_HEADSET_MIC] = strdup("usb-headset-mic");

hal/msm8916/platform.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ enum { 
    SND_DEVICE_OUT_ANC_HANDSET,

    SND_DEVICE_OUT_SPEAKER_PROTECTED,

    SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED,

    SND_DEVICE_OUT_VOICE_USB_HEADSET,

    SND_DEVICE_OUT_VOICE_USB_HEADPHONES,

    SND_DEVICE_OUT_END,



    /*

hal/msm8960/platform.c

+9 −0
Original line number Diff line number Diff line
@@ -131,6 +131,11 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [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",

    [SND_DEVICE_OUT_USB_HEADSET] = "usb-headset",

    [SND_DEVICE_OUT_USB_HEADPHONES] = "usb-headphones",

    [SND_DEVICE_OUT_VOICE_USB_HEADSET] = "usb-headset",

    [SND_DEVICE_OUT_VOICE_USB_HEADPHONES] = "usb-headphones",





    /* Capture sound devices */

    [SND_DEVICE_IN_HANDSET_MIC] = "handset-mic",
@@ -180,6 +185,10 @@ static const int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = 17,

    [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = 37,

    [SND_DEVICE_OUT_USB_HEADSET] = 45,

    [SND_DEVICE_OUT_USB_HEADPHONES] = 45,

    [SND_DEVICE_OUT_VOICE_USB_HEADSET] = 45,

    [SND_DEVICE_OUT_VOICE_USB_HEADPHONES] = 45,



    [SND_DEVICE_IN_HANDSET_MIC] = 4,

    [SND_DEVICE_IN_SPEAKER_MIC] = 4,

hal/msm8960/platform.h

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ enum { 
    SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,

    SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,

    SND_DEVICE_OUT_USB_HEADSET,

    SND_DEVICE_OUT_USB_HEADPHONES,

    SND_DEVICE_OUT_VOICE_USB_HEADSET,

    SND_DEVICE_OUT_VOICE_USB_HEADPHONES,

    SND_DEVICE_OUT_END,



    /*