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

Commit f0c1de2d authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge e327f61c on remote branch 

Change-Id: Id714a52750ebc9518c8a63bab255983bbc9930a4
parents aeb79f08 e327f61c

configs/lahaina/audio_platform_info_yupikidprb3.xml

0 → 100644
+486 −0

File added.

Preview size limit exceeded, changes collapsed.

configs/lahaina/lahaina.mk

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_intcodec.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_platform_info_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_yupikqrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_platform_info_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_yupikidp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_platform_info_yupikidprb3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_yupikidprb3.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikidp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikidprb3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikidprb3.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikqrd.xml \

hal/audio_extn/sndmonitor.c

+2 −2
Original line number Diff line number Diff line
@@ -166,13 +166,13 @@ static int add_new_sndcard(int card, int fd) 
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))

    bool online = state && !strcmp(state, "ONLINE");



    if (state)

        free(state);

#else

    bool online = atoi(state);

#endif



    ALOGV("card %d initial state %s %d", card, state, online);

    if (state)

        free(state);



    s->status = online ? CARD_STATUS_ONLINE : CARD_STATUS_OFFLINE;

    list_add_tail(&sndmonitor.cards, &s->node);

hal/audio_extn/soundtrigger.c

+24 −1
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 
 * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * Changes from Qualcomm Innovation Center are provided under the following license:

 * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.

 * SPDX-License-Identifier: BSD-3-Clause-Clear

 *

 */

#define LOG_TAG "soundtrigger"

/* #define LOG_NDEBUG 0 */
@@ -872,13 +876,32 @@ cleanup: 


}



int clear_device_list(struct listnode *devices)

{

     struct listnode *node = NULL, *temp = NULL;

     struct sound_trigger_info *item = NULL;



     if (devices == NULL)

         return 0;



     list_for_each_safe (node, temp, devices) {

         item = node_to_item(node, struct sound_trigger_info, list);

         if (item != NULL) {

             list_remove(&item->list);

             free(item);

        }

     }



     return 0;

}



void audio_extn_sound_trigger_deinit(struct audio_device *adev)

{

    ALOGI("%s: Enter", __func__);

    if (st_dev && (st_dev->adev == adev) && st_dev->lib_handle) {

        audio_extn_snd_mon_unregister_listener(st_dev);

        dlclose(st_dev->lib_handle);

        clear_devices(&st_dev->st_ses_list);

        clear_device_list(&st_dev->st_ses_list);

        free(st_dev);

        st_dev = NULL;

    }

configs/lahaina/yupik_overlay/mixer_paths_yupikidprb3_overlay.xml

+15 −15

File changed.

Contains only whitespace changes.