diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2010-03-04 13:46:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-05 02:18:32 -0500 |
| commit | 015eb0b08150c6fef843efe22609589ead3d4fb8 (patch) | |
| tree | 3ffcb8b5be54355761d94001a8c5415c965daccd /sound/usb/quirks-table.h | |
| parent | e11b4e0e4f5ab40ec342dc07b7201c09a45f9574 (diff) | |
ALSA: usb-audio: use a format bitmask per alternate setting
In preparation for USB audio 2.0 support, change the audioformat
structure so that it uses a bitmask to specify possible formats.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/quirks-table.h')
| -rw-r--r-- | sound/usb/quirks-table.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 2b426c1fd0e8..6e8651d2ee9d 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h | |||
| @@ -279,7 +279,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 279 | .ifnum = 0, | 279 | .ifnum = 0, |
| 280 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, | 280 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, |
| 281 | .data = & (const struct audioformat) { | 281 | .data = & (const struct audioformat) { |
| 282 | .format = SNDRV_PCM_FORMAT_S16_LE, | 282 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
| 283 | .channels = 4, | 283 | .channels = 4, |
| 284 | .iface = 0, | 284 | .iface = 0, |
| 285 | .altsetting = 1, | 285 | .altsetting = 1, |
| @@ -296,7 +296,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 296 | .ifnum = 1, | 296 | .ifnum = 1, |
| 297 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, | 297 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, |
| 298 | .data = & (const struct audioformat) { | 298 | .data = & (const struct audioformat) { |
| 299 | .format = SNDRV_PCM_FORMAT_S16_LE, | 299 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
| 300 | .channels = 2, | 300 | .channels = 2, |
| 301 | .iface = 1, | 301 | .iface = 1, |
| 302 | .altsetting = 1, | 302 | .altsetting = 1, |
| @@ -580,7 +580,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 580 | .ifnum = 0, | 580 | .ifnum = 0, |
| 581 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, | 581 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, |
| 582 | .data = & (const struct audioformat) { | 582 | .data = & (const struct audioformat) { |
| 583 | .format = SNDRV_PCM_FORMAT_S24_3LE, | 583 | .formats = SNDRV_PCM_FMTBIT_S24_3LE, |
| 584 | .channels = 2, | 584 | .channels = 2, |
| 585 | .iface = 0, | 585 | .iface = 0, |
| 586 | .altsetting = 1, | 586 | .altsetting = 1, |
| @@ -597,7 +597,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 597 | .ifnum = 1, | 597 | .ifnum = 1, |
| 598 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, | 598 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, |
| 599 | .data = & (const struct audioformat) { | 599 | .data = & (const struct audioformat) { |
| 600 | .format = SNDRV_PCM_FORMAT_S24_3LE, | 600 | .formats = SNDRV_PCM_FMTBIT_S24_3LE, |
| 601 | .channels = 2, | 601 | .channels = 2, |
| 602 | .iface = 1, | 602 | .iface = 1, |
| 603 | .altsetting = 1, | 603 | .altsetting = 1, |
| @@ -793,7 +793,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 793 | .ifnum = 1, | 793 | .ifnum = 1, |
| 794 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, | 794 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, |
| 795 | .data = & (const struct audioformat) { | 795 | .data = & (const struct audioformat) { |
| 796 | .format = SNDRV_PCM_FORMAT_S24_3LE, | 796 | .formats = SNDRV_PCM_FMTBIT_S24_3LE, |
| 797 | .channels = 2, | 797 | .channels = 2, |
| 798 | .iface = 1, | 798 | .iface = 1, |
| 799 | .altsetting = 1, | 799 | .altsetting = 1, |
| @@ -810,7 +810,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 810 | .ifnum = 2, | 810 | .ifnum = 2, |
| 811 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, | 811 | .type = QUIRK_AUDIO_FIXED_ENDPOINT, |
| 812 | .data = & (const struct audioformat) { | 812 | .data = & (const struct audioformat) { |
| 813 | .format = SNDRV_PCM_FORMAT_S24_3LE, | 813 | .formats = SNDRV_PCM_FMTBIT_S24_3LE, |
| 814 | .channels = 2, | 814 | .channels = 2, |
| 815 | .iface = 2, | 815 | .iface = 2, |
| 816 | .altsetting = 1, | 816 | .altsetting = 1, |