git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: Add indirection for CODEC private data
[safe/jmp/linux-2.6]
/
include
/
sound
/
ymfpci.h
diff --git
a/include/sound/ymfpci.h
b/include/sound/ymfpci.h
index
a3c5de5
..
444cd6b
100644
(file)
--- a/
include/sound/ymfpci.h
+++ b/
include/sound/ymfpci.h
@@
-2,7
+2,7
@@
#define __SOUND_YMFPCI_H
/*
#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
*
*
* Definitions for Yahama YMF724/740/744/754 chips
*
*
@@
-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,
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;
output_front: 1,
output_rear: 1,
swap_rear: 1;
@@
-286,7
+287,7
@@
struct snd_ymfpci {
int irq;
unsigned int device_id; /* PCI device ID */
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;
unsigned long reg_area_phys;
void __iomem *reg_area_virt;
struct resource *res_reg_area;
@@
-324,11
+325,13
@@
struct snd_ymfpci {
u32 active_bank;
struct snd_ymfpci_voice voices[64];
u32 active_bank;
struct snd_ymfpci_voice voices[64];
+ int src441_used;
struct snd_ac97_bus *ac97_bus;
struct snd_ac97 *ac97;
struct snd_rawmidi *rawmidi;
struct snd_timer *timer;
struct snd_ac97_bus *ac97_bus;
struct snd_ac97 *ac97;
struct snd_rawmidi *rawmidi;
struct snd_timer *timer;
+ unsigned int timer_ticks;
struct pci_dev *pci;
struct snd_card *card;
struct pci_dev *pci;
struct snd_card *card;
@@
-346,7
+349,7
@@
struct snd_ymfpci {
int mode_dup4ch;
int rear_opened;
int spdif_opened;
int mode_dup4ch;
int rear_opened;
int spdif_opened;
- struct {
+ struct
snd_ymfpci_pcm_mixer
{
u16 left;
u16 right;
struct snd_kcontrol *ctl;
u16 left;
u16 right;
struct snd_kcontrol *ctl;
@@
-357,6
+360,8
@@
struct snd_ymfpci {
wait_queue_head_t interrupt_sleep;
atomic_t interrupt_sleep_count;
struct snd_info_entry *proc_entry;
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;
#ifdef CONFIG_PM
u32 *saved_regs;