android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

msm: ajust the QDSP6 audio driver for the newer htc leo ALSA driver

Browse Source 
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
This commit is contained in:
tytung 2011-11-01 00:09:14 +08:00
parent e7f4d881c0
commit facbe114ed
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-msm/include/mach/msm_qdsp6_audio_1550.h
View File

@ -97,11 +97,12 @@ int q6audio_write(struct audio_client *ac, struct audio_buffer *ab);
int q6audio_async(struct audio_client *ac);
int q6audio_do_routing(uint32_t route, uint32_t acdb_id);
int q6audio_set_rx_mute(int mute);
int q6audio_set_tx_mute(int mute);
int q6audio_reinit_acdb(char* filename);
int q6audio_update_acdb(uint32_t id_src, uint32_t id_dst);
int q6audio_set_rx_volume(int level);
int q6audio_set_rx_mute(int mute);
int q6audio_set_tx_volume(int level);
int q6audio_set_stream_volume(struct audio_client *ac, int vol);
int q6audio_set_tx_dev_volume(int device_id, int level);
int q6audio_get_tx_dev_volume(int device_id);

28
arch/arm/mach-msm/qdsp6_1550/q6audio.c
View File

@ -211,6 +211,7 @@ static struct q6audio_analog_ops *analog_ops = &default_analog_ops;
static uint32_t tx_clk_freq = 8000;
static int tx_mute_status = 0;
static int rx_vol_level = 100;
static int tx_vol_level = 100;
static char acdb_file[64] = "default.acdb";
static uint32_t tx_acdb = 0;
static uint32_t rx_acdb = 0;
@ -2071,6 +2072,7 @@ int q6audio_get_tx_dev_volume(int device_id)
int q6audio_set_tx_dev_volume(int device_id, int level)
{
AUDIO_INFO("%s\n", __func__);
if (level < -1)
level = -1;
if (level > MAX_MIC_LEVEL)
@ -2093,6 +2095,28 @@ int q6audio_set_tx_dev_volume(int device_id, int level)
return 0;
}
int q6audio_set_tx_volume(int level)
{
uint32_t adev;
int vol;
if (q6audio_init())
return 0;
if (level < 0 || level > 100)
return -EINVAL;
mutex_lock(&audio_path_lock);
adev = ADSP_AUDIO_DEVICE_ID_VOICE;
vol = q6_device_volume(audio_rx_device_id, level);
audio_tx_mute(ac_control, adev, 0);
audio_tx_volume(ac_control, adev, vol);
tx_vol_level = level;
mutex_unlock(&audio_path_lock);
return 0;
}
int q6audio_set_tx_mute(int mute)
{
uint32_t adev;
@ -2198,14 +2222,14 @@ static int q6audio_init_rx_volumes()
mutex_lock(&audio_path_lock);
printk("$$$ q6audio_init_rx_volumes\n");
AUDIO_INFO("$$$ q6audio_init_rx_volumes\n");
while (1)
{
if (di->id == 0) break;
vol = q6_device_volume(di->id, 100);
audio_rx_volume(ac_control, di->id, vol);
printk("$$ DEV=%08X: vol is %d\n", di->id, vol);
AUDIO_INFO("$$ DEV=%08X: vol is %d\n", di->id, vol);
di++;
}