USB fix

USB fix

[Jordi Mallach]

[-- Attachment #1.1: Type: text/plain, Size: 2441 bytes --]

Hi,

This is the last thing we think we need to tell you guys about.

We need to apply this patch to rc7 and rc8 to get usb compiled. If we
don't apply it, we get the following:

gcc-2.95 -D__KERNEL__ -DMODULE=1 -I/tmp/modules/alsa-driver/include
-I/usr/src/kernel-headers-2.4.20-k7-smp/include -O2
-mpreferred-stack-boundary=2 -march=i686 -malign-functions=4 -D__SMP__
-DCONFIG_SMP -DLINUX -Wall -Wstrict-prototypes -fomit-frame-pointer
-Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -DALSA_BUILD
-DKBUILD_BASENAME=usbmidi   -c -o usbmidi.o usbmidi.c
In file included from usbaudio.c:2:
../alsa-kernel/usb/usbaudio.c: At top level:
../alsa-kernel/usb/usbaudio.c:1619: `usb_audio_probe' undeclared here (not
in a function)
../alsa-kernel/usb/usbaudio.c:1619: initializer element is not constant
../alsa-kernel/usb/usbaudio.c:1619: (near initialization for
`usb_audio_driver.probe')
../alsa-kernel/usb/usbaudio.c:1620: `usb_audio_disconnect' undeclared here
(not in a function)
../alsa-kernel/usb/usbaudio.c:1620: initializer element is not constant
../alsa-kernel/usb/usbaudio.c:1620: (near initialization for
`usb_audio_driver.disconnect')
../alsa-kernel/usb/usbaudio.c:1622: initializer element is not constant
../alsa-kernel/usb/usbaudio.c:1622: (near initialization for
`usb_audio_driver.driver_list')
../alsa-kernel/usb/usbaudio.c:1625: initializer element is not constant
../alsa-kernel/usb/usbaudio.c:1625: (near initialization for
`usb_audio_driver')
../alsa-kernel/usb/usbaudio.c:1625: initializer element is not constant
../alsa-kernel/usb/usbaudio.c:1625: (near initialization for
`usb_audio_driver')
../alsa-kernel/usb/usbaudio.c:1625: initializer element is not constant
../alsa-kernel/usb/usbaudio.c:1625: (near initialization for
`usb_audio_driver')
../alsa-kernel/usb/usbaudio.c:2456: warning: `snd_usb_audio_probe' defined
but not used
../alsa-kernel/usb/usbaudio.c:2563: warning: `snd_usb_audio_disconnect'
defined but not used
make[2]: *** [usbaudio.o] Error 1

If we apply the attached patch, it works ok. What we wonder is if this
is something happening in Debian only, as I've seen no reports of this
on the list, which is suspicious.

Jordi
-- 
Jordi Mallach Pérez  --  Debian developer     http://www.debian.org/
jordi@sindominio.net     jordi@debian.org     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/~jordi/

[-- Attachment #1.2: 05_usbaudio_build_failure.dpatch --]
[-- Type: text/plain, Size: 1909 bytes --]

#! /bin/sh -e

# 05_usbaudio_build_failure.dpatch by Steve Kowalik
#
# DP: Fix build failure in usb/usbaudio.c.

. debian/patches/patch-opts

if [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi
case "$1" in
    -patch) patch $patch_opts < $0;;
    -unpatch) patch $patch_opts -R < $0;;
    *)
        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
        exit 1;;
esac

exit 0

--- alsa-driver/usb/usbaudio.c      28 Jan 2003 16:20:03 -0000      1.9
+++ alsa-driver/usb/usbaudio.c      2 Feb 2003 13:07:24 -0000
@@ -1,6 +1,44 @@
 #define SND_NEED_USB_WRAPPER
+#include <sound/driver.h>
+#include <linux/usb.h>
+
+#ifdef OLD_USB
+#define snd_usb_complete_callback(x) __old_ ## x
+static void __old_snd_complete_urb(struct urb *urb);
+static void __old_snd_complete_sync_urb(struct urb *urb);
+
+static void * usb_audio_probe(struct usb_device *dev, unsigned int ifnum,
+                              const struct usb_device_id *id);
+static void usb_audio_disconnect(struct usb_device *dev, void *ptr);
+#endif
+
 #include "../alsa-kernel/usb/usbaudio.c"
 
+#ifdef OLD_USB
+/*
+ * 2.4 USB kernel API
+ */
+static void *usb_audio_probe(struct usb_device *dev, unsigned int ifnum,
+                            const struct usb_device_id *id)
+{
+       return snd_usb_audio_probe(dev, usb_ifnum_to_if(dev, ifnum), id);
+}
+                                       
+static void usb_audio_disconnect(struct usb_device *dev, void *ptr)
+{
+       snd_usb_audio_disconnect(dev, ptr);
+}
+
+static void __old_snd_complete_urb(struct urb *urb)
+{
+       snd_complete_urb(urb, NULL);
+}
+
+static void __old_snd_complete_sync_urb(struct urb *urb)
+{
+       snd_complete_sync_urb(urb, NULL);
+}
+#endif
 
 /*
  * workarounds / hacks for the older kernels follow below


[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: USB fix

[Takashi Iwai]

At Mon, 10 Mar 2003 12:31:15 +0100,
Jordi Mallach wrote:
> 
> Hi,
> 
> This is the last thing we think we need to tell you guys about.
> 
> We need to apply this patch to rc7 and rc8 to get usb compiled. If we
> don't apply it, we get the following:

i thought it has been already in rc8 tarballs..?


Takashi


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf

Re: USB fix

[Jordi Mallach]

[-- Attachment #1: Type: text/plain, Size: 677 bytes --]

On Mon, Mar 10, 2003 at 03:41:12PM +0100, Takashi Iwai wrote:
> > We need to apply this patch to rc7 and rc8 to get usb compiled. If we
> > don't apply it, we get the following:
> i thought it has been already in rc8 tarballs..?

I haven't tried compiling rc8x personally, but Steve said we still need
it. In what specific tarball was this fixed? I think Steve has only
tested rc8b, we were waiting for -final before importing the new stuff.

Jordi
-- 
Jordi Mallach Pérez  --  Debian developer     http://www.debian.org/
jordi@sindominio.net     jordi@debian.org     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/~jordi/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: USB fix

[Takashi Iwai]

At Mon, 10 Mar 2003 17:47:40 +0100,
Jordi Mallach wrote:
> 
> [1  <text/plain; iso-8859-1 (quoted-printable)>]
> On Mon, Mar 10, 2003 at 03:41:12PM +0100, Takashi Iwai wrote:
> > > We need to apply this patch to rc7 and rc8 to get usb compiled. If we
> > > don't apply it, we get the following:
> > i thought it has been already in rc8 tarballs..?
> 
> I haven't tried compiling rc8x personally, but Steve said we still need
> it. In what specific tarball was this fixed? I think Steve has only
> tested rc8b, we were waiting for -final before importing the new stuff.

the stuff has been definitely in rc8 tarballs.
so i guess it's debian specific.


ciao,

Takashi


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf

Re: USB fix

[Jordi Mallach]

[-- Attachment #1: Type: text/plain, Size: 841 bytes --]

On Mon, Mar 10, 2003 at 05:54:53PM +0100, Takashi Iwai wrote:
> > > i thought it has been already in rc8 tarballs..?
> > I haven't tried compiling rc8x personally, but Steve said we still need
> > it. In what specific tarball was this fixed? I think Steve has only
> > tested rc8b, we were waiting for -final before importing the new stuff.
> the stuff has been definitely in rc8 tarballs.
> so i guess it's debian specific.

Steven just told me that rc8d seems to be ok, so problem solved.

Takeshi, any comment on the last "stacatto" bug I reported after the
big report?

Looking forward to 0.9.0!

Jordi
-- 
Jordi Mallach Pérez  --  Debian developer     http://www.debian.org/
jordi@sindominio.net     jordi@debian.org     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/~jordi/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: USB fix

[Clemens Ladisch]

Jordi Mallach wrote:
> any comment on the last "stacatto" bug I reported after the big
> report?

I couldn't reproduce it on my machine (current CVS instead of 0.9.0beta8,
2.4.18 instead of 2.4.2, Roland Sound Canvas connected with USB instead of
SB MIDI port).

I have noticed that calling SNDCTL_SEQ_RESET (as well as close()ing the
handle to /dev/music) sends "all notes off", "controller reset" and
pitch-bend messages to all channels on all ports, but that should result
in a delay of at most 40ms before the first note, and not in a timing
problem at a later note.


HTH
Clemens




-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open! 
Get cracking and register here for some mind boggling fun and 
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en