At Tue, 23 Feb 2010 09:10:32 +0100, Daniel Mack wrote: > > On Tue, Feb 23, 2010 at 08:57:32AM +0100, Takashi Iwai wrote: > > At Tue, 23 Feb 2010 08:50:29 +0100, > > Clemens Ladisch wrote: > > > > > > Daniel Mack wrote: > > > > In preparation of support for v2.0 audio class, use the structs from > > > > linux/usb/audio.h and add some new ones to describe the fields that are > > > > actually parsed by the descriptor decoders. > > > > ... > > > > --- a/include/linux/usb/audio.h > > > > +++ b/include/linux/usb/audio.h > > > > @@ -81,7 +81,7 @@ > > > > > > > > /* Terminal Control Selectors */ > > > > /* 4.3.2 Class-Specific AC Interface Descriptor */ > > > > -struct uac_ac_header_descriptor { > > > > +struct uac_ac_header_descriptor_v1 { > > > > > > This header is already used by drivers in drivers/usb/gadget/. > > > > > > If there isn't too much overlap between v1 and v2 descriptors, it might > > > make sense to put them in separate headers (audio2.h) and to put the > > > parsers for v1 and v2 into separate files, too. > > > > Good point. But this can be in another patch? > > It does break compilation though, so I'll fix that up somehow before > merge. Well, I'd like to merge this stuff ASAP because the merge window is closing, and I don't want to put such a big thing after the merge window. If you are OK with merging for 2.6.35, then I'm fine to wait. If this is for 2.6.34, I can't wait long. Otherwise, it's easier to put things merged first, then refactor gradually. Takashi _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel