aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-04-16 03:13:36 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:36 -0400
commit193e813814775b1b1574515fc6f11e61b29a54f7 (patch)
tree4c910d3dd308aa13ddf10d8836dad3171f21ab4b /sound/pci/oxygen/oxygen.c
parent0c0e6daf14183fb1cd0dea054ecf81165abbdc83 (diff)
[ALSA] oxygen: generalize handling of DAC volume limits
Add fields for the DAC volume limits to the module structure so that model drivers do not need to install their own control info handlers. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r--sound/pci/oxygen/oxygen.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index b3b7771b54c0..718169792c3b 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -278,6 +278,8 @@ static const struct oxygen_model model_generic = {
278 CAPTURE_1_FROM_SPDIF | 278 CAPTURE_1_FROM_SPDIF |
279 CAPTURE_2_FROM_AC97_1, 279 CAPTURE_2_FROM_AC97_1,
280 .dac_channels = 8, 280 .dac_channels = 8,
281 .dac_volume_min = 0,
282 .dac_volume_max = 255,
281 .function_flags = OXYGEN_FUNCTION_SPI | 283 .function_flags = OXYGEN_FUNCTION_SPI |
282 OXYGEN_FUNCTION_ENABLE_SPI_4_5, 284 OXYGEN_FUNCTION_ENABLE_SPI_4_5,
283 .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 285 .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
@@ -303,6 +305,8 @@ static const struct oxygen_model model_meridian = {
303 CAPTURE_1_FROM_SPDIF | 305 CAPTURE_1_FROM_SPDIF |
304 CAPTURE_2_FROM_AC97_1, 306 CAPTURE_2_FROM_AC97_1,
305 .dac_channels = 8, 307 .dac_channels = 8,
308 .dac_volume_min = 0,
309 .dac_volume_max = 255,
306 .misc_flags = OXYGEN_MISC_MIDI, 310 .misc_flags = OXYGEN_MISC_MIDI,
307 .function_flags = OXYGEN_FUNCTION_SPI | 311 .function_flags = OXYGEN_FUNCTION_SPI |
308 OXYGEN_FUNCTION_ENABLE_SPI_4_5, 312 OXYGEN_FUNCTION_ENABLE_SPI_4_5,