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

Commit 63ac6c78 authored by Hendrik Hagendorn's avatar Hendrik Hagendorn Committed by Bruno Martins
Browse files

hal: Remove duplicated HFP if branch (mismerge) 

Change-Id: I4b867e7a3b49275926759a262f2a3b059d4dc713
parent d2cce7eb

hal/audio_extn/audio_extn.h

+0 −6
Original line number Diff line number Diff line
@@ -253,12 +253,6 @@ bool audio_extn_hfp_is_active(struct audio_device *adev); 
audio_usecase_t audio_extn_hfp_get_usecase();

#endif



#ifndef HFP_ENABLED

#define audio_extn_hfp_is_active(adev)                  (0)

#else

bool audio_extn_hfp_is_active(struct audio_device *adev);

#endif



#ifndef KPI_OPTIMIZE_ENABLED

#define audio_extn_perf_lock_init() (0)

#define audio_extn_perf_lock_acquire() (0)

hal/audio_hw.c

+0 −6
Original line number Diff line number Diff line
@@ -924,12 +924,6 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
                   in_snd_device = hfp_usecase->in_snd_device;

                   out_snd_device = hfp_usecase->out_snd_device;

            }

        } else if (audio_extn_hfp_is_active(adev)) {

            hfp_usecase = get_usecase_from_list(adev, USECASE_AUDIO_HFP_SCO);

            if (hfp_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) {

                   in_snd_device = hfp_usecase->in_snd_device;

                   out_snd_device = hfp_usecase->out_snd_device;

            }

        }

        if (usecase->type == PCM_PLAYBACK) {

            usecase->devices = usecase->stream.out->devices;