X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=include%2Fsound%2Fymfpci.h;h=05ead66984347be76872c0bf0e5da507cc53b760;hb=6e595fc8fa4ed62813703cfe90f80e31a455d039;hp=ec790a9c496f81b226f83360aa3fdca58970eefc;hpb=208a1b4cb5ad97510aa9cbe51d09e55656691cb4;p=linux-2.6-omap-h63xx.git

diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
index ec790a9c496..05ead669843 100644
--- a/include/sound/ymfpci.h
+++ b/include/sound/ymfpci.h
@@ -2,7 +2,7 @@
 #define __SOUND_YMFPCI_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Definitions for Yahama YMF724/740/744/754 chips
  *
  *
@@ -269,9 +269,11 @@ struct snd_ymfpci_pcm {
 	enum snd_ymfpci_pcm_type type;
 	struct snd_pcm_substream *substream;
 	struct snd_ymfpci_voice *voices[2];	/* playback only */
-	unsigned int running: 1;
-	unsigned int output_front: 1;
-	unsigned int output_rear: 1;
+	unsigned int running: 1,
+		     use_441_slot: 1,
+	             output_front: 1,
+	             output_rear: 1,
+	             swap_rear: 1;
 	unsigned int update_pcm_vol;
 	u32 period_size;		/* cached from runtime->period_size */
 	u32 buffer_size;		/* cached from runtime->buffer_size */
@@ -285,7 +287,7 @@ struct snd_ymfpci {
 	int irq;
 
 	unsigned int device_id;	/* PCI device ID */
-	unsigned int rev;	/* PCI revision */
+	unsigned char rev;	/* PCI revision */
 	unsigned long reg_area_phys;
 	void __iomem *reg_area_virt;
 	struct resource *res_reg_area;
@@ -323,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;
@@ -345,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;
@@ -356,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;
@@ -369,6 +374,9 @@ int snd_ymfpci_create(struct snd_card *card,
 		      struct snd_ymfpci ** rcodec);
 void snd_ymfpci_free_gameport(struct snd_ymfpci *chip);
 
+int snd_ymfpci_suspend(struct pci_dev *pci, pm_message_t state);
+int snd_ymfpci_resume(struct pci_dev *pci);
+
 int snd_ymfpci_pcm(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);
 int snd_ymfpci_pcm2(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);
 int snd_ymfpci_pcm_spdif(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);