diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-14 02:56:01 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:57 -0500 |
commit | 01a3affb2eebfd6c996c36d82bbbc6040eb3a7f1 (patch) | |
tree | a80f44ba4a5d6997d932a7d80e9b517064eb2555 /sound/pci/oxygen/oxygen.h | |
parent | 7113e95812f508bff10f95f2e52ce6ee8cda1875 (diff) |
[ALSA] oxygen: use an array of snd_kcontrol pointers
Use an array for the pointers to known controls so that it is easier to
add more.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen.h')
-rw-r--r-- | sound/pci/oxygen/oxygen.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index 248f7ed22fda..a10c37788059 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h | |||
@@ -15,6 +15,12 @@ | |||
15 | #define PCM_AC97 5 | 15 | #define PCM_AC97 5 |
16 | #define PCM_COUNT 6 | 16 | #define PCM_COUNT 6 |
17 | 17 | ||
18 | enum { | ||
19 | CONTROL_SPDIF_PCM, | ||
20 | CONTROL_SPDIF_INPUT_BITS, | ||
21 | CONTROL_COUNT | ||
22 | }; | ||
23 | |||
18 | #define OXYGEN_PCI_SUBID(sv, sd) \ | 24 | #define OXYGEN_PCI_SUBID(sv, sd) \ |
19 | .vendor = PCI_VENDOR_ID_CMEDIA, \ | 25 | .vendor = PCI_VENDOR_ID_CMEDIA, \ |
20 | .device = 0x8788, \ | 26 | .device = 0x8788, \ |
@@ -50,8 +56,7 @@ struct oxygen { | |||
50 | u32 spdif_bits; | 56 | u32 spdif_bits; |
51 | u32 spdif_pcm_bits; | 57 | u32 spdif_pcm_bits; |
52 | struct snd_pcm_substream *streams[PCM_COUNT]; | 58 | struct snd_pcm_substream *streams[PCM_COUNT]; |
53 | struct snd_kcontrol *spdif_pcm_ctl; | 59 | struct snd_kcontrol *controls[CONTROL_COUNT]; |
54 | struct snd_kcontrol *spdif_input_bits_ctl; | ||
55 | struct work_struct spdif_input_bits_work; | 60 | struct work_struct spdif_input_bits_work; |
56 | }; | 61 | }; |
57 | 62 | ||