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

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

Merge "hal: Rename & move platform_parser.c"

parents 6986768c 61764e3b

hal/Android.mk

+4 −7
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ endif 
LOCAL_SRC_FILES := \

	audio_hw.c \

	voice.c \

	platform_info.c \

	$(AUDIO_PLATFORM)/platform.c



LOCAL_SRC_FILES += audio_extn/audio_extn.c
@@ -114,23 +115,19 @@ LOCAL_SHARED_LIBRARIES := \ 
	libtinyalsa \

	libtinycompress \

	libaudioroute \

	libdl

	libdl \

	libexpat



LOCAL_C_INCLUDES += \

	external/tinyalsa/include \

	external/tinycompress/include \

	external/expat/lib \

	$(call include-path-for, audio-route) \

	$(call include-path-for, audio-effects) \

	$(LOCAL_PATH)/$(AUDIO_PLATFORM) \

	$(LOCAL_PATH)/audio_extn \

	$(LOCAL_PATH)/voice_extn



ifneq ($(filter msm8974,$(AUDIO_PLATFORM)),)

    LOCAL_C_INCLUDES += external/expat/lib

    LOCAL_SHARED_LIBRARIES += libexpat

    LOCAL_SRC_FILES += $(AUDIO_PLATFORM)/platform_parser.c

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_LISTEN)),true)

    LOCAL_CFLAGS += -DAUDIO_LISTEN_ENABLED

    LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-listen

hal/msm8960/platform.c

+5 −0
Original line number Diff line number Diff line
@@ -391,6 +391,11 @@ int platform_get_pcm_device_id(audio_usecase_t usecase, int device_type) 
    return device_id;

}



int platform_get_snd_device_index(char *snd_device_index_name)

{

    return -ENODEV;

}



int platform_set_snd_device_acdb_id(snd_device_t snd_device, unsigned int acdb_id)

{

    return -ENODEV;

hal/msm8974/platform.c

+102 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "platform.h"

#include "audio_extn.h"

#include "voice_extn.h"

#include "platform_parser.h"



#define MIXER_XML_PATH "/system/etc/mixer_paths.xml"

#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"
@@ -295,6 +294,84 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_CAPTURE_VI_FEEDBACK] = 102,

};



struct snd_device_index {

    char name[100];

    unsigned int index;

};



#define TO_NAME_INDEX(X)   #X, X



/* Used to get index from parsed sting */

struct snd_device_index snd_device_name_index[SND_DEVICE_MAX] = {

    {TO_NAME_INDEX(SND_DEVICE_OUT_HANDSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_REVERSE)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HANDSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HDMI)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_BT_SCO)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_BT_SCO_WB)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_AFE_PROXY)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_USB_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_TRANSMISSION_FM)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_ANC_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_ANC_FB_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_ANC_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_ANC_HANDSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC_AEC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC_AEC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_MIC_AEC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_MIC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_MIC_AEC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HEADSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HEADSET_MIC_FLUENCE)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_SPEAKER_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_HEADSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HDMI_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC_WB)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAMCORDER_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_SPEAKER_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_SPEAKER_QMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_MIC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_DMIC_STEREO)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE)},

    {TO_NAME_INDEX(SND_DEVICE_IN_USB_HEADSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAPTURE_FM)},

    {TO_NAME_INDEX(SND_DEVICE_IN_AANC_HANDSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_QUAD_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_STEREO_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_STEREO_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAPTURE_VI_FEEDBACK)},

};



#define DEEP_BUFFER_PLATFORM_DELAY (29*1000LL)

#define LOW_LATENCY_PLATFORM_DELAY (13*1000LL)
@@ -673,6 +750,30 @@ int platform_get_pcm_device_id(audio_usecase_t usecase, int device_type) 
    return device_id;

}



int platform_get_snd_device_index(char *snd_device_index_name)

{

    int ret = 0;

    int i;



    if (snd_device_index_name == NULL) {

        ALOGE("%s: snd_device_index_name is NULL", __func__);

        ret = -ENODEV;

        goto done;

    }



    for (i=0; i < SND_DEVICE_MAX; i++) {

        if(strcmp(snd_device_name_index[i].name, snd_device_index_name) == 0) {

            ret = snd_device_name_index[i].index;

            goto done;

        }

    }

    ALOGE("%s: Could not find index for snd_device_index_name = %s",

            __func__, snd_device_index_name);

    ret = -ENODEV;

done:

    return ret;

}



int platform_set_snd_device_acdb_id(snd_device_t snd_device, unsigned int acdb_id)

{

    int ret = 0;

hal/msm8974/platform_parser.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

 * met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above

 *       copyright notice, this list of conditions and the following

 *       disclaimer in the documentation and/or other materials provided

 *       with the distribution.

 *     * Neither the name of The Linux Foundation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#ifndef AUDIO_PLATFORM_PARSER_H

#define AUDIO_PLATFORM_PARSER_H



int platform_info_init(void);



#endif // AUDIO_PLATFORM_PARSER_H

hal/platform_api.h

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ int platform_get_snd_device_name_extn(void *platform, snd_device_t snd_device, 
                                      char *device_name);

void platform_add_backend_name(char *mixer_path, snd_device_t snd_device);

int platform_get_pcm_device_id(audio_usecase_t usecase, int device_type);

int platform_get_snd_device_index(char *snd_device_index_name);

int platform_set_snd_device_acdb_id(snd_device_t snd_device, unsigned int acdb_id);

int platform_send_audio_calibration(void *platform, snd_device_t snd_device);

int platform_switch_voice_call_device_pre(void *platform);
@@ -58,4 +59,7 @@ int platform_update_usecase_from_source(int source, audio_usecase_t usecase); 


bool platform_listen_update_status(snd_device_t snd_device);



/* From platform_info_parser.c */

int platform_info_init(void);



#endif // AUDIO_PLATFORM_API_H