diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-04-29 10:23:13 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-05-29 04:05:37 -0400 |
commit | 84957a8ab086377a025e0448fa716ed5983f3c3a (patch) | |
tree | 7d405711f0fd2e6eb8c305b7bddf0aaeac22f3e4 /sound/usb/usbaudio.h | |
parent | 707e60732fc25fe3760f916d083b262a86a666c0 (diff) |
[ALSA] usb-audio - move mixer data into separate struct
USB generic driver
Move all data related to audio control interfaces into a separate struct
local to usbmixer.c.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/usb/usbaudio.h')
-rw-r--r-- | sound/usb/usbaudio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 14f7cf7e363c..41d842dab3e8 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h | |||
@@ -136,7 +136,7 @@ struct snd_usb_audio { | |||
136 | struct list_head midi_list; /* list of midi interfaces */ | 136 | struct list_head midi_list; /* list of midi interfaces */ |
137 | int next_midi_device; | 137 | int next_midi_device; |
138 | 138 | ||
139 | unsigned int ignore_ctl_error; /* for mixer */ | 139 | struct list_head mixer_list; /* list of mixer interfaces */ |
140 | }; | 140 | }; |
141 | 141 | ||
142 | /* | 142 | /* |
@@ -219,6 +219,7 @@ void *snd_usb_find_csint_desc(void *descstart, int desclen, void *after, u8 dsub | |||
219 | int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, __u16 value, __u16 index, void *data, __u16 size, int timeout); | 219 | int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, __u16 value, __u16 index, void *data, __u16 size, int timeout); |
220 | 220 | ||
221 | int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif); | 221 | int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif); |
222 | void snd_usb_mixer_disconnect(struct list_head *p); | ||
222 | 223 | ||
223 | int snd_usb_create_midi_interface(snd_usb_audio_t *chip, struct usb_interface *iface, const snd_usb_audio_quirk_t *quirk); | 224 | int snd_usb_create_midi_interface(snd_usb_audio_t *chip, struct usb_interface *iface, const snd_usb_audio_quirk_t *quirk); |
224 | void snd_usbmidi_input_stop(struct list_head* p); | 225 | void snd_usbmidi_input_stop(struct list_head* p); |