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

Commit 9830cc06 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Fix device list initializations"

parents 2f3cc011 6bfa5169

hal/audio_extn/auto_hal.c

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ int auto_hal_create_audio_patch(struct audio_hw_device *dev, 
                ALOGV("Creating audio patch for external FM tuner");

                uc_info->id = USECASE_AUDIO_FM_TUNER_EXT;

                uc_info->type = PCM_PASSTHROUGH;

                list_init(&uc_info->device_list);

                reassign_device_list(&uc_info->device_list, AUDIO_DEVICE_IN_FM_TUNER,

                                     sources->ext.device.address);

                uc_info->in_snd_device = SND_DEVICE_IN_CAPTURE_FM;
@@ -713,6 +714,7 @@ int auto_hal_start_hfp_downlink(struct audio_device *adev, 


    uc_downlink_info->type = PCM_HFP_CALL;

    uc_downlink_info->stream.out = adev->primary_output;

    list_init(&uc_downlink_info->device_list);

    assign_devices(&uc_downlink_info->device_list, &adev->primary_output->device_list);

    uc_downlink_info->in_snd_device = SND_DEVICE_NONE;

    uc_downlink_info->out_snd_device = SND_DEVICE_NONE;

hal/audio_extn/fm.c

+2 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static int32_t fm_start(struct audio_device *adev, audio_devices_t outputDevices 
    fm_out->format = AUDIO_FORMAT_PCM_16_BIT;

    fm_out->usecase = USECASE_AUDIO_PLAYBACK_FM;

    fm_out->config = pcm_config_fm;

    list_init(&fm_out->device_list);

    reassign_device_list(&fm_out->device_list, outputDevices, "");

    fmmod.is_fm_running = true;
@@ -195,6 +196,7 @@ static int32_t fm_start(struct audio_device *adev, audio_devices_t outputDevices 
    uc_info->id = USECASE_AUDIO_PLAYBACK_FM;

    uc_info->type = PCM_PLAYBACK;

    uc_info->stream.out = fm_out;

    list_init(&uc_info->device_list);

    reassign_device_list(&uc_info->device_list, outputDevices, "");

    uc_info->in_snd_device = SND_DEVICE_NONE;

    uc_info->out_snd_device = SND_DEVICE_NONE;