summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-04-15 19:30:57 +0200
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-04-15 19:30:57 +0200
commit27e291e77bdf4229c4c24225516a28a6b44de8c4 (patch)
treece2e0e8471535868f618ed5feef4679dd09fca84
parenta5f9f3650d8156d3e96a88a280d07b266a04384d (diff)
downloaddevice_samsung_p3100-27e291e77bdf4229c4c24225516a28a6b44de8c4.zip
device_samsung_p3100-27e291e77bdf4229c4c24225516a28a6b44de8c4.tar.gz
device_samsung_p3100-27e291e77bdf4229c4c24225516a28a6b44de8c4.tar.bz2
p3100: refine incall bluetooth audio
Change-Id: I35e39c4603e2504f6651843300ba3eff40ceee98
-rwxr-xr-xaudio/audio_hw.c5
-rw-r--r--audio/audio_hw.h12
-rw-r--r--configs/tiny_hw.xml2
3 files changed, 19 insertions, 0 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 2fcd739..3890f42 100755
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -707,6 +707,11 @@ static void select_output_device(struct espresso_audio_device *adev)
set_bigroute_by_array(adev->mixer, bt_input, 1);
ALOGD("%s: set voicecall route: bt_output", __func__);
set_bigroute_by_array(adev->mixer, bt_output, 1);
+ } else {
+ ALOGD("%s: set voicecall route: bt_input_disable", __func__);
+ set_bigroute_by_array(adev->mixer, bt_input_disable, 1);
+ ALOGD("%s: set voicecall route: bt_output_disable", __func__);
+ set_bigroute_by_array(adev->mixer, bt_output_disable, 1);
}
set_incall_device(adev);
}
diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index 70afc63..d2b2e0e 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -197,6 +197,12 @@ struct route_setting bt_output[] = {
{ .ctl_name = NULL, },
};
+struct route_setting bt_output_disable[] = {
+ { .ctl_name = "AIF2DAC2L Mixer AIF2 Switch", .intval = 0, },
+ { .ctl_name = "AIF2DAC2R Mixer AIF2 Switch", .intval = 0, },
+ { .ctl_name = NULL, },
+};
+
struct route_setting bt_input[] = {
{ .ctl_name = "AIF2ADC Mux", .intval = 1, },
{ .ctl_name = "AIF2DACR Source", .intval = 1, },
@@ -214,3 +220,9 @@ struct route_setting bt_input[] = {
{ .ctl_name = "MIXINL IN1L Switch", .intval = 0, },
{ .ctl_name = NULL, },
};
+
+struct route_setting bt_input_disable[] = {
+ { .ctl_name = "AIF2ADC Mux", .intval = 0, },
+ { .ctl_name = "HP Switch", .intval = 1, },
+ { .ctl_name = NULL, },
+};
diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml
index 7daaec8..5c2d03c 100644
--- a/configs/tiny_hw.xml
+++ b/configs/tiny_hw.xml
@@ -164,6 +164,8 @@ We are able to have most of our routing static so do that
<ctl name="AIF3ADC Mux" val="0"/>
<ctl name="AIF2DAC2L Mixer AIF1.1 Switch" val="0"/>
<ctl name="AIF2DAC2R Mixer AIF1.1 Switch" val="0"/>
+ <ctl name="AIF2ADCL Source" val="Left"/>
+ <ctl name="AIF2ADCR Source" val="Right"/>
</path>
</device>
<device name="dock">