At Tue, 10 Mar 2015 21:58:48 +0900, Takashi Sakamoto wrote:
This reverts commit 8cdebf71098c07168ef6335e2f1f35d85dbe3049.
The reverted commit breaks out-stream functionality of Dice driver.
Signed-off-by: Takashi Sakamoto o-takashi@sakamocchi.jp
Applied, thanks.
Takashi
sound/firewire/dice/dice-interface.h | 18 +++++++++--------- sound/firewire/dice/dice-proc.c | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/sound/firewire/dice/dice-interface.h b/sound/firewire/dice/dice-interface.h index de7602b..27b044f 100644 --- a/sound/firewire/dice/dice-interface.h +++ b/sound/firewire/dice/dice-interface.h @@ -299,23 +299,23 @@ #define RX_ISOCHRONOUS 0x008
/*
- Index of first quadlet to be interpreted; read/write. If > 0, that many
- quadlets at the beginning of each data block will be ignored, and all the
- audio and MIDI quadlets will follow.
- */
+#define RX_SEQ_START 0x00c
+/*
- The number of audio channels; read-only. There will be one quadlet per
- channel.
*/ -#define RX_NUMBER_AUDIO 0x00c +#define RX_NUMBER_AUDIO 0x010
/*
- The number of MIDI ports, 0-8; read-only. If > 0, there will be one
- additional quadlet in each data block, following the audio quadlets.
*/ -#define RX_NUMBER_MIDI 0x010
-/*
- Index of first quadlet to be interpreted; read/write. If > 0, that many
- quadlets at the beginning of each data block will be ignored, and all the
- audio and MIDI quadlets will follow.
- */
-#define RX_SEQ_START 0x014 +#define RX_NUMBER_MIDI 0x014
/*
- Names of all audio channels; read-only. Quadlets are byte-swapped. Names
diff --git a/sound/firewire/dice/dice-proc.c b/sound/firewire/dice/dice-proc.c index ecfe20f..f5c1d1b 100644 --- a/sound/firewire/dice/dice-proc.c +++ b/sound/firewire/dice/dice-proc.c @@ -99,9 +99,9 @@ static void dice_proc_read(struct snd_info_entry *entry, } tx; struct { u32 iso;
u32 seq_start; u32 number_audio; u32 number_midi;
u32 seq_start; char names[RX_NAMES_SIZE]; u32 ac3_caps; u32 ac3_enable;@@ -204,10 +204,10 @@ static void dice_proc_read(struct snd_info_entry *entry, break; snd_iprintf(buffer, "rx %u:\n", stream); snd_iprintf(buffer, " iso channel: %d\n", (int)buf.rx.iso);
snd_iprintf(buffer, " sequence start: %u\n", buf.rx.seq_start);
snd_iprintf(buffer, " sequence start: %u\n", buf.rx.seq_start);-- 2.1.0
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel