X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fsound%2Fymfpci.h;h=203d2b45b7889d2b55811150a09dd39250a2ffee;hb=7616ee95f27a04fd5a6434e9ef4a82cec4b2807c;hp=f3514ee96bd9753f64782d89fe978e16c8bd8261;hpb=274ec7a8c07036bd02e8f2301456e443ef30b8a8;p=linux-2.6

diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
index f3514ee96b..203d2b45b7 100644
--- a/include/sound/ymfpci.h
+++ b/include/sound/ymfpci.h
@@ -270,6 +270,7 @@ struct snd_ymfpci_pcm {
 	struct snd_pcm_substream *substream;
 	struct snd_ymfpci_voice *voices[2];	/* playback only */
 	unsigned int running: 1,
+		     use_441_slot: 1,
 	             output_front: 1,
 	             output_rear: 1,
 	             swap_rear: 1;
@@ -324,6 +325,7 @@ struct snd_ymfpci {
 
 	u32 active_bank;
 	struct snd_ymfpci_voice voices[64];
+	int src441_used;
 
 	struct snd_ac97_bus *ac97_bus;
 	struct snd_ac97 *ac97;
@@ -346,7 +348,7 @@ struct snd_ymfpci {
 	int mode_dup4ch;
 	int rear_opened;
 	int spdif_opened;
-	struct {
+	struct snd_ymfpci_pcm_mixer {
 		u16 left;
 		u16 right;
 		struct snd_kcontrol *ctl;
@@ -357,6 +359,8 @@ struct snd_ymfpci {
 	wait_queue_head_t interrupt_sleep;
 	atomic_t interrupt_sleep_count;
 	struct snd_info_entry *proc_entry;
+	const struct firmware *dsp_microcode;
+	const struct firmware *controller_microcode;
 
 #ifdef CONFIG_PM
 	u32 *saved_regs;