Skip to content

Commit

Permalink
[ALSA] oxygen: change model-specific PCM device configuration
Browse files Browse the repository at this point in the history 
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: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Clemens Ladisch authored and Takashi Iwai committed Apr 24, 2008
1 parent fa5d810 commit f009ad9
Show file tree
Hide file tree
Showing 6 changed files with 176 additions and 152 deletions.
6 changes: 3 additions & 3 deletions sound/pci/oxygen/hifier.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,10 @@ static const struct oxygen_model model_hifier = {
.update_dac_volume = update_ak4396_volume,
.update_dac_mute = update_ak4396_mute,
.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,
.used_channels = OXYGEN_CHANNEL_A |
OXYGEN_CHANNEL_SPDIF |
OXYGEN_CHANNEL_MULTICH,
.function_flags = 0,
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
Expand Down
22 changes: 12 additions & 10 deletions sound/pci/oxygen/oxygen.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,13 @@ static const struct oxygen_model model_generic = {
.update_dac_mute = update_ak4396_mute,
.ac97_switch_hook = cmi9780_switch_hook,
.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,
.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,
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
Expand All @@ -327,12 +328,13 @@ static const struct oxygen_model model_meridian = {
.update_dac_mute = update_ak4396_mute,
.ac97_switch_hook = cmi9780_switch_hook,
.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,
.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,
.dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
.adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
Expand Down
12 changes: 11 additions & 1 deletion sound/pci/oxygen/oxygen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
#define PCM_AC97 5
#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 {
CONTROL_SPDIF_PCM,
CONTROL_SPDIF_INPUT_BITS,
Expand Down Expand Up @@ -91,8 +101,8 @@ struct oxygen_model {
unsigned int reg, int mute);
void (*gpio_changed)(struct oxygen *chip);
size_t model_data_size;
unsigned int pcm_dev_cfg;
u8 dac_channels;
u8 used_channels;
u8 function_flags;
u16 dac_i2s_format;
u16 adc_i2s_format;
Expand Down
202 changes: 104 additions & 98 deletions sound/pci/oxygen/oxygen_mixer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
.name = "Analog Input Monitor Switch",
.info = snd_ctl_boolean_mono_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_A,
.pcm_dev = CAPTURE_0_FROM_I2S_1,
.controls = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Switch",
.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,
.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, },
.pcm_dev = CAPTURE_0_FROM_I2S_2,
.controls = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Switch",
.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",
.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,
.name = "Analog Input Monitor Switch",
.info = snd_ctl_boolean_mono_info,
.get = monitor_get,
.put = monitor_put,
.private_value = OXYGEN_ADC_MONITOR_B,
.pcm_dev = CAPTURE_2_FROM_I2S_2,
.controls = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Switch",
.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,
.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_2nd_b_controls[] = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog Input Monitor Switch",
.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, },
},
};
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, },
.pcm_dev = CAPTURE_1_FROM_SPDIF,
.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, },
},
},
},
};

Expand Down Expand Up @@ -905,32 +926,17 @@ static int add_controls(struct oxygen *chip,

int oxygen_mixer_init(struct oxygen *chip)
{
unsigned int i;
int err;

err = add_controls(chip, controls, ARRAY_SIZE(controls));
if (err < 0)
return err;
if (chip->model->used_channels & OXYGEN_CHANNEL_A) {
err = add_controls(chip, monitor_a_controls,
ARRAY_SIZE(monitor_a_controls));
if (err < 0)
return err;
} 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));
for (i = 0; i < ARRAY_SIZE(monitor_controls); ++i) {
if (!(chip->model->pcm_dev_cfg & monitor_controls[i].pcm_dev))
continue;
err = add_controls(chip, monitor_controls[i].controls,
ARRAY_SIZE(monitor_controls[i].controls));
if (err < 0)
return err;
}
Expand Down
Loading

0 comments on commit f009ad9

Please sign in to comment.