From ad69b6dbecdf0c5f1d6d695da147511ad107461d Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Tue, 26 Jun 2012 13:52:17 +0200 Subject: correct audio configs --- configs/Volume.db | Bin 10240 -> 10240 bytes configs/default_gain.conf | 664 +++++++++++++++++++++++++++++++++++++--------- configs/tinyucm.conf | 76 +++++- 3 files changed, 609 insertions(+), 131 deletions(-) (limited to 'configs') diff --git a/configs/Volume.db b/configs/Volume.db index cd27537..432428f 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 5a82649..4d3e3ac 100644 --- a/configs/default_gain.conf +++ b/configs/default_gain.conf @@ -5,6 +5,30 @@ 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 { @@ -14,8 +38,8 @@ Modifier "Normal" { { "SPKL DAC1 Volume", 1 }, { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, - { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 59 }, + { "Speaker Boost Volume", 5 }, + { "Speaker Volume", 62 }, } Disable { { "AIF1DAC1 Volume", 96 }, @@ -109,7 +133,7 @@ Modifier "Normal" { { "DAC1 Volume", 96 }, { "Left Output Mixer DAC Volume", 7 }, { "Right Output Mixer DAC Volume", 7 }, - { "Output Volume", 56 }, + { "Output Volume", 57 }, { "LINEOUT1 Volume", 1 }, } Disable { @@ -126,6 +150,36 @@ 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 { @@ -140,7 +194,7 @@ Modifier "Incall" { { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 60 }, + { "Speaker Volume", 58 }, } Disable { { "AIF2DAC Volume", 96 }, @@ -162,16 +216,16 @@ Modifier "Incall" { { "AIF2DAC2L Mixer AIF2 Switch", 0 }, { "AIF2DAC2R Mixer AIF2 Switch", 0 }, { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 60 }, - { "AIF2DAC Volume", 96 }, + { "AIF1DAC1 Volume", 50 }, + { "AIF2DAC Volume", 87 }, { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 52 }, + { "Headphone Volume", 60 }, } Disable { { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 60 }, + { "AIF1DAC1 Volume", 96 }, { "AIF2DAC Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, @@ -188,16 +242,16 @@ Modifier "Incall" { { "AIF2DAC2L Mixer AIF2 Switch", 0 }, { "AIF2DAC2R Mixer AIF2 Switch", 0 }, { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 60 }, - { "AIF2DAC Volume", 96 }, + { "AIF1DAC1 Volume", 50 }, + { "AIF2DAC Volume", 87 }, { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "Headphone Volume", 60 }, } Disable { { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 60 }, + { "AIF1DAC1 Volume", 96 }, { "AIF2DAC Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "AIF2 Boost Volume", 0 }, @@ -263,6 +317,30 @@ Modifier "Incall" { #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 { @@ -273,7 +351,7 @@ Modifier "Ringtone" { { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, { "Speaker Boost Volume", 5 }, - { "Speaker Volume", 63 }, + { "Speaker Volume", 62 }, } Disable { { "AIF1DAC1 Volume", 96 }, @@ -296,14 +374,14 @@ Modifier "Ringtone" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 50 }, + { "Headphone Volume", 22 }, } Disable { { "Headphone ZC Switch", 0 }, { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 0 }, + { "Headphone Volume", 45 }, } } @@ -316,7 +394,7 @@ Modifier "Ringtone" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 50 }, + { "Headphone Volume", 22 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -325,7 +403,7 @@ Modifier "Ringtone" { { "DAC1 Volume", 96 }, { "Left Output Mixer DAC Volume", 7 }, { "Right Output Mixer DAC Volume", 7 }, - { "Headphone Volume", 0 }, + { "Headphone Volume", 45 }, } } @@ -375,7 +453,7 @@ Modifier "Dual Normal" { { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, { "Speaker Boost Volume", 5 }, - { "Speaker Volume", 60 }, + { "Speaker Volume", 62 }, } Disable { { "AIF1DAC1 Volume", 96 }, @@ -398,14 +476,14 @@ Modifier "Dual Normal" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 27 }, + { "Headphone Volume", 22 }, } Disable { { "Headphone ZC Switch", 0 }, { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 51 }, + { "Headphone Volume", 27 }, } } @@ -418,14 +496,14 @@ Modifier "Dual Normal" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 27 }, + { "Headphone Volume", 22 }, } Disable { { "Headphone ZC Switch", 0 }, { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 45 }, + { "Headphone Volume", 27 }, } } @@ -441,7 +519,7 @@ Modifier "Dual Ringtone" { { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, { "Speaker Boost Volume", 5 }, - { "Speaker Volume", 60 }, + { "Speaker Volume", 62 }, } Disable { { "AIF1DAC1 Volume", 96 }, @@ -464,14 +542,14 @@ Modifier "Dual Ringtone" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 27 }, + { "Headphone Volume", 22 }, } Disable { { "Headphone ZC Switch", 0 }, { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 51 }, + { "Headphone Volume", 27 }, } } @@ -484,14 +562,38 @@ Modifier "Dual Ringtone" { { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 27 }, + { "Headphone Volume", 22 }, } Disable { { "Headphone ZC Switch", 0 }, { "AIF1DAC1 Volume", 96 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 45 }, + { "Headphone Volume", 27 }, + } +} + +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 }, } } @@ -506,8 +608,8 @@ Modifier "Incommunication" { { "SPKL DAC1 Volume", 1 }, { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, - { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 62 }, + { "Speaker Boost Volume", 4 }, + { "Speaker Volume", 60 }, } Disable { { "AIF1DAC1 Volume", 96 }, @@ -527,10 +629,10 @@ Modifier "Incommunication" { } Enable { { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, + { "AIF1DAC1 Volume", 88 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "Headphone Volume", 60 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -547,10 +649,10 @@ Modifier "Incommunication" { } Enable { { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, + { "AIF1DAC1 Volume", 88 }, { "AIF1 Boost Volume", 0 }, { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "Headphone Volume", 60 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -641,6 +743,30 @@ 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 { @@ -650,8 +776,8 @@ Modifier "Voipout" { { "SPKL DAC1 Volume", 1 }, { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, - { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 62 }, + { "Speaker Boost Volume", 4 }, + { "Speaker Volume", 61 }, } Disable { { "AIF1DAC1 Volume", 96 }, @@ -671,10 +797,10 @@ Modifier "Voipout" { } Enable { { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, + { "AIF1DAC1 Volume", 88 }, { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "DAC1 Volume", 88 }, + { "Headphone Volume", 57 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -691,10 +817,10 @@ Modifier "Voipout" { } Enable { { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, + { "AIF1DAC1 Volume", 88 }, { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "DAC1 Volume", 88 }, + { "Headphone Volume", 57 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -749,6 +875,30 @@ 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 { @@ -758,8 +908,8 @@ Modifier "SecVoipout" { { "SPKL DAC1 Volume", 1 }, { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, - { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 62 }, + { "Speaker Boost Volume", 4 }, + { "Speaker Volume", 61 }, } Disable { { "AIF1DAC1 Volume", 96 }, @@ -779,10 +929,10 @@ Modifier "SecVoipout" { } Enable { { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, + { "AIF1DAC1 Volume", 88 }, { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "DAC1 Volume", 88 }, + { "Headphone Volume", 57 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -799,10 +949,10 @@ Modifier "SecVoipout" { } Enable { { "Headphone ZC Switch", 0 }, - { "AIF1DAC1 Volume", 96 }, + { "AIF1DAC1 Volume", 88 }, { "AIF1 Boost Volume", 0 }, - { "DAC1 Volume", 96 }, - { "Headphone Volume", 54 }, + { "DAC1 Volume", 88 }, + { "Headphone Volume", 57 }, } Disable { { "Headphone ZC Switch", 0 }, @@ -858,6 +1008,34 @@ Modifier "SecVoipout" { #Modifier : Loopback Modifier "Loopback" { 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", 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 "Loopback" { + SupportedDevice { "Speaker" } Enable { @@ -870,7 +1048,7 @@ Modifier "Loopback" { { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 50 }, + { "Speaker Volume", 60 }, } Disable { { "AIF2DAC Volume", 96 }, @@ -879,7 +1057,7 @@ Modifier "Loopback" { { "SPKL DAC1 Volume", 0 }, { "SPKR DAC1 Volume", 0 }, { "Speaker Mixer Volume", 0 }, - { "Speaker Volume", 50 }, + { "Speaker Volume", 60 }, { "Speaker Boost Volume", 0 }, } } @@ -935,6 +1113,34 @@ 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" { + SupportedDevice { "Speaker" } Enable { @@ -947,7 +1153,7 @@ Modifier "LoopbackPacket" { { "SPKR DAC1 Volume", 1 }, { "Speaker Mixer Volume", 3 }, { "Speaker Boost Volume", 6 }, - { "Speaker Volume", 50 }, + { "Speaker Volume", 45 }, } Disable { { "AIF2DAC Volume", 96 }, @@ -956,7 +1162,7 @@ Modifier "LoopbackPacket" { { "SPKL DAC1 Volume", 0 }, { "SPKR DAC1 Volume", 0 }, { "Speaker Mixer Volume", 0 }, - { "Speaker Volume", 50 }, + { "Speaker Volume", 60 }, { "Speaker Boost Volume", 0 }, } } @@ -1034,6 +1240,26 @@ Modifier "Voice" { Modifier "Voice" { SupportedDevice { + "Back Mic" + } + Enable { + { "AIF1ADC1 HPF Mode", 1 }, + { "AIF1ADC1 HPF Switch", 1 }, + { "IN2R Volume", 30 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 120 }, + } + Disable { + { "AIF1ADC1 HPF Mode", 0 }, + { "AIF1ADC1 HPF Switch", 0 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 96 }, + } +} + +Modifier "Voice" { + SupportedDevice { "Headset In" } Enable { @@ -1073,9 +1299,9 @@ Modifier "Camcorder" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 17 }, + { "IN1L Volume", 30 }, { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 120 }, + { "AIF1ADC1 Volume", 100 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1088,6 +1314,26 @@ Modifier "Camcorder" { Modifier "Camcorder" { SupportedDevice { + "Back Mic" + } + Enable { + { "AIF1ADC1 HPF Mode", 1 }, + { "AIF1ADC1 HPF Switch", 1 }, + { "IN2R Volume", 30 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 100 }, + } + Disable { + { "AIF1ADC1 HPF Mode", 0 }, + { "AIF1ADC1 HPF Switch", 0 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 96 }, + } +} + +Modifier "Camcorder" { + SupportedDevice { "Headset In" } Enable { @@ -1127,9 +1373,9 @@ Modifier "Recognition" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 30 }, + { "IN1L Volume", 26 }, { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 118 }, + { "AIF1ADC1 Volume", 108 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1142,6 +1388,26 @@ Modifier "Recognition" { Modifier "Recognition" { SupportedDevice { + "Back Mic" + } + Enable { + { "AIF1ADC1 HPF Mode", 1 }, + { "AIF1ADC1 HPF Switch", 1 }, + { "IN2R Volume", 30 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 120 }, + } + Disable { + { "AIF1ADC1 HPF Mode", 0 }, + { "AIF1ADC1 HPF Switch", 0 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 96 }, + } +} + +Modifier "Recognition" { + SupportedDevice { "Headset In" } Enable { @@ -1179,14 +1445,14 @@ Modifier "Communication" { "Builtin Mic" } OutputDevice { - "Speaker" + "Earpiece" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 17 }, + { "IN1L Volume", 30 }, { "MIXINL IN1L Volume", 0 }, - { "AIF1ADC1 Volume", 96 }, + { "AIF1ADC1 Volume", 100 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1207,9 +1473,9 @@ Modifier "Communication" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 1 }, - { "AIF1ADC1 Volume", 96 }, + { "IN1L Volume", 24 }, + { "MIXINL IN1L Volume", 0 }, + { "AIF1ADC1 Volume", 104 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1222,14 +1488,34 @@ Modifier "Communication" { Modifier "Communication" { SupportedDevice { + "Back Mic" + } + Enable { + { "AIF1ADC1 HPF Mode", 1 }, + { "AIF1ADC1 HPF Switch", 1 }, + { "IN2R Volume", 25 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, + } + Disable { + { "AIF1ADC1 HPF Mode", 0 }, + { "AIF1ADC1 HPF Switch", 0 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 1 }, + { "AIF1ADC1 Volume", 96 }, + } +} + +Modifier "Communication" { + SupportedDevice { "Headset In" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1R Volume", 11 }, - { "MIXINR IN1R Volume", 1 }, - { "AIF1ADC1 Volume", 96 }, + { "IN1R Volume", 25 }, + { "MIXINR IN1R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1267,14 +1553,14 @@ Modifier "Voipin" { "Builtin Mic" } OutputDevice { - "Speaker" + "Earpiece" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 31 }, - { "MIXINL IN1L Volume", 1 }, - { "AIF1ADC1 Volume", 81 }, + { "IN1L Volume", 30 }, + { "MIXINL IN1L Volume", 0 }, + { "AIF1ADC1 Volume", 100 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1295,9 +1581,9 @@ Modifier "Voipin" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 1 }, - { "AIF1ADC1 Volume", 96 }, + { "IN1L Volume", 24 }, + { "MIXINL IN1L Volume", 0 }, + { "AIF1ADC1 Volume", 104 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1310,14 +1596,34 @@ Modifier "Voipin" { Modifier "Voipin" { SupportedDevice { + "Back Mic" + } + Enable { + { "AIF1ADC1 HPF Mode", 1 }, + { "AIF1ADC1 HPF Switch", 1 }, + { "IN2R Volume", 25 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, + } + Disable { + { "AIF1ADC1 HPF Mode", 0 }, + { "AIF1ADC1 HPF Switch", 0 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 1 }, + { "AIF1ADC1 Volume", 96 }, + } +} + +Modifier "Voipin" { + SupportedDevice { "Headset In" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1R Volume", 11 }, - { "MIXINR IN1R Volume", 1 }, - { "AIF1ADC1 Volume", 96 }, + { "IN1R Volume", 25 }, + { "MIXINR IN1R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1355,14 +1661,14 @@ Modifier "SecVoipin" { "Builtin Mic" } OutputDevice { - "Speaker" + "Earpiece" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 31 }, - { "MIXINL IN1L Volume", 1 }, - { "AIF1ADC1 Volume", 90 }, + { "IN1L Volume", 24 }, + { "MIXINL IN1L Volume", 0 }, + { "AIF1ADC1 Volume", 104 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1383,9 +1689,9 @@ Modifier "SecVoipin" { Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1L Volume", 11 }, - { "MIXINL IN1L Volume", 1 }, - { "AIF1ADC1 Volume", 96 }, + { "IN1L Volume", 24 }, + { "MIXINL IN1L Volume", 0 }, + { "AIF1ADC1 Volume", 104 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1398,14 +1704,34 @@ Modifier "SecVoipin" { Modifier "SecVoipin" { SupportedDevice { + "Back Mic" + } + Enable { + { "AIF1ADC1 HPF Mode", 1 }, + { "AIF1ADC1 HPF Switch", 1 }, + { "IN2R Volume", 25 }, + { "MIXINR IN2R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, + } + Disable { + { "AIF1ADC1 HPF Mode", 0 }, + { "AIF1ADC1 HPF Switch", 0 }, + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 1 }, + { "AIF1ADC1 Volume", 96 }, + } +} + +Modifier "SecVoipin" { + SupportedDevice { "Headset In" } Enable { { "AIF1ADC1 HPF Mode", 1 }, { "AIF1ADC1 HPF Switch", 1 }, - { "IN1R Volume", 11 }, - { "MIXINR IN1R Volume", 1 }, - { "AIF1ADC1 Volume", 96 }, + { "IN1R Volume", 25 }, + { "MIXINR IN1R Volume", 0 }, + { "AIF1ADC1 Volume", 109 }, } Disable { { "AIF1ADC1 HPF Mode", 0 }, @@ -1444,15 +1770,38 @@ Modifier "IncallIn" { "Builtin Mic" } OutputDevice { - "Headphone" + "Earpiece" } Enable { - { "IN1L Volume", 28 }, - { "MIXINL IN1L Volume", 1 }, + { "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 }, @@ -1470,7 +1819,7 @@ Modifier "IncallIn" { "Speaker" } Enable { - { "IN1L Volume", 17 }, + { "IN1L Volume", 20 }, { "MIXINL IN1L Volume", 1 }, { "DAC2 Left Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, @@ -1490,11 +1839,11 @@ Modifier "IncallIn" { "Back Mic" } Enable { - { "IN2R Volume", 11 }, - { "MIXINR IN2R Volume", 1 }, + { "IN2R Volume", 25 }, + { "MIXINR IN2R Volume", 0 }, { "DAC2 Right Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "AIF2ADC Volume", 110 }, } Disable { { "IN2R Volume", 11 }, @@ -1512,17 +1861,17 @@ Modifier "IncallIn" { Enable { // { "Sidetone HPF Mux", 3 }, // { "Sidetone HPF Switch", 1 }, - { "IN1R Volume", 9 }, - { "MIXINR IN1R Volume", 1 }, - { "MIXINR IN1RP Volume", 1 }, + { "IN1R Volume", 25 }, + { "MIXINR IN1R Volume", 0 }, + { "MIXINR IN1RP Volume", 0 }, { "DAC2 Right Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, - { "AIF2ADC Volume", 96 }, + { "AIF2ADC Volume", 110 }, } Disable { // { "Sidetone HPF Mux", 0 }, // { "Sidetone HPF Switch", 0 }, - { "IN1R Volume", 9 }, + { "IN1R Volume", 11 }, { "MIXINR IN1R Volume", 0 }, { "MIXINR IN1RP Volume", 0 }, { "DAC2 Right Sidetone Volume", 0 }, @@ -1551,17 +1900,40 @@ Modifier "LoopbackIn" { "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", 8 }, + { "IN1L Volume", 28 }, { "MIXINL IN1L Volume", 1 }, { "DAC2 Left Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, { "AIF2ADC Volume", 96 }, } Disable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 11 }, { "MIXINL IN1L Volume", 0 }, { "DAC2 Left Sidetone Volume", 0 }, { "DAC2 Volume", 96 }, @@ -1577,14 +1949,14 @@ Modifier "LoopbackIn" { "Speaker" } Enable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 20 }, { "MIXINL IN1L Volume", 1 }, { "DAC2 Left Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, { "AIF2ADC Volume", 96 }, } Disable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 11 }, { "MIXINL IN1L Volume", 0 }, { "DAC2 Left Sidetone Volume", 0 }, { "DAC2 Volume", 96 }, @@ -1600,14 +1972,14 @@ Modifier "LoopbackIn" { "Headset Out" } Enable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 20 }, { "MIXINL IN1L Volume", 1 }, { "DAC2 Left Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, { "AIF2ADC Volume", 96 }, } Disable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 11 }, { "MIXINL IN1L Volume", 0 }, { "DAC2 Left Sidetone Volume", 0 }, { "DAC2 Volume", 96 }, @@ -1617,6 +1989,26 @@ Modifier "LoopbackIn" { Modifier "LoopbackIn" { SupportedDevice { + "Back Mic" + } + Enable { + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 1 }, + { "DAC2 Right Sidetone Volume", 12 }, + { "DAC2 Volume", 96 }, + { "AIF2ADC Volume", 96 }, + } + Disable { + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 0 }, + { "DAC2 Right Sidetone Volume", 12 }, + { "DAC2 Volume", 96 }, + { "AIF2ADC Volume", 96 }, + } +} + +Modifier "LoopbackIn" { + SupportedDevice { "Headset In" } Enable { @@ -1647,17 +2039,40 @@ Modifier "LoopbackPacketIn" { "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 "LoopbackPacketIn" { + SupportedDevice { + "Builtin Mic" + } + OutputDevice { "Headphone" } Enable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 28 }, { "MIXINL IN1L Volume", 1 }, { "DAC2 Left Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, { "AIF2ADC Volume", 96 }, } Disable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 11 }, { "MIXINL IN1L Volume", 0 }, { "DAC2 Left Sidetone Volume", 0 }, { "DAC2 Volume", 96 }, @@ -1673,14 +2088,14 @@ Modifier "LoopbackPacketIn" { "Speaker" } Enable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 20 }, { "MIXINL IN1L Volume", 1 }, { "DAC2 Left Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, { "AIF2ADC Volume", 96 }, } Disable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 11 }, { "MIXINL IN1L Volume", 0 }, { "DAC2 Left Sidetone Volume", 0 }, { "DAC2 Volume", 96 }, @@ -1696,14 +2111,14 @@ Modifier "LoopbackPacketIn" { "Headset Out" } Enable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 20 }, { "MIXINL IN1L Volume", 1 }, { "DAC2 Left Sidetone Volume", 12 }, { "DAC2 Volume", 96 }, { "AIF2ADC Volume", 96 }, } Disable { - { "IN1L Volume", 8 }, + { "IN1L Volume", 11 }, { "MIXINL IN1L Volume", 0 }, { "DAC2 Left Sidetone Volume", 0 }, { "DAC2 Volume", 96 }, @@ -1713,6 +2128,26 @@ Modifier "LoopbackPacketIn" { Modifier "LoopbackPacketIn" { SupportedDevice { + "Back Mic" + } + Enable { + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 1 }, + { "DAC2 Right Sidetone Volume", 12 }, + { "DAC2 Volume", 96 }, + { "AIF2ADC Volume", 96 }, + } + Disable { + { "IN2R Volume", 11 }, + { "MIXINR IN2R Volume", 0 }, + { "DAC2 Right Sidetone Volume", 12 }, + { "DAC2 Volume", 96 }, + { "AIF2ADC Volume", 96 }, + } +} + +Modifier "LoopbackPacketIn" { + SupportedDevice { "Headset In" } Enable { @@ -1805,13 +2240,4 @@ Modifier "Audio_GND_Switch" { Disable { { "HP Output Mode", 1}, } -} - -Modifier "Audio_PM_Const" { - Enable { - { "PM Constraints Mode", 1}, - } - Disable { - { "PM Constraints Mode", 0}, - } } \ No newline at end of file diff --git a/configs/tinyucm.conf b/configs/tinyucm.conf index f040eb2..8d7b9d1 100644 --- a/configs/tinyucm.conf +++ b/configs/tinyucm.conf @@ -20,7 +20,8 @@ BluetoothLink 2 ModifierFile "default_gain.conf" INOUT_MAP { - { "Speaker", "Builtin Mic" }, + { "Earpiece", "Builtin Mic" }, + { "Speaker", "Back Mic" }, { "Headset Out", "Headset In" }, { "Headphone", "Builtin Mic" }, { "SCO Headset Out", "SCO Headset In" }, @@ -29,6 +30,7 @@ INOUT_MAP { INPUT_CHANNEL_MAP { { "Builtin Mic", "Left" }, + { "Back Mic", "Right" }, { "Headset In", "Right" }, { "SCO Headset In", "Left" }, } @@ -132,6 +134,14 @@ 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 { @@ -224,10 +234,14 @@ Device "Builtin Mic" { Enable { { "Main Mic Switch", 1 }, { "AIF1ADCL Source", "Left" }, - { "AIF1ADCR 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 }, @@ -235,6 +249,25 @@ Device "Builtin Mic" { } } +Device "Back Mic" { + Enable { + { "Sub Mic Switch", 1 }, +// { "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 }, + } + Disable { + { "Sub Mic Switch", 0 }, + { "MIXINR IN2R Switch", 0 }, + } +} + Device "Headset In" { Enable { { "Headset Mic Switch", 1 }, @@ -243,6 +276,10 @@ 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 }, @@ -259,6 +296,10 @@ 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 }, @@ -267,6 +308,17 @@ 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 @@ -313,23 +365,23 @@ Verb "Voicecall" { Enable { { "HP Output Mode", 0 }, { "AIF2 Mode", 0 }, -//left:0, right:1 - { "AIF2DACL Source", 0 }, - { "AIF2DACR Source", 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" }, } Disable { { "AIF2 Mode", 0 }, - { "AIF2DACL Source", 0 }, - { "AIF2DACR Source", 1 }, // { "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" }, } } @@ -338,25 +390,25 @@ Verb "Loopback" { Enable { { "HP Output Mode", 0 }, { "AIF2 Mode", 0 }, -//left:0, right:1 - { "AIF2DACL Source", 0 }, - { "AIF2DACR Source", 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" }, { "AIF2DAC2L Mixer AIF2 Switch", 0 }, { "AIF2DAC2R Mixer AIF2 Switch", 0 }, } Disable { { "AIF2 Mode", 0 }, - { "AIF2DACL Source", 0 }, - { "AIF2DACR Source", 1 }, // { "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" }, } } -- cgit v1.1