miscellaneous patches for 3.18
Subsystems (3)
Clemens Ladisch
maintainercover miscellaneous patches for 3.18
sound/core/pcm_lib.c | 10 ++++++---- sound/pci/oxygen/xonar_pcm179x.c | 33 +++++++++++++++++++++++---------- sound/usb/midi.c | 11 +++++++++++ 3 files changed, 40 insertions(+), 14 deletions(-)
Clemens Ladisch
maintainerPATCH 1/5 ALSA: pcm: snd_interval_step: drop the min parameter
The min parameter was not used by any caller. And if it were used, underflows in the calculations could lead to incorrect results.
--- sound/core/pcm_lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/core/pcm_lib.c +4 -4
@@ -1113,16 +1113,16 @@ int snd_interval_list(struct snd_interval *i, unsigned int count,EXPORT_SYMBOL (snd_interval_list); -static int snd_interval_step (struct snd_interval *i,unsigned int min,unsigned int step) +static int snd_interval_step (struct snd_interval *i,unsigned int step) {unsigned int n;int changed =0 ; - n = (i->min - min) % step; + n = i->min % step;if (n !=0 || i->openmin) { i->min += step - n; changed =1 ; } - n = (i->max - min) % step; + n = i->max % step;if (n !=0 || i->openmax) { i->max -= n; changed =1 ;
@@ -1427,7 +1427,7 @@ static int snd_pcm_hw_rule_step(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule) {unsigned long step = (unsigned long ) rule->private; -return snd_interval_step (hw_param_interval (params, rule->var),0 , step); +return snd_interval_step (hw_param_interval (params, rule->var), step); }/**
Clemens Ladisch
maintainerRe: [PATCH 0/5] ALSA: pcm: snd_interval_step: fix changes of open intervals
In reply to Clemens LadischChanging an interval boundary to a multiple of the step size makes that boundary exact.
--- sound/core/pcm_lib.c | 2 ++ 1 file changed, 2 insertions(+)
sound/core/pcm_lib.c +2 -0
@@ -1120,11 +1120,13 @@ static int snd_interval_step(struct snd_interval *i, unsigned int step) n = i->min % step;if (n !=0 || i->openmin) { i->min += step - n; + i->openmin =0 ; changed =1 ; } n = i->max % step;if (n !=0 || i->openmax) { i->max -= n; + i->openmax =0 ; changed =1 ; }if (snd_interval_checkempty (i)) {
Clemens Ladisch
maintainerPATCH 3/5 ALSA: usb-audio: add MIDI port names for the Yamaha MOTIF XF
In reply to Clemens Ladisch--- sound/usb/midi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/usb/midi.c +11 -0
@@ -1506,6 +1506,12 @@ static struct port_info {PORT_INFO (vendor, product, num, name,0 , \SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | \ SNDRV_SEQ_PORT_TYPE_HARDWARE) +#define GM_SYNTH_PORT (vendor, product, num, name, voices) \ + PORT_INFO(vendor, product, num, name, voices, \ + SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | \ + SNDRV_SEQ_PORT_TYPE_MIDI_GM | \ + SNDRV_SEQ_PORT_TYPE_HARDWARE | \ + SNDRV_SEQ_PORT_TYPE_SYNTHESIZER)#define ROLAND_SYNTH_PORT (vendor, product, num, name, voices) \ PORT_INFO(vendor, product, num, name, voices, \ SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | \
@@ -1525,6 +1531,11 @@ static struct port_info { SNDRV_SEQ_PORT_TYPE_MIDI_MT32 | \ SNDRV_SEQ_PORT_TYPE_HARDWARE | \ SNDRV_SEQ_PORT_TYPE_SYNTHESIZER) +/* Yamaha MOTIF XF */ +GM_SYNTH_PORT (0x0499 ,0x105c ,0 ,"%s Tone Generator" ,128 ), +CONTROL_PORT (0x0499 ,0x105c ,1 ,"%s Remote Control" ), +EXTERNAL_PORT (0x0499 ,0x105c ,2 ,"%s Thru" ), +CONTROL_PORT (0x0499 ,0x105c ,3 ,"%s Editor" ),/* Roland UA-100 */ CONTROL_PORT(0x0582, 0x0000, 2, "%s Control"),/* Roland SC-8850 */
Clemens Ladisch
maintainerPATCH 4/5 ALSA: virtuoso: add one more headphone impedance setting
In reply to Clemens LadischAdd one more option to the "Headphones Impedance" control to synchronize with recent versions of the Windows driver.
--- sound/pci/oxygen/xonar_pcm179x.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
sound/pci/oxygen/xonar_pcm179x.c +10 -8
@@ -795,11 +795,11 @@ static int st_output_switch_put(struct snd_kcontrol *ctl,static int st_hp_volume_offset_info (struct snd_kcontrol *ctl,struct snd_ctl_elem_info *info) { -static const char *const names[3 ] = { -"< 64 ohms" ,"64-300 ohms" ,"300-600 ohms" +static const char *const names[4 ] = { +"< 32 ohms" ,"32-64 ohms" ,"64-300 ohms" ,"300-600 ohms" }; -return snd_ctl_enum_info (info,1 ,3 , names); +return snd_ctl_enum_info (info,1 ,4 , names); } static int st_hp_volume_offset_get(struct snd_kcontrol *ctl,
@@ -809,12 +809,14 @@ static int st_hp_volume_offset_get(struct snd_kcontrol *ctl,struct xonar_pcm179x *data = chip->model_data;mutex_lock (&chip->mutex); -if (data->hp_gain_offset <2 *-6 ) +if (data->hp_gain_offset <2 *-12 ) value->value.enumerated.item[0 ] =0 ; -else if (data->hp_gain_offset <0 ) +else if (data->hp_gain_offset <2 *-6 ) value->value.enumerated.item[0 ] =1 ; -else +else if (data->hp_gain_offset <0 ) value->value.enumerated.item[0 ] =2 ; +else + value->value.enumerated.item[0 ] =3 ;mutex_unlock (&chip->mutex);return 0 ; }
@@ -823,13 +825,13 @@ static int st_hp_volume_offset_get(struct snd_kcontrol *ctl,static int st_hp_volume_offset_put (struct snd_kcontrol *ctl,struct snd_ctl_elem_value *value) { -static const s8 offsets[] = {2 *-18 ,2 *-6 ,0 }; +static const s8 offsets[] = {2 *-18 ,2 *-12 ,2 *-6 ,0 };struct oxygen *chip = ctl->private_data;struct xonar_pcm179x *data = chip->model_data;s8 offset;int changed; -if (value->value.enumerated.item[0 ] >2 ) +if (value->value.enumerated.item[0 ] >3 )return -EINVAL ; offset = offsets[value->value.enumerated.item[0 ]];mutex_lock (&chip->mutex);
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Clemens Ladisch
maintainerPATCH 5/5 ALSA: virtuoso: add Xonar Essence STX II daughterboard support
In reply to Clemens LadischDetect and handle the H6 daughterboard; it works the same as with the ST, except that there is no conflict with the CS2000 chip.
--- sound/pci/oxygen/xonar_pcm179x.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
sound/pci/oxygen/xonar_pcm179x.c +13 -2
@@ -419,6 +419,7 @@ static void xonar_st_init_common(struct oxygen *chip) data->generic.output_enable_bit =GPIO_ST_OUTPUT_ENABLE ; data->dacs = chip->model.dac_channels_mixer /2 ; + data->h6 = chip->model.dac_channels_mixer >2 ; data->hp_gain_offset =2 *-18 ;pcm1796_init (chip);
@@ -1142,8 +1143,18 @@ int get_xonar_pcm179x_model(struct oxygen *chip,break ;case 0x85f4 : chip->model = model_xonar_st; -/* TODO: daughterboard support */ - chip->model.shortname ="Xonar STX II" ; +oxygen_clear_bits16 (chip,OXYGEN_GPIO_CONTROL ,GPIO_DB_MASK ); +switch (oxygen_read16 (chip,OXYGEN_GPIO_DATA ) &GPIO_DB_MASK ) { +default : + chip->model.shortname ="Xonar STX II" ; +break ; +case GPIO_DB_H6 : + chip->model.shortname ="Xonar STX II+H6" ; + chip->model.dac_channels_pcm =8 ; + chip->model.dac_channels_mixer =8 ; + chip->model.dac_mclks =OXYGEN_MCLKS (256 ,128 ,128 ); +break ; + } chip->model.init = xonar_stx_init; chip->model.resume = xonar_stx_resume; chip->model.set_dac_params = set_pcm1796_params;
At Sun, 07 Sep 2014 21:42:24 +0200,
Quoted 5 lines · Clemens Ladisch
sound/core/pcm_lib.c | 10 ++++++---- sound/pci/oxygen/xonar_pcm179x.c | 33 +++++++++++++++++++++++---------- sound/usb/midi.c | 11 +++++++++++ 3 files changed, 40 insertions(+), 14 deletions(-)
All applied. Thanks.
Takashi