d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with NetBSD:

Browse Source 
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 <Yuriy.Tsibizov@gfk.ru>
This commit is contained in:
Alexander Leidinger 2007-01-06 19:08:39 +00:00
parent f856af0466
commit cea9c751eb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/sound/usb/uaudio.c
View File

@ -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.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.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.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 <sys/param.h> #include <sys/param.h>
@ -2001,11 +2004,13 @@ uaudio_process_as(struct uaudio_softc *sc, const char *buf, int *offsp,
if (offs > size) if (offs > size)
return USBD_INVAL; return USBD_INVAL;
#ifdef UAUDIO_MULTIPLE_ENDPOINTS
if (sync && id->bNumEndpoints <= 1) { if (sync && id->bNumEndpoints <= 1) {
printf("%s: a sync-pipe endpoint but no other endpoint\n", printf("%s: a sync-pipe endpoint but no other endpoint\n",
device_get_nameunit(sc->sc_dev)); device_get_nameunit(sc->sc_dev));
return USBD_INVAL; return USBD_INVAL;
} }
#endif
if (!sync && id->bNumEndpoints > 1) { if (!sync && id->bNumEndpoints > 1) {
printf("%s: non sync-pipe endpoint but multiple endpoints\n", printf("%s: non sync-pipe endpoint but multiple endpoints\n",
device_get_nameunit(sc->sc_dev)); 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.edesc1 = epdesc1;
ai.asf1desc = asf1d; ai.asf1desc = asf1d;
ai.sc_busy = 0; ai.sc_busy = 0;
ai.ifaceh = NULL;
uaudio_add_alt(sc, &ai); uaudio_add_alt(sc, &ai);
#ifdef USB_DEBUG #ifdef USB_DEBUG
if (ai.attributes & UA_SED_FREQ_CONTROL) 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) { if (as->asf1desc->bSamFreqType != 1) {
err = uaudio_set_speed(sc, endpt, ch->sample_rate); err = uaudio_set_speed(sc, endpt, ch->sample_rate);
if (err) if (err) {
DPRINTF(("uaudio_chan_open: set_speed failed err=%s\n", DPRINTF(("uaudio_chan_open: set_speed failed err=%s\n",
usbd_errstr(err))); usbd_errstr(err)));
}
} }
ch->pipe = 0; ch->pipe = 0;