diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:43:00 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:43:00 +0100 |
| commit | 6bcdbd55b4c603d9741398d081133fcc50a10b6c (patch) | |
| tree | 335e8d03b134030a748439993bb24d53004032a1 /sound/pci/ca0106/ca0106.h | |
| parent | 6a8436419d1b77b24d82bd90354adc4baa393566 (diff) | |
| parent | 72077aa336d0f4c5e3c7014d7471c79bc69873bb (diff) | |
| download | blackbird-op-linux-6bcdbd55b4c603d9741398d081133fcc50a10b6c.tar.gz blackbird-op-linux-6bcdbd55b4c603d9741398d081133fcc50a10b6c.zip | |
Merge branch 'topic/ca0106-resume' into topic/ca0106
Diffstat (limited to 'sound/pci/ca0106/ca0106.h')
| -rw-r--r-- | sound/pci/ca0106/ca0106.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h index 3faccb6ecad9..a6943cb0d209 100644 --- a/sound/pci/ca0106/ca0106.h +++ b/sound/pci/ca0106/ca0106.h @@ -690,7 +690,7 @@ struct snd_ca0106 { spinlock_t emu_lock; struct snd_ac97 *ac97; - struct snd_pcm *pcm; + struct snd_pcm *pcm[4]; struct snd_ca0106_channel playback_channels[4]; struct snd_ca0106_channel capture_channels[4]; @@ -707,6 +707,11 @@ struct snd_ca0106 { struct snd_ca_midi midi2; u16 spi_dac_reg[16]; + +#ifdef CONFIG_PM +#define NUM_SAVED_VOLUMES 9 + unsigned int saved_vol[NUM_SAVED_VOLUMES]; +#endif }; int snd_ca0106_mixer(struct snd_ca0106 *emu); @@ -725,3 +730,11 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu, u32 reg, u32 value); int snd_ca0106_spi_write(struct snd_ca0106 * emu, unsigned int data); + +#ifdef CONFIG_PM +void snd_ca0106_mixer_suspend(struct snd_ca0106 *chip); +void snd_ca0106_mixer_resume(struct snd_ca0106 *chip); +#else +#define snd_ca0106_mixer_suspend(chip) do { } while (0) +#define snd_ca0106_mixer_resume(chip) do { } while (0) +#endif |
