diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-03-10 15:58:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-10 17:26:25 +0300 |
| commit | 5b1274efe2a24eb5a85a00cc48c334b1cdfc75aa (patch) | |
| tree | df94c26c208fe040fb450227b69f432bebecc671 /sound/firewire/dice/dice-interface.h | |
| parent | a1f3f1ca66bd12c339b17a0c2ef93a093f90a277 (diff) | |
| download | linux-5b1274efe2a24eb5a85a00cc48c334b1cdfc75aa.tar.xz | |
Revert "ALSA: dice: fix wrong offsets for Dice interface"
This reverts commit 8cdebf71098c07168ef6335e2f1f35d85dbe3049.
The reverted commit breaks out-stream functionality of Dice driver.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/dice/dice-interface.h')
| -rw-r--r-- | sound/firewire/dice/dice-interface.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/firewire/dice/dice-interface.h b/sound/firewire/dice/dice-interface.h index de7602bd69b5..27b044f84c81 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 |