Re: ALSA update

[Jaroslav Kysela]

On Wed, 18 Dec 2002, Greg KH wrote:

> > ChangeSet 1.885.1.5, 2002/12/18 10:13:22+01:00, [e-mail]
> 
> <snip>
> 
> > diff -Nru a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
> > --- a/sound/usb/usbaudio.c	Wed Dec 18 10:07:34 2002
> > +++ b/sound/usb/usbaudio.c	Wed Dec 18 10:07:34 2002
> > @@ -526,7 +526,11 @@
> >  /*
> >   * complete callback from data urb
> >   */
> > +#ifndef OLD_USB
> >  static void snd_complete_urb(struct urb *urb, struct pt_regs *regs)
> > +#else
> > +static void snd_complete_urb(struct urb *urb)
> > +#endif
> >  {
> >  	snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
> >  	snd_usb_substream_t *subs = ctx->subs;
> > @@ -551,7 +555,11 @@
> >  /*
> >   * complete callback from sync urb
> >   */
> > +#ifndef OLD_USB
> >  static void snd_complete_sync_urb(struct urb *urb, struct pt_regs *regs)
> > +#else
> > +static void snd_complete_sync_urb(struct urb *urb)
> > +#endif
> >  {
> >  	snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
> >  	snd_usb_substream_t *subs = ctx->subs;
> > @@ -583,6 +591,9 @@
> 
> Ick, you're kidding me, right?  Why do this?  Are you trying to keep a
> common code base with 2.4 and 2.5 USB drivers?  If so, I don't recommend
> it, as the code will be sprinkled with these ifdef's...

Not much. We have 9 #ifdef's and all trying to resolve the conflicts with 
new function prototypes which is difficult to replace with defines or 
inline functions. Perhaps, you'll have an idea to solve this problem.

For us, it's very important to have only one code base for all kernels, 
but on the other hand, we're trying to leave the 2.2/2.4 kernel code 
specific parts separate in our CVS repository if possible.

						Jaroslav

-----
Jaroslav Kysela <[e-mail]>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs