ESI W192M: Add TLV Support.
A message that is not in the archive (sent off-list or not yet received): 1380980465-5961-1-git-send-email-me
PATCH 2/4 ESI W192M: Add TLV Support.
From: Clement Guedez <[email protected]>
Add TLV support for control value in dB scale for Ego Sys Waveterminal 192M.
--- sound/pci/ice1712/wtm.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
sound/pci/ice1712/wtm.c +15 -1
@@ -29,6 +29,7 @@#include <linux/interrupt.h> #include <linux/init.h> #include <sound/core.h> +#include <sound/tlv.h> #include "ice1712.h" #include "envy24ht.h"
@@ -380,6 +381,10 @@ static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol,return change; } + +static const DECLARE_TLV_DB_SCALE(db_scale_dac, -19125, 75, 0); +static const DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0); +/* * Control tabs */
@@ -394,11 +399,14 @@ static struct snd_kcontrol_new stac9640_controls[] = { }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ), .name = "Master Playback Volume", .info = stac9460_dac_vol_info, .get = stac9460_dac_vol_get, .put = stac9460_dac_vol_put, .private_value = 1, + .tlv = { .p = db_scale_dac } }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -419,11 +427,14 @@ static struct snd_kcontrol_new stac9640_controls[] = { }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ), .name = "DAC Volume", .count = 8, .info = stac9460_dac_vol_info, .get = stac9460_dac_vol_get, .put = stac9460_dac_vol_put, + .tlv = { .p = db_scale_dac } }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -435,12 +446,15 @@ static struct snd_kcontrol_new stac9640_controls[] = { }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ), .name = "ADC Volume", .count = 2, .info = stac9460_adc_vol_info, .get = stac9460_adc_vol_get, .put = stac9460_adc_vol_put, - + .tlv = { .p = db_scale_adc } } };
Signature · 1 line
1.8.4.rc3
PATCH 3/4 ESI W192M: Add sampling rate control.
In reply to a message not in the archiveFrom: Clement Guedez <[email protected]>
Add sampling rate control for adc/dac in Ego Sys Waveterminal 192M.
--- sound/pci/ice1712/wtm.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
sound/pci/ice1712/wtm.c +83 -0
@@ -29,6 +29,7 @@#include <linux/interrupt.h> #include <linux/init.h> #include <sound/core.h> +#include <linux/slab.h> #include <sound/tlv.h> #include "ice1712.h"
@@ -69,6 +70,37 @@ static inline unsigned char stac9460_2_get(struct snd_ice1712 *ice, int reg)/* * DAC mute control */ +static void stac9460_dac_mute_all (struct snd_ice1712 *ice,unsigned char mute, +unsigned char *change) +{ +unsigned char new, old; +int idx; + +/*stac9460 1*/ +for (idx =0 ; idx <7 ; idx++) { +if (change[idx]) { + old =stac9460_get (ice, idx); + new = (~mute <<7 &0x80 ) | (old & ~0x80 ); + change[idx] = (new != old); +if (change[idx]) +stac9460_put (ice, idx, new); + } + } + +/*stac9460 2*/ +for (idx =0 ; idx <3 ; idx++) { +if (change[idx +7 ]) { + old =stac9460_2_get (ice, idx); + new = (~mute <<7 &0x80 ) | (old & ~0x80 ); + change[idx +7 ] = (new != old); +if (change[idx +7 ]) +stac9460_2_put (ice, idx, new); + } + } +} + + +#define stac9460_dac_mute_info snd_ctl_boolean_mono_info static int stac9460_dac_mute_get(struct snd_kcontrol *kcontrol,
@@ -97,10 +129,13 @@ static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct snd_ice1712 *ice =snd_kcontrol_chip (kcontrol); +struct mutex *mute_mutex = ice->spec;unsigned char new, old;int id, idx;int change; +mutex_lock (mute_mutex); +if (kcontrol->private_value) { idx =STAC946X_MASTER_VOLUME ; old =stac9460_get (ice, idx);
@@ -128,6 +163,9 @@ static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol,stac9460_2_put (ice, idx -6 , new); } } + +mutex_unlock (mute_mutex); +return change; }
@@ -381,6 +419,41 @@ static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol,return change; } +/* +* Handler for setting correct codec rate - called when rate change is detected +*/ +static void stac9460_set_rate_val (struct snd_ice1712 *ice,unsigned int rate) +{ +unsigned char old, new; +unsigned char changed[10 ]; +struct mutex *mute_mutex = ice->spec; + +if (rate ==0 )/* no hint - S/PDIF input is master, simply return */ +return ; +else if (rate <=48000 ) + new =0x08 ;/* 256x, base rate mode */ +else if (rate <=96000 ) + new =0x11 ;/* 256x, mid rate mode */ +else + new =0x12 ;/* 128x, high rate mode */ + old =stac9460_get (ice,STAC946X_MASTER_CLOCKING ); +if (old == new) +return ; +/* change detected, setting master clock, muting first */ +/* due to possible conflicts with mute controls - mutexing */ +mutex_lock (mute_mutex); +/* we have to remember current mute status for each DAC */ +stac9460_dac_mute_all (ice,0 , changed); +/*printk(KERN_DEBUG "Rate change: %d, new MC: 0x%02x\n", rate, new);*/ +stac9460_put (ice,STAC946X_MASTER_CLOCKING , new); +udelay (10 ); +/* unmuting - only originally unmuted dacs - +* i.e. those changed when muting */ +stac9460_dac_mute_all (ice,1 , changed); +mutex_unlock (mute_mutex); +} + + static const DECLARE_TLV_DB_SCALE(db_scale_dac, -19125, 75, 0); static const DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0);
@@ -479,9 +552,11 @@ static int wtm_init(struct snd_ice1712 *ice) {static unsigned short stac_inits_wtm[] = {STAC946X_RESET ,0 , +STAC946X_MASTER_CLOCKING ,0x11 , (unsigned short )-1 };unsigned short *p; +struct mutex *mute_mutex;/*WTM 192M*/ ice->num_total_dacs =8 ;
@@ -489,12 +564,20 @@ static int wtm_init(struct snd_ice1712 *ice) ice->force_rdma1 =1 ; ice->vt1720 =0 ;/* ice1724, e.g. 23 GPIOs */ + mute_mutex =kzalloc (sizeof (*mute_mutex),GFP_KERNEL ); +if (!mute_mutex) +return -ENOMEM ; + ice->spec = mute_mutex; +mutex_init (mute_mutex); + +/*initialize codec*/ p = stac_inits_wtm;for (; *p != (unsigned short )-1 ; p +=2 ) {stac9460_put (ice, p[0 ], p[1 ]);stac9460_2_put (ice, p[0 ], p[1 ]); } + ice->gpio.set_pro_rate = stac9460_set_rate_val;return 0 ; }
Signature · 1 line
1.8.4.rc3
Re: [PATCH 3/4] ESI W192M: Add sampling rate control.
At Sat, 5 Oct 2013 15:41:04 +0200,
Quoted 43 lines · [email protected] wrote:
From: Clement Guedez <[email protected]>
Add sampling rate control for adc/dac in Ego Sys Waveterminal 192M.
Signed-off-by Clement Guedez <[email protected]>--- sound/pci/ice1712/wtm.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)sound/pci/ice1712/wtm.c +18
-0@@ -29,6 +29,7 @@#include <linux/interrupt.h> #include <linux/init.h> #include <sound/core.h> +#include <linux/slab.h> #include <sound/tlv.h> #include "ice1712.h" @@ -69,6 +70,37 @@ static inline unsigned char stac9460_2_get(struct snd_ice1712 *ice, int reg)/* * DAC mute control */ +static void stac9460_dac_mute_all (struct snd_ice1712 *ice,unsigned char mute, +unsigned char *change) +{ +unsigned char new, old; +int idx; + +/*stac9460 1*/ +for (idx =0 ; idx <7 ; idx++) { +if (change[idx]) { + old =stac9460_get (ice, idx); + new = (~mute <<7 &0x80 ) | (old & ~0x80 ); + change[idx] = (new != old); +if (change[idx]) +stac9460_put (ice, idx, new); + } + } +
sound/pci/ice1712/wtm.c static inline unsigned char stac9460_2_get(struct snd_ice1712 *ice, int reg) · line 99
Quoted 10 lines
sound/pci/ice1712/wtm.c +10
-0+/*stac9460 2*/ +for (idx =0 ; idx <3 ; idx++) { +if (change[idx +7 ]) { + old =stac9460_2_get (ice, idx); + new = (~mute <<7 &0x80 ) | (old & ~0x80 ); + change[idx +7 ] = (new != old); +if (change[idx +7 ]) +stac9460_2_put (ice, idx, new); + } + }
This code can be a bit more simplified...
sound/pci/ice1712/wtm.c static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol, · line 132
Quoted 12 lines
sound/pci/ice1712/wtm.c +5
-0+} + + +#define stac9460_dac_mute_info snd_ctl_boolean_mono_info static int stac9460_dac_mute_get(struct snd_kcontrol *kcontrol,@@ -97,10 +129,13 @@ static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct snd_ice1712 *ice =snd_kcontrol_chip (kcontrol); +struct mutex *mute_mutex = ice->spec;
Define a new struct just containing a mutex, e.g.
struct wtm_spec {
struct mutex mute_mutex;
};This can be extended easily if anything new would be needed later.
Quoted 20 lines
sound/pci/ice1712/wtm.c +5
-0unsigned char new, old;int id, idx;int change; +mutex_lock (mute_mutex); +if (kcontrol->private_value) { idx =STAC946X_MASTER_VOLUME ; old =stac9460_get (ice, idx);@@ -128,6 +163,9 @@ static int stac9460_dac_mute_put(struct snd_kcontrol *kcontrol,stac9460_2_put (ice, idx -6 , new); } } + +mutex_unlock (mute_mutex); +return change; }
sound/pci/ice1712/wtm.c static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol, · line 428
Quoted 10 lines
sound/pci/ice1712/wtm.c +7
-0@@ -381,6 +419,41 @@ static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol,return change; } +/* +* Handler for setting correct codec rate - called when rate change is detected +*/ +static void stac9460_set_rate_val (struct snd_ice1712 *ice,unsigned int rate) +{ +unsigned char old, new; +unsigned char changed[10 ];
It's easier to use a bit flag instead of char[10].
Quoted 8 lines
sound/pci/ice1712/wtm.c +8
-0+struct mutex *mute_mutex = ice->spec; + +if (rate ==0 )/* no hint - S/PDIF input is master, simply return */ +return ; +else if (rate <=48000 ) + new =0x08 ;/* 256x, base rate mode */ +else if (rate <=96000 ) + new =0x11 ;/* 256x, mid rate mode */
sound/pci/ice1712/wtm.c static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol, · line 446
Quoted 10 lines
sound/pci/ice1712/wtm.c +10
-0+else + new =0x12 ;/* 128x, high rate mode */ + old =stac9460_get (ice,STAC946X_MASTER_CLOCKING ); +if (old == new) +return ; +/* change detected, setting master clock, muting first */ +/* due to possible conflicts with mute controls - mutexing */ +mutex_lock (mute_mutex); +/* we have to remember current mute status for each DAC */ +stac9460_dac_mute_all (ice,0 , changed);
You didn't initialize changed[]? In your logic, it must be set to all 1 at first.
Quoted 35 lines
sound/pci/ice1712/wtm.c +18
-0+/*printk(KERN_DEBUG "Rate change: %d, new MC: 0x%02x\n", rate, new);*/ +stac9460_put (ice,STAC946X_MASTER_CLOCKING , new); +udelay (10 ); +/* unmuting - only originally unmuted dacs - +* i.e. those changed when muting */ +stac9460_dac_mute_all (ice,1 , changed); +mutex_unlock (mute_mutex); +} + + static const DECLARE_TLV_DB_SCALE(db_scale_dac, -19125, 75, 0); static const DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0);@@ -479,9 +552,11 @@ static int wtm_init(struct snd_ice1712 *ice) {static unsigned short stac_inits_wtm[] = {STAC946X_RESET ,0 , +STAC946X_MASTER_CLOCKING ,0x11 , (unsigned short )-1 };unsigned short *p; +struct mutex *mute_mutex;/*WTM 192M*/ ice->num_total_dacs =8 ;@@ -489,12 +564,20 @@ static int wtm_init(struct snd_ice1712 *ice) ice->force_rdma1 =1 ; ice->vt1720 =0 ;/* ice1724, e.g. 23 GPIOs */ + mute_mutex =kzalloc (sizeof (*mute_mutex),GFP_KERNEL ); +if (!mute_mutex) +return -ENOMEM ; + ice->spec = mute_mutex; +mutex_init (mute_mutex); +
sound/pci/ice1712/wtm.c static int wtm_init(struct snd_ice1712 *ice) · line 582
Quoted 10 lines
sound/pci/ice1712/wtm.c +2
-0+/*initialize codec*/ p = stac_inits_wtm;for (; *p != (unsigned short )-1 ; p +=2 ) {stac9460_put (ice, p[0 ], p[1 ]);stac9460_2_put (ice, p[0 ], p[1 ]); } + ice->gpio.set_pro_rate = stac9460_set_rate_val;return 0 ; }
thanks,
Takashi
PATCH 4/4 ESI W192M: Add text "Line in/Mic".
In reply to a message not in the archiveFrom: Clement Guedez <[email protected]>
Add text "Line in/Mic" for selecting input gain state for Ego Sys Waveterminal 192M.
--- sound/pci/ice1712/wtm.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
sound/pci/ice1712/wtm.c +18 -3
@@ -377,8 +377,23 @@ static int stac9460_adc_vol_put(struct snd_kcontrol *kcontrol,/* * MIC / LINE switch fonction */ +static int stac9460_mic_sw_info (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_info *uinfo) +{ +static char *texts[2 ] = {"Line In" ,"Mic" }; + + uinfo->type =SNDRV_CTL_ELEM_TYPE_ENUMERATED ; + uinfo->count =1 ; + uinfo->value.enumerated.items =2 ; -#define stac9460_mic_sw_info snd_ctl_boolean_mono_info +if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) + uinfo->value.enumerated.item = uinfo->value.enumerated.items + -1 ; +strcpy (uinfo->value.enumerated.name, + texts[uinfo->value.enumerated.item]); + +return 0 ; +}static int stac9460_mic_sw_get (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol)
@@ -392,7 +407,7 @@ static int stac9460_mic_sw_get(struct snd_kcontrol *kcontrol, val =stac9460_get (ice,STAC946X_GENERAL_PURPOSE ); else val =stac9460_2_get (ice,STAC946X_GENERAL_PURPOSE ); - ucontrol->value.integer.value[0 ] = ~val>>7 &0x1 ; + ucontrol->value.enumerated.item[0 ] = (val >>7 ) &0x1 ;return 0 ; }
@@ -408,7 +423,7 @@ static int stac9460_mic_sw_put(struct snd_kcontrol *kcontrol, old =stac9460_get (ice,STAC946X_GENERAL_PURPOSE ); else old =stac9460_2_get (ice,STAC946X_GENERAL_PURPOSE ); - new = (~ucontrol->value.integer.value[0 ] <<7 &0x80 ) | (old & ~0x80 ); + new = (ucontrol->value.enumerated.item[0 ] <<7 &0x80 ) | (old & ~0x80 ); change = (new != old);if (change) {if (id ==0 )
Signature · 1 line
1.8.4.rc3