diff options
| author | UK KIM <w0806.6.kim@samsung.com> | 2010-10-14 11:27:48 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-17 17:49:56 -0800 |
| commit | 22d5f495d5984c46e26cd9c14751b921d5bf745a (patch) | |
| tree | d0a09e85bbf58ab8eee9547724d93a9f56853792 /sound/soc/codecs/wm8994_samsung.h | |
| parent | a52b15158207cc554508a4dd6d6506c14f3a620a (diff) | |
| download | kernel_samsung_crespo-22d5f495d5984c46e26cd9c14751b921d5bf745a.zip kernel_samsung_crespo-22d5f495d5984c46e26cd9c14751b921d5bf745a.tar.gz kernel_samsung_crespo-22d5f495d5984c46e26cd9c14751b921d5bf745a.tar.bz2 | |
S5PC11X: SOUND: modified to support bluetooth SCO in VOIP
1. add bluetooth sco path
2. clean up codec driver
3. fix sound mute issue when output device is changed in voip
4. recognition param is added for recognition rate up
Change-Id: I89f0c3ab628bc0adaf0fc809ac5745e2912d98bb
Signed-off-by: UK KIM <w0806.6.kim@samsung.com>
Diffstat (limited to 'sound/soc/codecs/wm8994_samsung.h')
| -rwxr-xr-x | sound/soc/codecs/wm8994_samsung.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8994_samsung.h b/sound/soc/codecs/wm8994_samsung.h index bd67510..0967f5b 100755 --- a/sound/soc/codecs/wm8994_samsung.h +++ b/sound/soc/codecs/wm8994_samsung.h @@ -83,9 +83,7 @@ enum audio_path { RING_SPK, RING_HP, RING_SPK_HP }; enum mic_path {MAIN, SUB, BT_REC, MIC_OFF}; -enum call_state {DISCONNECT, CONNECT}; enum power_state {CODEC_OFF, CODEC_ON }; -enum mic_state {MIC_NO_USE, MIC_USE}; enum ringtone_state {RING_OFF, RING_ON}; enum recognition {REC_OFF, REC_ON}; @@ -112,9 +110,7 @@ struct wm8994_priv { unsigned int stream_state; enum audio_path cur_path; enum mic_path rec_path; - enum call_state call_state; enum power_state power_state; - enum mic_state mic_state; enum recognition recognition_active; enum ringtone_state ringtone_active; select_route *universal_playback_path; @@ -149,8 +145,7 @@ inline unsigned int wm8994_read(struct snd_soc_codec *codec, unsigned int reg); int wm8994_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value); int wm8994_configure_clock(struct snd_soc_codec *codec, int en); -void wm8994_disable_playback_path(struct snd_soc_codec *codec, - enum audio_path path); +void wm8994_disable_path(struct snd_soc_codec *codec); void wm8994_disable_rec_path(struct snd_soc_codec *codec); void wm8994_record_main_mic(struct snd_soc_codec *codec); void wm8994_record_headset_mic(struct snd_soc_codec *codec); @@ -158,6 +153,7 @@ void wm8994_record_bluetooth(struct snd_soc_codec *codec); void wm8994_set_playback_receiver(struct snd_soc_codec *codec); void wm8994_set_playback_headset(struct snd_soc_codec *codec); void wm8994_set_playback_speaker(struct snd_soc_codec *codec); +void wm8994_set_playback_bluetooth(struct snd_soc_codec *codec); void wm8994_set_playback_speaker_headset(struct snd_soc_codec *codec); void wm8994_set_voicecall_common_setting(struct snd_soc_codec *codec); void wm8994_set_voicecall_receiver(struct snd_soc_codec *codec); |