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

Commit 374795fa authored by Steve Pfetsch's avatar Steve Pfetsch
Browse files

Revert "hal: add single session VSID voice call support" 

This reverts commit 24cc3575.
parent 24cc3575

hal/audio_hw.c

+1 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2016 The Android Open Source Project

 * Copyright (C) 2013-2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -172,8 +172,6 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
    [USECASE_VOLTE_CALL] = "volte-call",

    [USECASE_QCHAT_CALL] = "qchat-call",

    [USECASE_VOWLAN_CALL] = "vowlan-call",

    [USECASE_VOICEMMODE1_CALL] = "voicemmode1-call",

    [USECASE_VOICEMMODE2_CALL] = "voicemmode2-call",



    [USECASE_AUDIO_SPKR_CALIB_RX] = "spkr-rx-calib",

    [USECASE_AUDIO_SPKR_CALIB_TX] = "spkr-vi-record",

hal/audio_hw.h

+7 −23
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2016 The Android Open Source Project

 * Copyright (C) 2013-2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -69,29 +69,13 @@ enum { 
    USECASE_AUDIO_RECORD,

    USECASE_AUDIO_RECORD_LOW_LATENCY,



    /* Voice extension usecases

     *

     * Following usecase are specific to voice session names created by

     * MODEM and APPS on 8992/8994/8084/8974 platforms.

     */

    USECASE_VOICE_CALL,  /* Usecase setup for voice session on first subscription for DSDS/DSDA */

    USECASE_VOICE2_CALL, /* Usecase setup for voice session on second subscription for DSDS/DSDA */

    USECASE_VOLTE_CALL,  /* Usecase setup for VoLTE session on first subscription */

    USECASE_QCHAT_CALL,  /* Usecase setup for QCHAT session */

    USECASE_VOWLAN_CALL, /* Usecase setup for VoWLAN session */



    /*

     * Following usecase are specific to voice session names created by

     * MODEM and APPS on 8996 platforms.

     */



    USECASE_VOICEMMODE1_CALL, /* Usecase setup for Voice/VoLTE/VoWLAN sessions on first

                               * subscription for DSDS/DSDA

                               */

    USECASE_VOICEMMODE2_CALL, /* Usecase setup for voice/VoLTE/VoWLAN sessions on second

                               * subscription for DSDS/DSDA

                               */

    USECASE_VOICE_CALL,



    /* Voice extension usecases */

    USECASE_VOICE2_CALL,

    USECASE_VOLTE_CALL,

    USECASE_QCHAT_CALL,

    USECASE_VOWLAN_CALL,

    USECASE_INCALL_REC_UPLINK,

    USECASE_INCALL_REC_DOWNLINK,

    USECASE_INCALL_REC_UPLINK_AND_DOWNLINK,

hal/msm8974/platform.c

+1 −6
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2016 The Android Open Source Project

 * Copyright (C) 2013-2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -153,11 +153,6 @@ static int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
    [USECASE_VOLTE_CALL] = {VOLTE_CALL_PCM_DEVICE, VOLTE_CALL_PCM_DEVICE},

    [USECASE_QCHAT_CALL] = {QCHAT_CALL_PCM_DEVICE, QCHAT_CALL_PCM_DEVICE},

    [USECASE_VOWLAN_CALL] = {VOWLAN_CALL_PCM_DEVICE, VOWLAN_CALL_PCM_DEVICE},

    [USECASE_VOICEMMODE1_CALL] = {VOICEMMODE1_CALL_PCM_DEVICE,

                                  VOICEMMODE1_CALL_PCM_DEVICE},

    [USECASE_VOICEMMODE2_CALL] = {VOICEMMODE2_CALL_PCM_DEVICE,

                                  VOICEMMODE2_CALL_PCM_DEVICE},



    [USECASE_INCALL_REC_UPLINK] = {AUDIO_RECORD_PCM_DEVICE,

                                   AUDIO_RECORD_PCM_DEVICE},

    [USECASE_INCALL_REC_DOWNLINK] = {AUDIO_RECORD_PCM_DEVICE,

hal/msm8974/platform.h

+1 −15
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2016 The Android Open Source Project

 * Copyright (C) 2013-2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -222,12 +222,6 @@ enum { 
#define VOLTE_CALL_PCM_DEVICE 21

#define QCHAT_CALL_PCM_DEVICE 33

#define VOWLAN_CALL_PCM_DEVICE -1

#elif PLATFORM_MSM8996

#define VOICE_CALL_PCM_DEVICE 40

#define VOICE2_CALL_PCM_DEVICE 41

#define VOLTE_CALL_PCM_DEVICE 14

#define QCHAT_CALL_PCM_DEVICE 20

#define VOWLAN_CALL_PCM_DEVICE 33

#else

#define VOICE_CALL_PCM_DEVICE 2

#define VOICE2_CALL_PCM_DEVICE 22
@@ -236,14 +230,6 @@ enum { 
#define VOWLAN_CALL_PCM_DEVICE 36

#endif



#ifdef PLATFORM_MSM8996

#define VOICEMMODE1_CALL_PCM_DEVICE 2

#define VOICEMMODE2_CALL_PCM_DEVICE 22

#else

#define VOICEMMODE1_CALL_PCM_DEVICE 44

#define VOICEMMODE2_CALL_PCM_DEVICE 45

#endif



#define AFE_PROXY_PLAYBACK_PCM_DEVICE 7

#define AFE_PROXY_RECORD_PCM_DEVICE 8

hal/voice.h

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014-2016 The Android Open Source Project

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ 
#define VOICE_SESS_IDX     (BASE_SESS_IDX)



#ifdef MULTI_VOICE_SESSION_ENABLED

#define MAX_VOICE_SESSIONS 7

#define MAX_VOICE_SESSIONS 5

#else

#define MAX_VOICE_SESSIONS 1

#endif