From 513cd167e55dfaf68144ce7d8fa7a2af1d312c18 Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Wed, 4 Jul 2012 17:50:49 +0200 Subject: correct audio configs --- configs/Volume.db | Bin 10240 -> 10240 bytes configs/default_gain.conf | 941 ++++++---------------------------------------- configs/tinyucm.conf | 89 +---- 3 files changed, 136 insertions(+), 894 deletions(-) diff --git a/configs/Volume.db b/configs/Volume.db index 432428f..b0727c5 100644 Binary files a/configs/Volume.db and b/configs/Volume.db differ diff --git a/configs/default_gain.conf b/configs/default_gain.conf index 4d3e3ac..ddba7b8 100644 --- a/configs/default_gain.conf +++ b/configs/default_gain.conf @@ -5,30 +5,6 @@ Modifier "Normal" { SupportedDevice { - "Earpiece" - } - Enable { - { "AIF1DAC1 Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } - Disable { - { "AIF1DAC1 Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } -} - -Modifier "Normal" { - SupportedDevice { "Speaker" } Enable { @@ -147,200 +123,9 @@ Modifier "Normal" { } } -#Modifier : Incall -Modifier "Incall" { - SupportedDevice { - "Earpiece" - } - Enable { - { "AIF2DAC2L Mixer AIF2 Switch", 0 }, - { "AIF2DAC2R Mixer AIF2 Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, - { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } - Disable { - { "AIF1DAC1 Volume", 96 }, - { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } -} - -Modifier "Incall" { - SupportedDevice { - "Speaker" - } - Enable { - { "AIF2DAC2L Mixer AIF2 Switch", 0 }, - { "AIF2DAC2R Mixer AIF2 Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, - { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "SPKL DAC1 Volume", 1 }, - { "SPKR DAC1 Volume", 1 }, - { "Speaker Mixer Volume", 3 }, - { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 58 }, - } - Disable { - { "AIF2DAC Volume", 96 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "SPKL DAC1 Volume", 0 }, - { "SPKR DAC1 Volume", 0 }, - { "Speaker Mixer Volume", 0 }, - { "Speaker Volume", 60 }, - { "Speaker Boost Volume", 0 }, - } -} - -Modifier "Incall" { - SupportedDevice { - "Headset Out" - } - Enable { - { "AIF2DAC2L Mixer AIF2 Switch", 0 }, - { "AIF2DAC2R Mixer AIF2 Switch", 0 }, - { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 50 }, - { "AIF2DAC Volume", 87 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Headphone Volume", 60 }, - } - Disable { - { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, - { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Headphone Volume", 45 }, - } -} - -Modifier "Incall" { - SupportedDevice { - "Headphone" - } - Enable { - { "AIF2DAC2L Mixer AIF2 Switch", 0 }, - { "AIF2DAC2R Mixer AIF2 Switch", 0 }, - { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 50 }, - { "AIF2DAC Volume", 87 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Headphone Volume", 60 }, - } - Disable { - { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, - { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Headphone Volume", 45 }, - } -} - -Modifier "Incall" { - SupportedDevice { - "SCO Headset Out" - } - Enable { - { "AIF2DAC2L Mixer AIF2 Switch", 1 }, - { "AIF2DAC2R Mixer AIF2 Switch", 1 }, - { "AIF2DAC Volume", 96 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } - Disable { - { "AIF2DAC Volume", 96 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "Incall" { - SupportedDevice { - "SCO Carkit" - } - Enable { - { "AIF2DAC2L Mixer AIF2 Switch", 1 }, - { "AIF2DAC2R Mixer AIF2 Switch", 1 }, - { "AIF2DAC Volume", 96 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } - Disable { - { "AIF2DAC Volume", 96 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "Incall" { - SupportedDevice { - "SCO" - } - Enable { - { "AIF2DAC2L Mixer AIF2 Switch", 1 }, - { "AIF2DAC2R Mixer AIF2 Switch", 1 }, - { "AIF2DAC Volume", 96 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } - Disable { - { "AIF2DAC Volume", 96 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - #Modifier: Ringtone Modifier "Ringtone" { SupportedDevice { - "Earpiece" - } - Enable { - { "AIF1DAC1 Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } - Disable { - { "AIF1DAC1 Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 63 }, - { "Earpiece Volume", 1 }, - } -} - -Modifier "Ringtone" { - SupportedDevice { "Speaker" } Enable { @@ -374,7 +159,7 @@ Modifier "Ringtone" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 22 }, + { "Headphone Volume", 27 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -394,7 +179,7 @@ Modifier "Ringtone" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 22 }, + { "Headphone Volume", 27 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -476,7 +261,7 @@ Modifier "Dual Normal" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 22 }, + { "Headphone Volume", 27 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -496,7 +281,7 @@ Modifier "Dual Normal" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 22 }, + { "Headphone Volume", 27 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -542,7 +327,7 @@ Modifier "Dual Ringtone" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 22 }, + { "Headphone Volume", 27 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -562,7 +347,7 @@ Modifier "Dual Ringtone" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 22 }, + { "Headphone Volume", 27 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -575,30 +360,6 @@ Modifier "Dual Ringtone" { Modifier "Incommunication" { SupportedDevice { - "Earpiece" - } - Enable { - { "AIF1DAC1 Volume", 90 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 52 }, - { "Earpiece Volume", 1 }, - } - Disable { - { "AIF1DAC1 Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } -} - -Modifier "Incommunication" { - SupportedDevice { "Speaker" } Enable { @@ -743,30 +504,6 @@ Modifier "Incommunication" { Modifier "Voipout" { SupportedDevice { - "Earpiece" - } - Enable { - { "AIF1DAC1 Volume", 88 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 48 }, - { "Earpiece Volume", 1 }, - } - Disable { - { "AIF1DAC1 Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } -} - -Modifier "Voipout" { - SupportedDevice { "Speaker" } Enable { @@ -875,30 +612,6 @@ Modifier "Voipout" { Modifier "SecVoipout" { SupportedDevice { - "Earpiece" - } - Enable { - { "AIF1DAC1 Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 52 }, - { "Earpiece Volume", 1 }, - } - Disable { - { "AIF1DAC1 Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } -} - -Modifier "SecVoipout" { - SupportedDevice { "Speaker" } Enable { @@ -1008,7 +721,7 @@ Modifier "SecVoipout" { #Modifier : Loopback Modifier "Loopback" { SupportedDevice { - "Earpiece" + "Speaker" } Enable { { "AIF1DAC1 Volume", 96 }, @@ -1016,49 +729,21 @@ Modifier "Loopback" { { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, + { "SPKL DAC1 Volume", 1 }, + { "SPKR DAC1 Volume", 1 }, + { "Speaker Mixer Volume", 3 }, + { "Speaker Boost Volume", 6 }, + { "Speaker Volume", 45 }, } Disable { - { "AIF1DAC1 Volume", 96 }, { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } -} - -Modifier "Loopback" { - SupportedDevice { - "Speaker" - } - Enable { - { "AIF1DAC1 Volume", 96 }, - { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "SPKL DAC1 Volume", 1 }, - { "SPKR DAC1 Volume", 1 }, - { "Speaker Mixer Volume", 3 }, - { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 60 }, - } - Disable { - { "AIF2DAC Volume", 96 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "SPKL DAC1 Volume", 0 }, - { "SPKR DAC1 Volume", 0 }, - { "Speaker Mixer Volume", 0 }, - { "Speaker Volume", 60 }, - { "Speaker Boost Volume", 0 }, + { "SPKL DAC1 Volume", 0 }, + { "SPKR DAC1 Volume", 0 }, + { "Speaker Mixer Volume", 0 }, + { "Speaker Volume", 45 }, + { "Speaker Boost Volume", 0 }, } } @@ -1073,7 +758,7 @@ Modifier "Loopback" { { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "Headphone Volume", 50 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -1097,7 +782,7 @@ Modifier "Loopback" { { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "Headphone Volume", 50 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -1110,36 +795,9 @@ Modifier "Loopback" { } } -#Modifier : LoopbackPacket -Modifier "LoopbackPacket" { - SupportedDevice { - "Earpiece" - } - Enable { - { "AIF1DAC1 Volume", 96 }, - { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 45 }, - { "Earpiece Volume", 1 }, - } - Disable { - { "AIF1DAC1 Volume", 96 }, - { "AIF2DAC Volume", 96 }, - { "AIF1 Boost Volume", 0 }, - { "AIF2 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Left Output Mixer DAC Volume", 7 }, - { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 57 }, - { "Earpiece Volume", 1 }, - } -} -Modifier "LoopbackPacket" { +#Modifier : Loop +Modifier "Loop" { SupportedDevice { "Speaker" } @@ -1153,7 +811,7 @@ Modifier "LoopbackPacket" { { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 45 }, + { "Speaker Volume", 52 }, } Disable { { "AIF2DAC Volume", 96 }, @@ -1162,12 +820,12 @@ Modifier "LoopbackPacket" { { "SPKL DAC1 Volume", 0 }, { "SPKR DAC1 Volume", 0 }, { "Speaker Mixer Volume", 0 }, - { "Speaker Volume", 60 }, + { "Speaker Volume", 45 }, { "Speaker Boost Volume", 0 }, } } -Modifier "LoopbackPacket" { +Modifier "Loop" { SupportedDevice { "Headset Out" } @@ -1178,7 +836,7 @@ Modifier "LoopbackPacket" { { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "Headphone Volume", 40 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -1187,11 +845,11 @@ Modifier "LoopbackPacket" { { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 45 }, + { "Headphone Volume", 30 }, } } -Modifier "LoopbackPacket" { +Modifier "Loop" { SupportedDevice { "Headphone" } @@ -1202,7 +860,7 @@ Modifier "LoopbackPacket" { { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "Headphone Volume", 40 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -1225,26 +883,6 @@ Modifier "Voice" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 30 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 120 }, - } - Disable { - { "AIF1ADC1 HPF Mode", 0 }, - { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 30 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 120 }, - } -} - -Modifier "Voice" { - SupportedDevice { - "Back Mic" - } - Enable { - { "AIF1ADC1 HPF Mode", 1 }, - { "AIF1ADC1 HPF Switch", 1 }, { "IN2R Volume", 30 }, { "MIXINR IN2R Volume", 0 }, { "AIF1ADC1 Volume", 120 }, @@ -1299,26 +937,6 @@ Modifier "Camcorder" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 30 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 100 }, - } - Disable { - { "AIF1ADC1 HPF Mode", 0 }, - { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, - } -} - -Modifier "Camcorder" { - SupportedDevice { - "Back Mic" - } - Enable { - { "AIF1ADC1 HPF Mode", 1 }, - { "AIF1ADC1 HPF Switch", 1 }, { "IN2R Volume", 30 }, { "MIXINR IN2R Volume", 0 }, { "AIF1ADC1 Volume", 100 }, @@ -1328,7 +946,7 @@ Modifier "Camcorder" { { "AIF1ADC1 HPF Switch", 0 }, { "IN2R Volume", 11 }, { "MIXINR IN2R Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, + { "AIF1ADC1 Volume", 96 }, } } @@ -1373,29 +991,9 @@ Modifier "Recognition" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 26 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 108 }, - } - Disable { - { "AIF1ADC1 HPF Mode", 0 }, - { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 112 }, - } -} - -Modifier "Recognition" { - SupportedDevice { - "Back Mic" - } - Enable { - { "AIF1ADC1 HPF Mode", 1 }, - { "AIF1ADC1 HPF Switch", 1 }, - { "IN2R Volume", 30 }, + { "IN2R Volume", 26 }, { "MIXINR IN2R Volume", 0 }, - { "AIF1ADC1 Volume", 120 }, + { "AIF1ADC1 Volume", 108 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1445,21 +1043,21 @@ Modifier "Communication" { "Builtin Mic" } OutputDevice { - "Earpiece" + "Speaker" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 30 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 100 }, + { "IN2R Volume", 25 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 1 }, + { "AIF1ADC1 Volume", 96 }, } } @@ -1473,29 +1071,9 @@ Modifier "Communication" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 24 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 104 }, - } - Disable { - { "AIF1ADC1 HPF Mode", 0 }, - { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, - } -} - -Modifier "Communication" { - SupportedDevice { - "Back Mic" - } - Enable { - { "AIF1ADC1 HPF Mode", 1 }, - { "AIF1ADC1 HPF Switch", 1 }, - { "IN2R Volume", 25 }, + { "IN2R Volume", 24 }, { "MIXINR IN2R Volume", 0 }, - { "AIF1ADC1 Volume", 109 }, + { "AIF1ADC1 Volume", 104 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1553,21 +1131,21 @@ Modifier "Voipin" { "Builtin Mic" } OutputDevice { - "Earpiece" + "Speaker" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 30 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 100 }, + { "IN2R Volume", 25 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 1 }, + { "AIF1ADC1 Volume", 96 }, } } @@ -1581,29 +1159,9 @@ Modifier "Voipin" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 24 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 104 }, - } - Disable { - { "AIF1ADC1 HPF Mode", 0 }, - { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, - } -} - -Modifier "Voipin" { - SupportedDevice { - "Back Mic" - } - Enable { - { "AIF1ADC1 HPF Mode", 1 }, - { "AIF1ADC1 HPF Switch", 1 }, - { "IN2R Volume", 25 }, + { "IN2R Volume", 24 }, { "MIXINR IN2R Volume", 0 }, - { "AIF1ADC1 Volume", 109 }, + { "AIF1ADC1 Volume", 104 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1661,21 +1219,21 @@ Modifier "SecVoipin" { "Builtin Mic" } OutputDevice { - "Earpiece" + "Speaker" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 24 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 104 }, + { "IN2R Volume", 25 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 1 }, + { "AIF1ADC1 Volume", 96 }, } } @@ -1689,29 +1247,9 @@ Modifier "SecVoipin" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 24 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 104 }, - } - Disable { - { "AIF1ADC1 HPF Mode", 0 }, - { "AIF1ADC1 HPF Switch", 0 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, - } -} - -Modifier "SecVoipin" { - SupportedDevice { - "Back Mic" - } - Enable { - { "AIF1ADC1 HPF Mode", 1 }, - { "AIF1ADC1 HPF Switch", 1 }, - { "IN2R Volume", 25 }, + { "IN2R Volume", 24 }, { "MIXINR IN2R Volume", 0 }, - { "AIF1ADC1 Volume", 109 }, + { "AIF1ADC1 Volume", 104 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1764,180 +1302,25 @@ Modifier "SecVoipin" { } } -#Incall-Capture Modifier -Modifier "IncallIn" { - SupportedDevice { - "Builtin Mic" - } - OutputDevice { - "Earpiece" - } - Enable { - { "IN1L Volume", 24 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 104 }, - } - Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "IncallIn" { - SupportedDevice { - "Builtin Mic" - } - OutputDevice { - "Headphone" - } - Enable { - { "IN1L Volume", 24 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 104 }, - } - Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "IncallIn" { - SupportedDevice { - "Builtin Mic" - } - OutputDevice { - "Speaker" - } - Enable { - { "IN1L Volume", 20 }, - { "MIXINL IN1L Volume", 1 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } - Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "IncallIn" { - SupportedDevice { - "Back Mic" - } - Enable { - { "IN2R Volume", 25 }, - { "MIXINR IN2R Volume", 0 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 110 }, - } - Disable { - { "IN2R Volume", 11 }, - { "MIXINR IN2R Volume", 0 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "IncallIn" { - SupportedDevice { - "Headset In" - } - Enable { -// { "Sidetone HPF Mux", 3 }, -// { "Sidetone HPF Switch", 1 }, - { "IN1R Volume", 25 }, - { "MIXINR IN1R Volume", 0 }, - { "MIXINR IN1RP Volume", 0 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 110 }, - } - Disable { -// { "Sidetone HPF Mux", 0 }, -// { "Sidetone HPF Switch", 0 }, - { "IN1R Volume", 11 }, - { "MIXINR IN1R Volume", 0 }, - { "MIXINR IN1RP Volume", 0 }, - { "DAC2 Right Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "IncallIn" { - SupportedDevice { - "SCO Headset In" - } - Enable { - { "AIF1ADC1R Mixer AIF2 Switch", 0 }, - { "AIF1ADC1L Mixer AIF2 Switch", 0 }, - } - Disable { - { "AIF1ADC1R Mixer AIF2 Switch", 1 }, - { "AIF1ADC1L Mixer AIF2 Switch", 1 }, - } -} - #LoopbackIn-Capture Modifier Modifier "LoopbackIn" { SupportedDevice { "Builtin Mic" } OutputDevice { - "Earpiece" - } - Enable { - { "IN1L Volume", 28 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } - Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "LoopbackIn" { - SupportedDevice { - "Builtin Mic" - } - OutputDevice { "Headphone" } Enable { - { "IN1L Volume", 28 }, - { "MIXINL IN1L Volume", 1 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "IN2R Volume", 8 }, + { "MIXINR IN2R Volume", 1 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "IN2R Volume", 8 }, + { "MIXINR IN2R Volume", 0 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } } @@ -1949,18 +1332,16 @@ Modifier "LoopbackIn" { "Speaker" } Enable { - { "IN1L Volume", 20 }, - { "MIXINL IN1L Volume", 1 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "IN2R Volume", 3 }, + { "MIXINR IN2R Volume", 1 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "IN2R Volume", 3 }, + { "MIXINR IN2R Volume", 0 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } } @@ -1972,38 +1353,16 @@ Modifier "LoopbackIn" { "Headset Out" } Enable { - { "IN1L Volume", 20 }, - { "MIXINL IN1L Volume", 1 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } - Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "LoopbackIn" { - SupportedDevice { - "Back Mic" - } - Enable { - { "IN2R Volume", 11 }, + { "IN2R Volume", 8 }, { "MIXINR IN2R Volume", 1 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } Disable { - { "IN2R Volume", 11 }, + { "IN2R Volume", 8 }, { "MIXINR IN2R Volume", 0 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } } @@ -2014,50 +1373,25 @@ Modifier "LoopbackIn" { Enable { // { "Sidetone HPF Mux", 3 }, // { "Sidetone HPF Switch", 1 }, - { "IN1R Volume", 11 }, + { "IN1R Volume", 8 }, { "MIXINR IN1R Volume", 1 }, { "MIXINR IN1RP Volume", 1 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } Disable { // { "Sidetone HPF Mux", 0 }, // { "Sidetone HPF Switch", 0 }, - { "IN1R Volume", 11 }, + { "IN1R Volume", 8 }, { "MIXINR IN1R Volume", 0 }, { "MIXINR IN1RP Volume", 0 }, - { "DAC2 Right Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -#LoopbackPacketIn-Capture Modifier -Modifier "LoopbackPacketIn" { - SupportedDevice { - "Builtin Mic" - } - OutputDevice { - "Earpiece" - } - Enable { - { "IN1L Volume", 28 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } - Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "DAC1 Right Sidetone Volume", 0 }, + { "AIF1ADC1 Volume", 96 }, } } -Modifier "LoopbackPacketIn" { +#LoopIn-Capture Modifier +Modifier "LoopIn" { SupportedDevice { "Builtin Mic" } @@ -2065,22 +1399,20 @@ Modifier "LoopbackPacketIn" { "Headphone" } Enable { - { "IN1L Volume", 28 }, - { "MIXINL IN1L Volume", 1 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "IN2R Volume", 8 }, + { "MIXINR IN2R Volume", 1 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "IN2R Volume", 8 }, + { "MIXINR IN2R Volume", 0 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } } -Modifier "LoopbackPacketIn" { +Modifier "LoopIn" { SupportedDevice { "Builtin Mic" } @@ -2088,22 +1420,20 @@ Modifier "LoopbackPacketIn" { "Speaker" } Enable { - { "IN1L Volume", 20 }, - { "MIXINL IN1L Volume", 1 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "IN2R Volume", 15 }, + { "MIXINR IN2R Volume", 0 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "IN2R Volume", 3 }, + { "MIXINR IN2R Volume", 0 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } } -Modifier "LoopbackPacketIn" { +Modifier "LoopIn" { SupportedDevice { "Builtin Mic" } @@ -2111,64 +1441,40 @@ Modifier "LoopbackPacketIn" { "Headset Out" } Enable { - { "IN1L Volume", 20 }, - { "MIXINL IN1L Volume", 1 }, - { "DAC2 Left Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } - Disable { - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 0 }, - { "DAC2 Left Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, - } -} - -Modifier "LoopbackPacketIn" { - SupportedDevice { - "Back Mic" - } - Enable { - { "IN2R Volume", 11 }, + { "IN2R Volume", 8 }, { "MIXINR IN2R Volume", 1 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } Disable { - { "IN2R Volume", 11 }, + { "IN2R Volume", 8 }, { "MIXINR IN2R Volume", 0 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } } -Modifier "LoopbackPacketIn" { +Modifier "LoopIn" { SupportedDevice { "Headset In" } Enable { // { "Sidetone HPF Mux", 3 }, // { "Sidetone HPF Switch", 1 }, - { "IN1R Volume", 11 }, + { "IN1R Volume", 2 }, { "MIXINR IN1R Volume", 1 }, { "MIXINR IN1RP Volume", 1 }, - { "DAC2 Right Sidetone Volume", 12 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "DAC1 Right Sidetone Volume", 12 }, + { "AIF1ADC1 Volume", 96 }, } Disable { // { "Sidetone HPF Mux", 0 }, // { "Sidetone HPF Switch", 0 }, - { "IN1R Volume", 11 }, + { "IN1R Volume", 3 }, { "MIXINR IN1R Volume", 0 }, { "MIXINR IN1RP Volume", 0 }, - { "DAC2 Right Sidetone Volume", 0 }, - { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "DAC1 Right Sidetone Volume", 0 }, + { "AIF1ADC1 Volume", 96 }, } } @@ -2232,12 +1538,3 @@ Modifier "VoicecallRec" { { "AIF1ADC1L Mixer AIF2 Switch", 0 }, } } - -Modifier "Audio_GND_Switch" { - Enable { - { "HP Output Mode", 0}, - } - Disable { - { "HP Output Mode", 1}, - } -} \ No newline at end of file diff --git a/configs/tinyucm.conf b/configs/tinyucm.conf index 8d7b9d1..a74ae02 100644 --- a/configs/tinyucm.conf +++ b/configs/tinyucm.conf @@ -20,8 +20,7 @@ BluetoothLink 2 ModifierFile "default_gain.conf" INOUT_MAP { - { "Earpiece", "Builtin Mic" }, - { "Speaker", "Back Mic" }, + { "Speaker", "Builtin Mic" }, { "Headset Out", "Headset In" }, { "Headphone", "Builtin Mic" }, { "SCO Headset Out", "SCO Headset In" }, @@ -29,8 +28,7 @@ INOUT_MAP { } INPUT_CHANNEL_MAP { - { "Builtin Mic", "Left" }, - { "Back Mic", "Right" }, + { "Builtin Mic", "Right" }, { "Headset In", "Right" }, { "SCO Headset In", "Left" }, } @@ -134,14 +132,6 @@ Core { // Should really add aliasing; headset and headphone are the same thing // and we should refcount appropriately (ditto for speaker/earpiece on // some low end devices) -Device "Earpiece" { - Enable { - { "RCV Switch", 1 }, - } - Disable { - { "RCV Switch", 0 }, - } -} Device "Speaker" { Enable { @@ -232,35 +222,12 @@ Device "Analogue Dock Out" { Device "Builtin Mic" { Enable { - { "Main Mic Switch", 1 }, - { "AIF1ADCL Source", "Left" }, -// { "AIF1ADCR Source", "Left" }, - { "AIF2ADCL Source", "Left" }, - { "AIF2ADCR Source", "Left" }, - { "MIXINL IN1L Switch", 1 }, - { "AIF2DAC2L Mixer Left Sidetone Switch", 1 }, - { "AIF2DAC2L Mixer Right Sidetone Switch", 0 }, - { "AIF2DAC2R Mixer Left Sidetone Switch", 0 }, - { "AIF2DAC2R Mixer Right Sidetone Switch", 0 }, - } - Disable { - { "Main Mic Switch", 0 }, - { "MIXINL IN1L Switch", 0 }, - } -} - -Device "Back Mic" { - Enable { { "Sub Mic Switch", 1 }, -// { "AIF1ADCL Source", "Right" }, + { "AIF1ADCL Source", "Right" }, { "AIF1ADCR Source", "Right" }, { "AIF2ADCL Source", "Right" }, { "AIF2ADCR Source", "Right" }, - { "MIXINR IN2R Switch", 1 }, - { "AIF2DAC2L Mixer Left Sidetone Switch", 0 }, - { "AIF2DAC2L Mixer Right Sidetone Switch", 0 }, - { "AIF2DAC2R Mixer Left Sidetone Switch", 0 }, - { "AIF2DAC2R Mixer Right Sidetone Switch", 1 }, + { "MIXINR IN2R Switch", 1 }, } Disable { { "Sub Mic Switch", 0 }, @@ -276,10 +243,6 @@ Device "Headset In" { { "AIF2ADCL Source", "Right" }, { "AIF2ADCR Source", "Right" }, { "MIXINR IN1R Switch", 1 }, - { "AIF2DAC2L Mixer Left Sidetone Switch", 0 }, - { "AIF2DAC2L Mixer Right Sidetone Switch", 0 }, - { "AIF2DAC2R Mixer Left Sidetone Switch", 0 }, - { "AIF2DAC2R Mixer Right Sidetone Switch", 1 }, } Disable { { "Headset Mic Switch", 0 }, @@ -296,10 +259,6 @@ Device "SCO Headset In" { { "AIF2ADCR Source", "Left" }, { "AIF1ADC1R Mixer AIF2 Switch", 1 }, { "AIF1ADC1L Mixer AIF2 Switch", 1 }, - { "AIF2DAC2L Mixer Left Sidetone Switch", 1 }, - { "AIF2DAC2L Mixer Right Sidetone Switch", 0 }, - { "AIF2DAC2R Mixer Left Sidetone Switch", 0 }, - { "AIF2DAC2R Mixer Right Sidetone Switch", 1 }, } Disable { { "AIF2ADC Mux", 0 }, @@ -308,22 +267,12 @@ Device "SCO Headset In" { } } -Device "Voice Call" { - Enable { - { "DAC1L Mixer AIF1.1 Switch", 1 }, - { "DAC1R Mixer AIF1.1 Switch", 1 }, - } - Disable { - { "DAC1L Mixer AIF1.1 Switch", 1 }, - { "DAC1R Mixer AIF1.1 Switch", 1 }, - } -} - #Verb Stage #Currently just using normal and voicecall #Normal, Voicecall Verb "Normal" { Enable { + { "HP Output Mode", 0 }, { "AIF2 Mode", 1 }, { "DAC1L Mixer AIF1.1 Switch", 1 }, { "DAC1R Mixer AIF1.1 Switch", 1 }, @@ -332,19 +281,20 @@ Verb "Normal" { { "AIF2DAC2R Mixer AIF2 Switch", 0 }, } Disable { - { "AIF2 Mode", 0 }, + { "HP Output Mode", 0 }, // { "DAC1L Mixer AIF1.1 Switch", 0 }, // { "DAC1R Mixer AIF1.1 Switch", 0 }, - { "AIF2DAC Mux", "AIF2DACDAT" }, } } Verb "Ringtone" { Enable { + { "HP Output Mode", 0 }, { "DAC1L Mixer AIF1.1 Switch", 1 }, { "DAC1R Mixer AIF1.1 Switch", 1 }, } Disable { + { "HP Output Mode", 0 }, // { "DAC1L Mixer AIF1.1 Switch", 0 }, // { "DAC1R Mixer AIF1.1 Switch", 0 }, } @@ -352,10 +302,12 @@ Verb "Ringtone" { Verb "Communication" { Enable { + { "HP Output Mode", 0 }, { "DAC1L Mixer AIF1.1 Switch", 1 }, { "DAC1R Mixer AIF1.1 Switch", 1 }, } Disable { + { "HP Output Mode", 0 }, { "DAC1L Mixer AIF1.1 Switch", 0 }, { "DAC1R Mixer AIF1.1 Switch", 0 }, } @@ -375,6 +327,7 @@ Verb "Voicecall" { { "AIF2DAC Mux", "AIF2DACDAT" }, } Disable { + { "HP Output Mode", 0 }, { "AIF2 Mode", 0 }, // { "DAC1L Mixer AIF1.1 Switch", 0 }, // { "DAC1R Mixer AIF1.1 Switch", 0 }, @@ -382,34 +335,26 @@ Verb "Voicecall" { { "DAC1R Mixer AIF2 Switch", 0 }, { "AIF2DACL Source", 0 }, { "AIF2DACR Source", 1 }, - { "AIF2DAC Mux", "AIF2DACDAT" }, + { "AIF2DAC Mux", "AIF3DACDAT" }, } } Verb "Loopback" { Enable { { "HP Output Mode", 0 }, - { "AIF2 Mode", 0 }, { "DAC1L Mixer AIF1.1 Switch", 1 }, { "DAC1R Mixer AIF1.1 Switch", 1 }, - { "DAC1L Mixer AIF2 Switch", 1 }, - { "DAC1R Mixer AIF2 Switch", 1 }, -//left:0, right:1 - { "AIF2DACL Source", 0 }, - { "AIF2DACR Source", 0 }, - { "AIF2DAC Mux", "AIF2DACDAT" }, + { "DAC1L Mixer Right Sidetone Switch", 1 }, + { "DAC1R Mixer Right Sidetone Switch", 1 }, { "AIF2DAC2L Mixer AIF2 Switch", 0 }, { "AIF2DAC2R Mixer AIF2 Switch", 0 }, } Disable { - { "AIF2 Mode", 0 }, + { "HP Output Mode", 0 }, // { "DAC1L Mixer AIF1.1 Switch", 0 }, // { "DAC1R Mixer AIF1.1 Switch", 0 }, - { "DAC1L Mixer AIF2 Switch", 0 }, - { "DAC1R Mixer AIF2 Switch", 0 }, - { "AIF2DACL Source", 0 }, - { "AIF2DACR Source", 1 }, - { "AIF2DAC Mux", "AIF2DACDAT" }, + { "DAC1L Mixer Right Sidetone Switch", 0 }, + { "DAC1R Mixer Right Sidetone Switch", 0 }, } } -- cgit v1.1