aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen.h
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-01-21 02:51:55 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:30:08 -0500
commit7ef37cd95494a0a9be425c4d75f21ee8d2807b5a (patch)
tree8c1ed7c6fab7c787ec98815be44417256a09d81e /sound/pci/oxygen/oxygen.h
parent3b94253bc9c950d2038a2db4f9c804b50f82001a (diff)
[ALSA] oxygen: move model-specific data out of common header
Instead of having model-specific fields in the common struct oxygen, put them into a private structure that is allocated together with the card structure. 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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index 4f4a56a95ca2..4894dbd28126 100644
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -49,6 +49,7 @@ struct oxygen {
49 struct snd_rawmidi *midi; 49 struct snd_rawmidi *midi;
50 int irq; 50 int irq;
51 const struct oxygen_model *model; 51 const struct oxygen_model *model;
52 void *model_data;
52 unsigned int interrupt_mask; 53 unsigned int interrupt_mask;
53 u8 dac_volume[8]; 54 u8 dac_volume[8];
54 u8 dac_mute; 55 u8 dac_mute;
@@ -56,7 +57,6 @@ struct oxygen {
56 u8 pcm_running; 57 u8 pcm_running;
57 u8 dac_routing; 58 u8 dac_routing;
58 u8 spdif_playback_enable; 59 u8 spdif_playback_enable;
59 u8 ak4396_ctl2;
60 u8 revision; 60 u8 revision;
61 u8 has_ac97_0; 61 u8 has_ac97_0;
62 u8 has_ac97_1; 62 u8 has_ac97_1;
@@ -84,6 +84,7 @@ struct oxygen_model {
84 struct snd_pcm_hw_params *params); 84 struct snd_pcm_hw_params *params);
85 void (*update_dac_volume)(struct oxygen *chip); 85 void (*update_dac_volume)(struct oxygen *chip);
86 void (*update_dac_mute)(struct oxygen *chip); 86 void (*update_dac_mute)(struct oxygen *chip);
87 size_t model_data_size;
87 u8 used_channels; 88 u8 used_channels;
88 u8 function_flags; 89 u8 function_flags;
89 u16 dac_i2s_format; 90 u16 dac_i2s_format;