diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:23 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:23 +0100 |
| commit | c441c2971de52b7045acb708cc9959815f554f66 (patch) | |
| tree | 909be321dd72292c3fcd6479077aaa2c99ae54c4 /sound/usb/caiaq/caiaq-device.h | |
| parent | afad17c0ae21013f958c39594e8a64d120a611f8 (diff) | |
| parent | 28514fe5bbbdbc0f7c9700569378d55cafd061ea (diff) | |
Merge branch 'topic/usb-caiaq' into for-linus
Diffstat (limited to 'sound/usb/caiaq/caiaq-device.h')
| -rw-r--r-- | sound/usb/caiaq/caiaq-device.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h index ab56e738c5fc..4cce1ad7493d 100644 --- a/sound/usb/caiaq/caiaq-device.h +++ b/sound/usb/caiaq/caiaq-device.h @@ -10,8 +10,10 @@ #define USB_PID_KORECONTROLLER 0x4711 #define USB_PID_KORECONTROLLER2 0x4712 #define USB_PID_AK1 0x0815 +#define USB_PID_AUDIO4DJ 0x0839 #define USB_PID_AUDIO8DJ 0x1978 #define USB_PID_SESSIONIO 0x1915 +#define USB_PID_GUITARRIGMOBILE 0x0d8d #define EP1_BUFSIZE 64 #define CAIAQ_USB_STR_LEN 0xff @@ -87,9 +89,9 @@ struct snd_usb_caiaqdev { int audio_out_buf_pos[MAX_STREAMS]; int period_in_count[MAX_STREAMS]; int period_out_count[MAX_STREAMS]; - int input_panic, output_panic; + int input_panic, output_panic, warned; char *audio_in_buf, *audio_out_buf; - unsigned int samplerates; + unsigned int samplerates, bpp; struct snd_pcm_substream *sub_playback[MAX_STREAMS]; struct snd_pcm_substream *sub_capture[MAX_STREAMS]; |