evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: qdsp6v2: increase max Rx DTMF duration"

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-16 10:28:45 -07:00 • committed by Gerrit - the friendly Code Review server
commit 45df31e9af
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/msm/qdsp6v2/msm-pcm-dtmf-v2.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2013-2014, 2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -97,12 +97,12 @@ static int msm_dtmf_rx_generate_put(struct snd_kcontrol *kcontrol,
{
uint16_t low_freq = ucontrol->value.integer.value[0];
uint16_t high_freq = ucontrol->value.integer.value[1];
int64_t duration = ucontrol->value.integer.value[2];
int16_t duration = ucontrol->value.integer.value[2];
uint16_t gain = ucontrol->value.integer.value[3];
pr_debug("%s: low_freq=%d high_freq=%d duration=%d gain=%d\n",
__func__, low_freq, high_freq, (int)duration, gain);
afe_dtmf_generate_rx(duration, high_freq, low_freq, gain);
afe_dtmf_generate_rx((int64_t) duration, high_freq, low_freq, gain);
return 0;
}
@ -154,7 +154,7 @@ static int msm_dtmf_detect_volte_rx_get(struct snd_kcontrol *kcontrol,
static struct snd_kcontrol_new msm_dtmf_controls[] = {
SOC_SINGLE_MULTI_EXT("DTMF_Generate Rx Low High Duration Gain",
SND_SOC_NOPM, 0, 5000, 0, 4,
SND_SOC_NOPM, 0, 65535, 0, 4,
msm_dtmf_rx_generate_get,
msm_dtmf_rx_generate_put),
SOC_SINGLE_EXT("DTMF_Detect Rx Voice enable", SND_SOC_NOPM, 0, 1, 0,