---

yaml --- r: 47093 b: refs/heads/master c: 59540fe h: refs/heads/master i: 47091: 1833be1 v: v3
git-mirror · Feb 9, 2007 · 8d8e212 · 8d8e212
1 parent 3e8aeff
commit 8d8e212
Show file tree

Hide file tree

Showing 5 changed files with 2,764 additions and 769 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de66d53e46f39de6ea3261609fdb92900bb34a42
+refs/heads/master: 59540fe85924ecb7b9760ab422cffaea0c3ce43a
diff --git a/trunk/include/sound/snd_wavefront.h b/trunk/include/sound/snd_wavefront.h
@@ -85,6 +85,7 @@ struct _snd_wavefront {
 	char hw_version[2];                /* major = [0], minor = [1] */
 	char israw;                        /* needs Motorola microcode */
 	char has_fx;                       /* has FX processor (Tropez+) */
+	char fx_initialized;               /* FX's register pages initialized */
 	char prog_status[WF_MAX_PROGRAM];  /* WF_SLOT_* */
 	char patch_status[WF_MAX_PATCH];   /* WF_SLOT_* */
 	char sample_status[WF_MAX_SAMPLE]; /* WF_ST_* | WF_SLOT_* */
@@ -94,6 +95,7 @@ struct _snd_wavefront {
 	spinlock_t irq_lock;
 	wait_queue_head_t interrupt_sleeper; 
 	snd_wavefront_midi_t midi;         /* ICS2115 MIDI interface */
+	struct snd_card *card;
 };
 
 struct _snd_wavefront_card {

diff --git a/trunk/sound/isa/wavefront/wavefront.c b/trunk/sound/isa/wavefront/wavefront.c
@@ -402,6 +402,7 @@ static struct snd_card *snd_wavefront_card_new(int dev)
 	init_waitqueue_head(&acard->wavefront.interrupt_sleeper);
 	spin_lock_init(&acard->wavefront.midi.open);
 	spin_lock_init(&acard->wavefront.midi.virtual);
+	acard->wavefront.card = card;
 	card->private_free = snd_wavefront_free;
 
 	return card;