From 8e0b2e1e6245edc7efbf7317a4a9ac2ca73b3207 Mon Sep 17 00:00:00 2001 From: UK KIM Date: Mon, 20 Sep 2010 15:42:45 -0700 Subject: S5PC11X: SOUND : cleanup alsa configuration file. 1. deleted unneeded configuration 2. rename hook argument of Capture. Change-Id: I456e2cd0ba945b2a1877645135fcc4c8d8f1b25f Signed-off-by: UK KIM --- asound.conf | 260 +++++++++++++++++------------------------------------------- 1 file changed, 72 insertions(+), 188 deletions(-) (limited to 'asound.conf') diff --git a/asound.conf b/asound.conf index c2aaa6b..7d58718 100644 --- a/asound.conf +++ b/asound.conf @@ -1,22 +1,14 @@ -# Android ALSA configuration file for the AK4671 audio. - - -######################################################################## -# {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK -# # 3:HP 4:BT -# {name "Output Volume" value 30} # min:0 max:48 -# {name "Output Volume - RCV" value 2}# min:0 max:7 -# {name "Output Volume - SPK/EAR" value 8} # min:0 max:15 -# {name "MIC Path" value 1} # 0:Main Mic 1:Sub MIC -# {name "Voice Call Path" value 1} # 0:OFF 1:RCV 2:SPK -# # 3:HP 4:BT -# {name "Voice Memo Path" value 1} # 0:OFF 1:MAIN 2:SUB -# # 3:EAR 4:BT -# {name "MIC Gain" value 5,5} # min:0 max:15 -# {name "FM Radio Path" value 1} # 0:off 1:RCV 2:SPK -# # 3:HP 4:BT -# {name "Idle Mode" value 1} # 0:off 1:on -######################################################################### +# Android ALSA configuration file for the WM8994 audio. + + +###################################################################################### +# +# {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT +# # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP +# {name "Capture MIC Path" value 1} # 0:Main Mic 1:Ear MIC 2:BT MIC +# {name "Voice Call Path" value 1} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT +# +###################################################################################### ## @@ -64,9 +56,7 @@ pcm.AndroidPlayback_Earpiece { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "MIC Path" value 0} # 0:Main Mic 1:Sub MIC - {name "Voice Call Path" value 1} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Voice Call Path" value 1} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT ] } } @@ -82,13 +72,13 @@ pcm.AndroidPlayback_Speaker { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } -pcm.AndroidPlayback_Bluetooth { +pcm.AndroidPlayback_Headset { type hooks slave.pcm { type hw @@ -99,13 +89,13 @@ pcm.AndroidPlayback_Bluetooth { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 4} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 3} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } -pcm.AndroidPlayback_Headset { +pcm.AndroidPlayback_Bluetooth { type hooks slave.pcm { type hw @@ -116,8 +106,8 @@ pcm.AndroidPlayback_Headset { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 3} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 4} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } @@ -133,11 +123,8 @@ pcm.AndroidPlayback_Earpiece_normal { type ctl_elems hook_args [ # Enable audio output from the DSP - #{name "MIC Path" value 0} # 0:Main Mic 1:Sub MIC - #{name "Voice Call Path" value 1} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT - {name "Playback Path" value 1} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 1} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } @@ -153,13 +140,13 @@ pcm.AndroidPlayback_Speaker_normal { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } -pcm.AndroidPlayback_Speaker_Headset_normal { +pcm.AndroidPlayback_Headset_normal { type hooks slave.pcm { type hw @@ -170,8 +157,8 @@ pcm.AndroidPlayback_Speaker_Headset_normal { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 5} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT 5:SPKHP + {name "Playback Path" value 3} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } @@ -187,13 +174,13 @@ pcm.AndroidPlayback_Bluetooth_normal { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 4} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 4} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } -pcm.AndroidPlayback_Headset_normal { +pcm.AndroidPlayback_Speaker_Headset_normal { type hooks slave.pcm { type hw @@ -204,8 +191,8 @@ pcm.AndroidPlayback_Headset_normal { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 3} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 5} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } @@ -221,8 +208,8 @@ pcm.AndroidPlayback_Earpiece_ringtone { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 6} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } @@ -238,13 +225,13 @@ pcm.AndroidPlayback_Speaker_ringtone { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 6} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } -pcm.AndroidPlayback_Speaker_Headset_ringtone { +pcm.AndroidPlayback_Headset_ringtone { type hooks slave.pcm { type hw @@ -255,9 +242,8 @@ pcm.AndroidPlayback_Speaker_Headset_ringtone { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 6} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT 5:SPKHP - # 6:R_SPKHP + {name "Playback Path" value 7} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } @@ -273,13 +259,13 @@ pcm.AndroidPlayback_Bluetooth_ringtone { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 4} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 4} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } -pcm.AndroidPlayback_Headset_ringtone { +pcm.AndroidPlayback_Speaker_Headset_ringtone { type hooks slave.pcm { type hw @@ -290,8 +276,8 @@ pcm.AndroidPlayback_Headset_ringtone { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Playback Path" value 3} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Playback Path" value 8} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } @@ -307,7 +293,6 @@ pcm.AndroidPlayback_Earpiece_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "MIC Path" value 0} # 0:Main Mic 1:Sub MIC {name "Voice Call Path" value 1} # 0:OFF 1:RCV 2:SPK # 3:HP 4:BT ] @@ -325,14 +310,13 @@ pcm.AndroidPlayback_Speaker_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "MIC Path" value 1} # 0:Main Mic 1:Sub MIC {name "Voice Call Path" value 2} # 0:OFF 1:RCV 2:SPK # 3:HP 4:BT ] } } -pcm.AndroidPlayback_Speaker_Headset_incall { +pcm.AndroidPlayback_Headset_incall { type hooks slave.pcm { type hw @@ -343,8 +327,7 @@ pcm.AndroidPlayback_Speaker_Headset_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "MIC Path" value 1} # 0:Main Mic 1:Sub MIC - {name "Voice Call Path" value 2} # 0:OFF 1:RCV 2:SPK + {name "Voice Call Path" value 3} # 0:OFF 1:RCV 2:SPK # 3:HP 4:BT ] } @@ -367,7 +350,7 @@ pcm.AndroidPlayback_Bluetooth_incall { } } -pcm.AndroidPlayback_Headset_incall { +pcm.AndroidPlayback_Speaker_Headset_incall { type hooks slave.pcm { type hw @@ -378,7 +361,7 @@ pcm.AndroidPlayback_Headset_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "Voice Call Path" value 3} # 0:OFF 1:RCV 2:SPK + {name "Voice Call Path" value 2} # 0:OFF 1:RCV 2:SPK # 3:HP 4:BT ] } @@ -386,76 +369,7 @@ pcm.AndroidPlayback_Headset_incall { ## -## Idle control device -## - -pcm.AndroidPlayback_On_idle { - type hooks - slave.pcm { - type hw - card 0 - device 0 # Must be of type "digital audio playback" - } - hooks.0 { - type ctl_elems - hook_args [ - # Enable audio output from the DSP - {name "Idle Mode" value 1} # off:0 on:1 - ] - } -} - -pcm.AndroidPlayback_Off_idle { - type hooks - slave.pcm { - type hw - card 0 - device 0 # Must be of type "digital audio playback" - } - hooks.0 { - type ctl_elems - hook_args [ - # Enable audio output from the DSP - {name "Idle Mode" value 0} # off:0 on:1 - ] - } -} - -pcm.AndroidRecord_On_idle { - type hooks - slave.pcm { - type hw - card 0 - device 0 # Must be of type "digital audio playback" - } - hooks.0 { - type ctl_elems - hook_args [ - # Enable audio output from the DSP - {name "Idle Mode" value 1} # off:0 on:1 - ] - } -} - -pcm.AndroidRecord_Off_idle { - type hooks - slave.pcm { - type hw - card 0 - device 0 # Must be of type "digital audio playback" - } - hooks.0 { - type ctl_elems - hook_args [ - # Enable audio output from the DSP - {name "Idle Mode" value 0} # off:0 on:1 - ] - } -} - - -## -## Recording device +## Capture device ## pcm.AndroidRecord { @@ -468,8 +382,7 @@ pcm.AndroidRecord { hooks.0 { type ctl_elems hook_args [ - {name "MIC Path" value 0} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 0} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } @@ -484,8 +397,7 @@ pcm.AndroidRecord_Microphone { hooks.0 { type ctl_elems hook_args [ - {name "MIC Path" value 0} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 0} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } @@ -500,10 +412,7 @@ pcm.AndroidRecord_Earpiece_normal { hooks.0 { type ctl_elems hook_args [ - {name "Playback Path" value 1} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT - {name "Voice Memo Path" value 1} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 0} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } @@ -518,13 +427,12 @@ pcm.AndroidRecord_Speaker_normal { hooks.0 { type ctl_elems hook_args [ - {name "Voice Memo Path" value 2} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 0} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } -pcm.AndroidRecord_Speaker_ringtone { +pcm.AndroidRecord_Headset_normal { type hooks slave.pcm { type hw @@ -534,13 +442,12 @@ pcm.AndroidRecord_Speaker_ringtone { hooks.0 { type ctl_elems hook_args [ - {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Capture MIC Path" value 1} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } -pcm.AndroidRecord_Headset_ringtone { +pcm.AndroidRecord_Bluetooth_normal { type hooks slave.pcm { type hw @@ -550,8 +457,7 @@ pcm.AndroidRecord_Headset_ringtone { hooks.0 { type ctl_elems hook_args [ - {name "Playback Path" value 3} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT + {name "Capture MIC Path" value 2} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } @@ -566,13 +472,12 @@ pcm.AndroidRecord_Speaker_Headset_normal { hooks.0 { type ctl_elems hook_args [ - {name "Voice Memo Path" value 3} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 0} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } -pcm.AndroidRecord_Bluetooth_normal { +pcm.AndroidRecord_Speaker_ringtone { type hooks slave.pcm { type hw @@ -582,13 +487,13 @@ pcm.AndroidRecord_Bluetooth_normal { hooks.0 { type ctl_elems hook_args [ - {name "Voice Memo Path" value 4} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Playback Path" value 2} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } -pcm.AndroidRecord_Headset_normal { +pcm.AndroidRecord_Headset_ringtone { type hooks slave.pcm { type hw @@ -598,9 +503,8 @@ pcm.AndroidRecord_Headset_normal { hooks.0 { type ctl_elems hook_args [ - {name "MIC Path" value 0} # 0:MAIN 1:SUB -# {name "Voice Memo Path" value 3} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Playback Path" value 3} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT + # 5:SPK_HP 6:R_SPK 7:R_HP 8:R_SPK_HP ] } } @@ -616,11 +520,7 @@ pcm.AndroidRecord_Earpiece_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "MIC Path" value 0} # 0:Main Mic 1:Sub MIC - {name "Voice Call Path" value 1} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT - {name "Voice Memo Path" value 1} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 0} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } @@ -636,16 +536,12 @@ pcm.AndroidRecord_Speaker_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - {name "MIC Path" value 1} # 0:Main Mic 1:Sub MIC - {name "Voice Call Path" value 2} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT - {name "Voice Memo Path" value 2} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 0} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } -pcm.AndroidRecord_Speaker_Headset_incall { +pcm.AndroidRecord_Headset_incall { type hooks slave.pcm { type hw @@ -656,11 +552,7 @@ pcm.AndroidRecord_Speaker_Headset_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - #{name "MIC Path" value 1} # 0:Main Mic 1:Sub MIC - {name "Voice Call Path" value 3} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT - {name "Voice Memo Path" value 3} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 1} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } @@ -676,16 +568,12 @@ pcm.AndroidRecord_Bluetooth_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - #{name "MIC Path" value 1} # 0:Main Mic 1:Sub MIC - {name "Voice Call Path" value 4} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT - {name "Voice Memo Path" value 4} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 2} # 0:Main Mic 1:Ear MIC 2:BT MIC ] } } -pcm.AndroidRecord_Headset_incall { +pcm.AndroidRecord_Speaker_Headset_incall { type hooks slave.pcm { type hw @@ -696,12 +584,8 @@ pcm.AndroidRecord_Headset_incall { type ctl_elems hook_args [ # Enable audio output from the DSP - #{name "MIC Path" value 1} # 0:Main Mic 1:Sub MIC - {name "Voice Call Path" value 3} # 0:OFF 1:RCV 2:SPK - # 3:HP 4:BT - {name "Voice Memo Path" value 3} # 0:OFF 1:MAIN 2:SUB - # 3:EAR 4:BT + {name "Capture MIC Path" value 1} # 0:Main Mic 1:Ear MIC 2:BT MIC + {name "Voice Call Path" value 3} # 0:OFF 1:RCV 2:SPK 3:HP 4:BT ] } } - -- cgit v1.1