Skip to content

L
linux

Linux-御风守护者 / linux
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
L
linux

体验新版 GitCode，发现更多精彩内容 >>

提交 f009ad9b 编写于 作者: C Clemens Ladisch 提交者： Takashi Iwai
浏览文件
操作

[ALSA] oxygen: change model-specific PCM device configuration 

When specifying which PCM devices to use, model drivers now use flags
that also specify the routing between PCM devices and DMA channels
instead of just DMA channel bits.  This simplifies some code that checks
for these flags.
Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 fa5d8106
隐藏空白更改
内联 并排
Showing with 176 addition and 152 deletion
sound/pci/oxygen/hifier.c
浏览文件 @ f009ad9b
...@@ -160,10 +160,10 @@ static const struct oxygen_model model_hifier = { ...@@ -160,10 +160,10 @@ static const struct oxygen_model model_hifier = {
.update_dac_volume = update_ak4396_volume, .update_dac_volume = update_ak4396_volume,
.update_dac_mute = update_ak4396_mute, .update_dac_mute = update_ak4396_mute,
.model_data_size = sizeof(struct hifier_data), .model_data_size = sizeof(struct hifier_data),
.pcm_dev_cfg = PLAYBACK_0_TO_I2S |
PLAYBACK_1_TO_SPDIF |
CAPTURE_0_FROM_I2S_1,
.dac_channels = 2, .dac_channels = 2,
.used_channels = OXYGEN_CHANNEL_A |
OXYGEN_CHANNEL_SPDIF |
OXYGEN_CHANNEL_MULTICH,
.function_flags = 0, .function_flags = 0,
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
......
sound/pci/oxygen/oxygen.c
浏览文件 @ f009ad9b
...@@ -303,12 +303,13 @@ static const struct oxygen_model model_generic = { ...@@ -303,12 +303,13 @@ static const struct oxygen_model model_generic = {
.update_dac_mute = update_ak4396_mute, .update_dac_mute = update_ak4396_mute,
.ac97_switch_hook = cmi9780_switch_hook, .ac97_switch_hook = cmi9780_switch_hook,
.model_data_size = sizeof(struct generic_data), .model_data_size = sizeof(struct generic_data),
.pcm_dev_cfg = PLAYBACK_0_TO_I2S |
PLAYBACK_1_TO_SPDIF |
PLAYBACK_2_TO_AC97_1 |
CAPTURE_0_FROM_I2S_1 |
CAPTURE_1_FROM_SPDIF |
CAPTURE_2_FROM_AC97_1,
.dac_channels = 8, .dac_channels = 8,
.used_channels = OXYGEN_CHANNEL_A |
OXYGEN_CHANNEL_C |
OXYGEN_CHANNEL_SPDIF |
OXYGEN_CHANNEL_MULTICH |
OXYGEN_CHANNEL_AC97,
.function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5,
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
...@@ -327,12 +328,13 @@ static const struct oxygen_model model_meridian = { ...@@ -327,12 +328,13 @@ static const struct oxygen_model model_meridian = {
.update_dac_mute = update_ak4396_mute, .update_dac_mute = update_ak4396_mute,
.ac97_switch_hook = cmi9780_switch_hook, .ac97_switch_hook = cmi9780_switch_hook,
.model_data_size = sizeof(struct generic_data), .model_data_size = sizeof(struct generic_data),
.pcm_dev_cfg = PLAYBACK_0_TO_I2S |
PLAYBACK_1_TO_SPDIF |
PLAYBACK_2_TO_AC97_1 |
CAPTURE_0_FROM_I2S_2 |
CAPTURE_1_FROM_SPDIF |
CAPTURE_2_FROM_AC97_1,
.dac_channels = 8, .dac_channels = 8,
.used_channels = OXYGEN_CHANNEL_B |
OXYGEN_CHANNEL_C |
OXYGEN_CHANNEL_SPDIF |
OXYGEN_CHANNEL_MULTICH |
OXYGEN_CHANNEL_AC97,
.function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5,
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
......
sound/pci/oxygen/oxygen.h
浏览文件 @ f009ad9b
...@@ -16,6 +16,16 @@ ...@@ -16,6 +16,16 @@
#define PCM_AC97 5 #define PCM_AC97 5
#define PCM_COUNT 6 #define PCM_COUNT 6
/* model-specific configuration of outputs/inputs */
#define PLAYBACK_0_TO_I2S 0x001
#define PLAYBACK_1_TO_SPDIF 0x004
#define PLAYBACK_2_TO_AC97_1 0x008
#define CAPTURE_0_FROM_I2S_1 0x010
#define CAPTURE_0_FROM_I2S_2 0x020
#define CAPTURE_1_FROM_SPDIF 0x080
#define CAPTURE_2_FROM_I2S_2 0x100
#define CAPTURE_2_FROM_AC97_1 0x200
enum { enum {
CONTROL_SPDIF_PCM, CONTROL_SPDIF_PCM,
CONTROL_SPDIF_INPUT_BITS, CONTROL_SPDIF_INPUT_BITS,
...@@ -91,8 +101,8 @@ struct oxygen_model { ...@@ -91,8 +101,8 @@ struct oxygen_model {
unsigned int reg, int mute); unsigned int reg, int mute);
void (*gpio_changed)(struct oxygen *chip); void (*gpio_changed)(struct oxygen *chip);
size_t model_data_size; size_t model_data_size;
unsigned int pcm_dev_cfg;
u8 dac_channels; u8 dac_channels;
u8 used_channels;
u8 function_flags; u8 function_flags;
u16 dac_i2s_format; u16 dac_i2s_format;
u16 adc_i2s_format; u16 adc_i2s_format;
......
sound/pci/oxygen/oxygen_mixer.c
浏览文件 @ f009ad9b
...@@ -737,90 +737,111 @@ static const struct snd_kcontrol_new controls[] = { ...@@ -737,90 +737,111 @@ static const struct snd_kcontrol_new controls[] = {
}, },
}; };
static const struct snd_kcontrol_new monitor_a_controls[] = { static const struct {
unsigned int pcm_dev;
struct snd_kcontrol_new controls[2];
} monitor_controls[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .pcm_dev = CAPTURE_0_FROM_I2S_1,
.name = "Analog Input Monitor Switch", .controls = {
.info = snd_ctl_boolean_mono_info, {
.get = monitor_get, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.put = monitor_put, .name = "Analog Input Monitor Switch",
.private_value = OXYGEN_ADC_MONITOR_A, .info = snd_ctl_boolean_mono_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_A,
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.info = monitor_volume_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_A_HALF_VOL
| (1 << 8),
.tlv = { .p = monitor_db_scale, },
},
},
}, },
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .pcm_dev = CAPTURE_0_FROM_I2S_2,
.name = "Analog Input Monitor Volume", .controls = {
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | {
SNDRV_CTL_ELEM_ACCESS_TLV_READ, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.info = monitor_volume_info, .name = "Analog Input Monitor Switch",
.get = monitor_get, .info = snd_ctl_boolean_mono_info,
.put = monitor_put, .get = monitor_get,
.private_value = OXYGEN_ADC_MONITOR_A_HALF_VOL | (1 << 8), .put = monitor_put,
.tlv = { .p = monitor_db_scale, }, .private_value = OXYGEN_ADC_MONITOR_B,
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.info = monitor_volume_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_B_HALF_VOL
| (1 << 8),
.tlv = { .p = monitor_db_scale, },
},
},
}, },
};
static const struct snd_kcontrol_new monitor_b_controls[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .pcm_dev = CAPTURE_2_FROM_I2S_2,
.name = "Analog Input Monitor Switch", .controls = {
.info = snd_ctl_boolean_mono_info, {
.get = monitor_get, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.put = monitor_put, .name = "Analog Input Monitor Switch",
.private_value = OXYGEN_ADC_MONITOR_B, .index = 1,
.info = snd_ctl_boolean_mono_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_B,
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Volume",
.index = 1,
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.info = monitor_volume_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_B_HALF_VOL
| (1 << 8),
.tlv = { .p = monitor_db_scale, },
},
},
}, },
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .pcm_dev = CAPTURE_1_FROM_SPDIF,
.name = "Analog Input Monitor Volume", .controls = {
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | {
SNDRV_CTL_ELEM_ACCESS_TLV_READ, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.info = monitor_volume_info, .name = "Digital Input Monitor Switch",
.get = monitor_get, .info = snd_ctl_boolean_mono_info,
.put = monitor_put, .get = monitor_get,
.private_value = OXYGEN_ADC_MONITOR_B_HALF_VOL | (1 << 8), .put = monitor_put,
.tlv = { .p = monitor_db_scale, }, .private_value = OXYGEN_ADC_MONITOR_C,
}, },
}; {
static const struct snd_kcontrol_new monitor_2nd_b_controls[] = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
{ .name = "Digital Input Monitor Volume",
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
.name = "Analog Input Monitor Switch", SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.index = 1, .info = monitor_volume_info,
.info = snd_ctl_boolean_mono_info, .get = monitor_get,
.get = monitor_get, .put = monitor_put,
.put = monitor_put, .private_value = OXYGEN_ADC_MONITOR_C_HALF_VOL
.private_value = OXYGEN_ADC_MONITOR_B, | (1 << 8),
}, .tlv = { .p = monitor_db_scale, },
{ },
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, },
.name = "Analog Input Monitor Volume",
.index = 1,
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.info = monitor_volume_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_B_HALF_VOL | (1 << 8),
.tlv = { .p = monitor_db_scale, },
},
};
static const struct snd_kcontrol_new monitor_c_controls[] = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Digital Input Monitor Switch",
.info = snd_ctl_boolean_mono_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_C,
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Digital Input Monitor Volume",
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ,
.info = monitor_volume_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_C_HALF_VOL | (1 << 8),
.tlv = { .p = monitor_db_scale, },
}, },
}; };
...@@ -905,32 +926,17 @@ static int add_controls(struct oxygen *chip, ...@@ -905,32 +926,17 @@ static int add_controls(struct oxygen *chip,
int oxygen_mixer_init(struct oxygen *chip) int oxygen_mixer_init(struct oxygen *chip)
{ {
unsigned int i;
int err; int err;
err = add_controls(chip, controls, ARRAY_SIZE(controls)); err = add_controls(chip, controls, ARRAY_SIZE(controls));
if (err < 0) if (err < 0)
return err; return err;
if (chip->model->used_channels & OXYGEN_CHANNEL_A) { for (i = 0; i < ARRAY_SIZE(monitor_controls); ++i) {
err = add_controls(chip, monitor_a_controls, if (!(chip->model->pcm_dev_cfg & monitor_controls[i].pcm_dev))
ARRAY_SIZE(monitor_a_controls)); continue;
if (err < 0) err = add_controls(chip, monitor_controls[i].controls,
return err; ARRAY_SIZE(monitor_controls[i].controls));
} else if (chip->model->used_channels & OXYGEN_CHANNEL_B) {
err = add_controls(chip, monitor_b_controls,
ARRAY_SIZE(monitor_b_controls));
if (err < 0)
return err;
}
if ((chip->model->used_channels & (OXYGEN_CHANNEL_A | OXYGEN_CHANNEL_B))
== (OXYGEN_CHANNEL_A | OXYGEN_CHANNEL_B)) {
err = add_controls(chip, monitor_2nd_b_controls,
ARRAY_SIZE(monitor_2nd_b_controls));
if (err < 0)
return err;
}
if (chip->model->used_channels & OXYGEN_CHANNEL_C) {
err = add_controls(chip, monitor_c_controls,
ARRAY_SIZE(monitor_c_controls));
if (err < 0) if (err < 0)
return err; return err;
} }
......
sound/pci/oxygen/oxygen_pcm.c
浏览文件 @ f009ad9b
...@@ -119,7 +119,7 @@ static int oxygen_open(struct snd_pcm_substream *substream, ...@@ -119,7 +119,7 @@ static int oxygen_open(struct snd_pcm_substream *substream,
runtime->private_data = (void *)(uintptr_t)channel; runtime->private_data = (void *)(uintptr_t)channel;
if (channel == PCM_B && chip->has_ac97_1 && if (channel == PCM_B && chip->has_ac97_1 &&
(chip->model->used_channels & OXYGEN_CHANNEL_AC97)) (chip->model->pcm_dev_cfg & CAPTURE_2_FROM_AC97_1))
runtime->hw = oxygen_ac97_hardware; runtime->hw = oxygen_ac97_hardware;
else else
runtime->hw = *oxygen_hardware[channel]; runtime->hw = *oxygen_hardware[channel];
...@@ -365,7 +365,7 @@ static int oxygen_rec_b_hw_params(struct snd_pcm_substream *substream, ...@@ -365,7 +365,7 @@ static int oxygen_rec_b_hw_params(struct snd_pcm_substream *substream,
return err; return err;
is_ac97 = chip->has_ac97_1 && is_ac97 = chip->has_ac97_1 &&
(chip->model->used_channels & OXYGEN_CHANNEL_AC97); (chip->model->pcm_dev_cfg & CAPTURE_2_FROM_AC97_1);
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
oxygen_write8_masked(chip, OXYGEN_REC_FORMAT, oxygen_write8_masked(chip, OXYGEN_REC_FORMAT,
...@@ -640,34 +640,39 @@ int oxygen_pcm_init(struct oxygen *chip) ...@@ -640,34 +640,39 @@ int oxygen_pcm_init(struct oxygen *chip)
int outs, ins; int outs, ins;
int err; int err;
outs = 1; /* OXYGEN_CHANNEL_MULTICH is always used */ outs = !!(chip->model->pcm_dev_cfg & PLAYBACK_0_TO_I2S);
ins = !!(chip->model->used_channels & (OXYGEN_CHANNEL_A | ins = !!(chip->model->pcm_dev_cfg & (CAPTURE_0_FROM_I2S_1 |
OXYGEN_CHANNEL_B)); CAPTURE_0_FROM_I2S_2));
err = snd_pcm_new(chip->card, "Analog", 0, outs, ins, &pcm); if (outs | ins) {
if (err < 0) err = snd_pcm_new(chip->card, "Analog", 0, outs, ins, &pcm);
return err; if (err < 0)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &oxygen_multich_ops); return err;
if (chip->model->used_channels & OXYGEN_CHANNEL_A) if (outs)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
&oxygen_rec_a_ops); &oxygen_multich_ops);
else if (chip->model->used_channels & OXYGEN_CHANNEL_B) if (chip->model->pcm_dev_cfg & CAPTURE_0_FROM_I2S_1)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
&oxygen_rec_b_ops); &oxygen_rec_a_ops);
pcm->private_data = chip; else if (chip->model->pcm_dev_cfg & CAPTURE_0_FROM_I2S_2)
pcm->private_free = oxygen_pcm_free; snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
strcpy(pcm->name, "Analog"); &oxygen_rec_b_ops);
snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream, pcm->private_data = chip;
SNDRV_DMA_TYPE_DEV, pcm->private_free = oxygen_pcm_free;
snd_dma_pci_data(chip->pci), strcpy(pcm->name, "Analog");
512 * 1024, 2048 * 1024); if (outs)
if (ins) snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream, SNDRV_DMA_TYPE_DEV,
SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
snd_dma_pci_data(chip->pci), 512 * 1024, 2048 * 1024);
128 * 1024, 256 * 1024); if (ins)
snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream,
outs = !!(chip->model->used_channels & OXYGEN_CHANNEL_SPDIF); SNDRV_DMA_TYPE_DEV,
ins = !!(chip->model->used_channels & OXYGEN_CHANNEL_C); snd_dma_pci_data(chip->pci),
128 * 1024, 256 * 1024);
}
outs = !!(chip->model->pcm_dev_cfg & PLAYBACK_1_TO_SPDIF);
ins = !!(chip->model->pcm_dev_cfg & CAPTURE_1_FROM_SPDIF);
if (outs | ins) { if (outs | ins) {
err = snd_pcm_new(chip->card, "Digital", 1, outs, ins, &pcm); err = snd_pcm_new(chip->card, "Digital", 1, outs, ins, &pcm);
if (err < 0) if (err < 0)
...@@ -686,12 +691,13 @@ int oxygen_pcm_init(struct oxygen *chip) ...@@ -686,12 +691,13 @@ int oxygen_pcm_init(struct oxygen *chip)
128 * 1024, 256 * 1024); 128 * 1024, 256 * 1024);
} }
outs = chip->has_ac97_1 && if (chip->has_ac97_1) {
(chip->model->used_channels & OXYGEN_CHANNEL_AC97); outs = !!(chip->model->pcm_dev_cfg & PLAYBACK_2_TO_AC97_1);
ins = outs || ins = !!(chip->model->pcm_dev_cfg & CAPTURE_2_FROM_AC97_1);
(chip->model->used_channels & (OXYGEN_CHANNEL_A | } else {
OXYGEN_CHANNEL_B)) outs = 0;
== (OXYGEN_CHANNEL_A | OXYGEN_CHANNEL_B); ins = !!(chip->model->pcm_dev_cfg & CAPTURE_2_FROM_I2S_2);
}
if (outs | ins) { if (outs | ins) {
err = snd_pcm_new(chip->card, outs ? "AC97" : "Analog2", err = snd_pcm_new(chip->card, outs ? "AC97" : "Analog2",
2, outs, ins, &pcm); 2, outs, ins, &pcm);
......
sound/pci/oxygen/virtuoso.c
浏览文件 @ f009ad9b
...@@ -348,11 +348,11 @@ static const struct oxygen_model model_xonar = { ...@@ -348,11 +348,11 @@ static const struct oxygen_model model_xonar = {
.ac97_switch_hook = xonar_ac97_switch_hook, .ac97_switch_hook = xonar_ac97_switch_hook,
.gpio_changed = xonar_gpio_changed, .gpio_changed = xonar_gpio_changed,
.model_data_size = sizeof(struct xonar_data), .model_data_size = sizeof(struct xonar_data),
.pcm_dev_cfg = PLAYBACK_0_TO_I2S |
PLAYBACK_1_TO_SPDIF |
CAPTURE_0_FROM_I2S_2 |
CAPTURE_1_FROM_SPDIF,
.dac_channels = 8, .dac_channels = 8,
.used_channels = OXYGEN_CHANNEL_B |
OXYGEN_CHANNEL_C |
OXYGEN_CHANNEL_SPDIF |
OXYGEN_CHANNEL_MULTICH,
.function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5, .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5,
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或