summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2013-08-20 11:53:48 +0530
committerArun Raghavan <arun.raghavan@collabora.co.uk>2013-08-20 11:58:07 +0530
commitfce9e5bf2f3a83ab0f46d9829d868892a32acca4 (patch)
treeaa8b50e71861c38d4b3989c860cf09d15e78be6a /data
parentc88217612e6ad091479897837621c21d4a477971 (diff)
Some make VoiceCall UCM cleanups
A few changes here: * Move volume initialisation to verb enable, similar to how the Android XML works * Drop Headphones from conflicting with itself * Add a missing mixer controls * Minor cosmetic documentation changes
Diffstat (limited to 'data')
-rw-r--r--data/alsa/ucm/apq8064-tabla-snd-card/VoiceCall44
1 files changed, 20 insertions, 24 deletions
diff --git a/data/alsa/ucm/apq8064-tabla-snd-card/VoiceCall b/data/alsa/ucm/apq8064-tabla-snd-card/VoiceCall
index cbdee38..76c680c 100644
--- a/data/alsa/ucm/apq8064-tabla-snd-card/VoiceCall
+++ b/data/alsa/ucm/apq8064-tabla-snd-card/VoiceCall
@@ -11,7 +11,24 @@ SectionVerb {
cset "name='Voice Stub Tx Mixer STUB_TX_HL' 1"
cset "name='Voice Stub Tx Mixer STUB_1_TX_HL' 1"
- # The actual start-voice after the first enable rx/tx pair
+ # Default values
+ cset "name='LINEOUT1 Volume' 84"
+ cset "name='LINEOUT3 Volume' 84"
+ cset "name='HPHL Volume' 6"
+ cset "name='HPHR Volume' 6"
+ cset "name='RX1 Digital Volume' 84"
+ cset "name='RX2 Digital Volume' 84"
+ cset "name='RX3 Digital Volume' 84"
+ cset "name='ADC1 Volume' 3"
+ cset "name='ADC2 Volume' 3"
+ cset "name='ADC3 Volume' 3"
+ cset "name='DEC7 Volume' 84"
+ cset "name='DEC8 Volume' 84"
+ cset "name='DEC9 Volume' 84"
+ cset "name='MICBIAS1 CAPLESS Switch' 1"
+
+ # The actual start-voice command is executed after the first
+ # enable rx/tx pair is received
exec "/system/bin/csd-client start-voice"
]
@@ -55,9 +72,6 @@ SectionDevice."Speaker" {
cset "name='RX3 MIX1 INP1' RX1"
cset "name='RX3 MIX1 INP2' RX6"
cset "name='RX4 DSM MUX' DSM_INV"
- cset "name='RX3 Digital Volume' 68"
- cset "name='LINEOUT1 Volume' 100"
- cset "name='LINEOUT3 Volume' 100"
cset "name='SLIM TX3 MUX' RMIX3"
exec "/system/bin/csd-client 'enable-rx-device 14'"
@@ -69,9 +83,6 @@ SectionDevice."Speaker" {
cset "name='RX3 MIX1 INP1' ZERO"
cset "name='RX3 MIX1 INP2' ZERO"
cset "name='RX4 DSM MUX' CIC_OUT"
- cset "name='RX3 Digital Volume' 68"
- cset "name='LINEOUT1 Volume' 0"
- cset "name='LINEOUT3 Volume' 0"
cset "name='SLIM TX3 MUX' ZERO"
exec "/system/bin/csd-client disable-device"
@@ -92,7 +103,6 @@ SectionDevice."Headphones" {
# FIXME
ConflictingDevice [
"Earpiece"
- "Headphones"
"Speaker"
]
@@ -106,10 +116,6 @@ SectionDevice."Headphones" {
cset "name='RX2 MIX1 INP2' RX7"
cset "name='HPHL DAC Switch' 1"
#FIXME ENOEXIST: cset "name='HPHR DAC Switch' 1"
- cset "name='RX1 Digital Volume' 68"
- cset "name='RX2 Digital Volume' 68"
- cset "name='HPHL Volume' 50"
- cset "name='HPHR Volume' 50"
cset "name='SLIM TX3 MUX' RMIX1"
cset "name='SLIM TX5 MUX' RMIX2"
@@ -124,10 +130,6 @@ SectionDevice."Headphones" {
cset "name='RX2 MIX1 INP1' ZERO"
cset "name='RX2 MIX1 INP2' ZERO"
cset "name='HPHL DAC Switch' 0"
- cset "name='RX1 Digital Volume' 68"
- cset "name='RX2 Digital Volume' 68"
- cset "name='HPHL Volume' 0"
- cset "name='HPHR Volume' 0"
cset "name='SLIM TX3 MUX' ZERO"
cset "name='SLIM TX5 MUX' ZERO"
@@ -158,7 +160,6 @@ SectionDevice."Earpiece" {
cset "name='SLIM_0_RX Channels' One"
cset "name='RX1 MIX1 INP1' RX1"
cset "name='RX1 MIX1 INP2' RX6"
- cset "name='RX1 Digital Volume' 68"
cset "name='EAR PA Gain' POS_6_DB"
cset "name='DAC1 Switch' 1"
cset "name='SLIM TX3 MUX' RMIX1"
@@ -169,8 +170,8 @@ SectionDevice."Earpiece" {
DisableSequence [
cdev "hw:apq8064tablasnd"
+ cset "name='RX1 MIX1 INP1' ZERO"
cset "name='RX1 MIX1 INP2' ZERO"
- cset "name='RX1 Digital Volume' 68"
cset "name='DAC1 Switch' 0"
cset "name='SLIM TX3 MUX' ZERO"
@@ -200,7 +201,6 @@ SectionDevice."HeadsetMic" {
cset "name='SLIM_0_TX Channels' One"
cset "name='SLIM TX7 MUX' DEC8"
cset "name='DEC8 MUX' ADC2"
- cset "name='ADC2 Volume' 66"
exec "/system/bin/csd-client 'enable-tx-device 8'"
]
@@ -210,7 +210,6 @@ SectionDevice."HeadsetMic" {
cset "name='SLIM TX7 MUX' ZERO"
cset "name='DEC8 MUX' ZERO"
- cset "name='ADC2 Volume' 0"
exec "/system/bin/csd-client disable-device"
]
@@ -225,7 +224,7 @@ SectionDevice."HeadsetMic" {
SectionDevice."HandsetMic" {
#Name "Handset"
- Comment "Handset Tx device (digital mic / endfire)"
+ Comment "Handset Tx device"
# Mako handset mic maps to dmic-endfire in the audio HAL
@@ -242,10 +241,8 @@ SectionDevice."HandsetMic" {
cset "name='SLIM TX8 MUX' DEC9"
cset "name='DEC9 MUX' ADC3"
cset "name='SLIM_0_TX Channels' Two"
- cset "name='MICBIAS1 CAPLESS Switch' 1"
cset "name='RX1 MIX2 INP1' IIR1"
cset "name='RX2 MIX2 INP1' IIR1"
- cset "name='IIR1 INP1 Volume' 63"
cset "name='IIR1 INP1 MUX' DEC7"
# FIXME: This needs to be 14 if rx-device is Speaker
@@ -259,7 +256,6 @@ SectionDevice."HandsetMic" {
cset "name='DEC7 MUX' ZERO"
cset "name='SLIM TX8 MUX' ZERO"
cset "name='DEC9 MUX' ZERO"
- cset "name='MICBIAS1 CAPLESS Switch' 0"
cset "name='RX1 MIX2 INP1' ZERO"
cset "name='RX2 MIX2 INP1' ZERO"
cset "name='IIR1 INP1 MUX' ZERO"