p3100: refine incall bluetooth audio

Change-Id: I35e39c4603e2504f6651843300ba3eff40ceee98
CyanogenMod · Apr 15, 2013 · 27e291e · 27e291e
1 parent a5f9f36
commit 27e291e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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">