diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-09 10:42:00 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-09 10:42:00 +0300 |
commit | 4aa01c408b7022c620241b373d4c3707a2ebeab6 (patch) | |
tree | 25df2a7453ec3bf7fc82f2871756b4efd6d3d283 /sound/firewire/dice/dice-interface.h | |
parent | 5371fc0ecdf55b6811ade8a198de8ace2f4e5861 (diff) | |
parent | a1f3f1ca66bd12c339b17a0c2ef93a093f90a277 (diff) | |
download | linux-4aa01c408b7022c620241b373d4c3707a2ebeab6.tar.xz |
Merge branch 'for-linus' into for-next
Merging the HD-audio fixes back to base devel branch for further
working on it.
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 27b044f84c81..de7602bd69b5 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 0x010 +#define RX_NUMBER_AUDIO 0x00c /* * 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 0x014 +#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 /* * Names of all audio channels; read-only. Quadlets are byte-swapped. Names |