projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[firefly-linux-kernel-4.4.55.git]
/
include
/
sound
/
ymfpci.h
diff --git
a/include/sound/ymfpci.h
b/include/sound/ymfpci.h
index f3514ee96bd9753f64782d89fe978e16c8bd8261..203d2b45b7889d2b55811150a09dd39250a2ffee 100644
(file)
--- 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,
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;
@@
-324,6
+325,7
@@
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_ac97_bus *ac97_bus;
struct snd_ac97 *ac97;
@@
-346,7
+348,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
+359,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;