From cea9c751ebc71a0dbb985847e2f4b8d060b18337 Mon Sep 17 00:00:00 2001 From: Alexander Leidinger Date: Sat, 6 Jan 2007 19:08:39 +0000 Subject: [PATCH] Sync with NetBSD: revision 1.98 is NOT merged, because FreeBSD does not support this syntax. revision 1.99 is NOT merged, "const poisoning" part is not applicable to FreeBSD. There is no variable shadowing, GCC can't find this one (but there are others) revision 1.100 is NOT merged, because it was null patch (no changes) revision 1.101 is NOT merged, there is no BIT() macro in FreeBSD revision 1.102 is merged revision 1.103 is partially merged. There is no ai.ifaceh in FreeBSD revision 1.104 is NOT merged revision 1.105 is merged revision 1.106 is not merged, because of rev. 1.107 revision 1.107 is a backuout of 1.106 Submitted by: Yuriy Tsibizov --- sys/dev/sound/usb/uaudio.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 29117f2d164..1ff52b96df3 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -55,6 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $"); * $NetBSD: uaudio.c,v 1.95 2005/01/16 06:02:19 dsainty Exp $ * $NetBSD: uaudio.c,v 1.96 2005/01/16 12:46:00 kent Exp $ * $NetBSD: uaudio.c,v 1.97 2005/02/24 08:19:38 martin Exp $ + * $NetBSD: uaudio.c,v 1.102 2006/04/14 17:00:55 christos Exp $ + * $NetBSD: uaudio.c,v 1.103 2006/05/11 19:09:25 mrg Exp $ + * $NetBSD: uaudio.c,v 1.105 2006/10/04 16:00:15 christos Exp $ */ #include @@ -2001,11 +2004,13 @@ uaudio_process_as(struct uaudio_softc *sc, const char *buf, int *offsp, if (offs > size) return USBD_INVAL; +#ifdef UAUDIO_MULTIPLE_ENDPOINTS if (sync && id->bNumEndpoints <= 1) { printf("%s: a sync-pipe endpoint but no other endpoint\n", device_get_nameunit(sc->sc_dev)); return USBD_INVAL; } +#endif if (!sync && id->bNumEndpoints > 1) { printf("%s: non sync-pipe endpoint but multiple endpoints\n", device_get_nameunit(sc->sc_dev)); @@ -2135,6 +2140,7 @@ uaudio_process_as(struct uaudio_softc *sc, const char *buf, int *offsp, ai.edesc1 = epdesc1; ai.asf1desc = asf1d; ai.sc_busy = 0; + ai.ifaceh = NULL; uaudio_add_alt(sc, &ai); #ifdef USB_DEBUG if (ai.attributes & UA_SED_FREQ_CONTROL) @@ -3029,9 +3035,10 @@ uaudio_chan_open(struct uaudio_softc *sc, struct chan *ch) */ if (as->asf1desc->bSamFreqType != 1) { err = uaudio_set_speed(sc, endpt, ch->sample_rate); - if (err) + if (err) { DPRINTF(("uaudio_chan_open: set_speed failed err=%s\n", usbd_errstr(err))); + } } ch->pipe = 0;