diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-21 08:51:55 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:30:08 +0100 |
| commit | 7ef37cd95494a0a9be425c4d75f21ee8d2807b5a (patch) | |
| tree | 8c1ed7c6fab7c787ec98815be44417256a09d81e /sound/pci/oxygen/oxygen.h | |
| parent | 3b94253bc9c950d2038a2db4f9c804b50f82001a (diff) | |
| download | blackbird-op-linux-7ef37cd95494a0a9be425c4d75f21ee8d2807b5a.tar.gz blackbird-op-linux-7ef37cd95494a0a9be425c4d75f21ee8d2807b5a.zip | |
[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.h | 3 |
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 { struct snd_rawmidi *midi; int irq; const struct oxygen_model *model; + void *model_data; unsigned int interrupt_mask; u8 dac_volume[8]; u8 dac_mute; @@ -56,7 +57,6 @@ struct oxygen { u8 pcm_running; u8 dac_routing; u8 spdif_playback_enable; - u8 ak4396_ctl2; u8 revision; u8 has_ac97_0; u8 has_ac97_1; @@ -84,6 +84,7 @@ struct oxygen_model { struct snd_pcm_hw_params *params); void (*update_dac_volume)(struct oxygen *chip); void (*update_dac_mute)(struct oxygen *chip); + size_t model_data_size; u8 used_channels; u8 function_flags; u16 dac_i2s_format; |
