Module Name: src
Committed By: jdc
Date: Fri May 18 07:52:55 UTC 2012
Modified Files:
src/sys/dev/usb: uaudio.c uaudioreg.h umidi.c umidi_quirks.c
Log Message:
Increase the number of frequencies in the usb_audio_streaming_type1_descriptor
to be the same number that we support elsewhere (AUFMT_MAX_FREQUENCIES).
Set frequency_type to be AUFMT_MAX_FREQUENCIES in the case where a uaudio
device reports more frequencies than we handle.
Fixes a crash in uaudio_chan_ptransfer() because we read uninitialised data
in uaudio_identify_as().
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/usb/uaudio.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/uaudioreg.h
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/umidi_quirks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.131 src/sys/dev/usb/uaudio.c:1.132
--- src/sys/dev/usb/uaudio.c:1.131 Sun Apr 22 01:31:48 2012
+++ src/sys/dev/usb/uaudio.c Fri May 18 07:52:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.131 2012/04/22 01:31:48 jakllsch Exp $ */
+/* $NetBSD: uaudio.c,v 1.132 2012/05/18 07:52:54 jdc Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.131 2012/04/22 01:31:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.132 2012/05/18 07:52:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1847,12 +1847,8 @@ uaudio_identify_as(struct uaudio_softc *
aprint_error("%s: please increase "
"AUFMT_MAX_FREQUENCIES to %d\n",
__func__, t1desc->bSamFreqType);
- break;
- }
- if (j >= 2) {
- aprint_error("%s: too much tSamFreq: "
- "%d\n",
- __func__, t1desc->bSamFreqType);
+ auf->frequency_type =
+ AUFMT_MAX_FREQUENCIES;
break;
}
auf->frequency[j] = UA_GETSAMP(t1desc, j);
Index: src/sys/dev/usb/uaudioreg.h
diff -u src/sys/dev/usb/uaudioreg.h:1.15 src/sys/dev/usb/uaudioreg.h:1.16
--- src/sys/dev/usb/uaudioreg.h:1.15 Mon Apr 28 20:23:59 2008
+++ src/sys/dev/usb/uaudioreg.h Fri May 18 07:52:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudioreg.h,v 1.15 2008/04/28 20:23:59 martin Exp $ */
+/* $NetBSD: uaudioreg.h,v 1.16 2012/05/18 07:52:54 jdc Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@ struct usb_audio_streaming_type1_descrip
uByte bBitResolution;
uByte bSamFreqType;
#define UA_SAMP_CONTNUOUS 0
- uByte tSamFreq[3*2]; /* room for low and high */
+ uByte tSamFreq[3*AUFMT_MAX_FREQUENCIES];
#define UA_GETSAMP(p, n) ((p)->tSamFreq[(n)*3+0] | ((p)->tSamFreq[(n)*3+1] << 8) | ((p)->tSamFreq[(n)*3+2] << 16))
#define UA_SAMP_LO(p) UA_GETSAMP(p, 0)
#define UA_SAMP_HI(p) UA_GETSAMP(p, 1)
Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.61 src/sys/dev/usb/umidi.c:1.62
--- src/sys/dev/usb/umidi.c:1.61 Sun Mar 11 01:06:07 2012
+++ src/sys/dev/usb/umidi.c Fri May 18 07:52:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.61 2012/03/11 01:06:07 mrg Exp $ */
+/* $NetBSD: umidi.c,v 1.62 2012/05/18 07:52:54 jdc Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.61 2012/03/11 01:06:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.62 2012/05/18 07:52:54 jdc Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/auconv.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/uaudioreg.h>
#include <dev/usb/umidireg.h>
Index: src/sys/dev/usb/umidi_quirks.c
diff -u src/sys/dev/usb/umidi_quirks.c:1.17 src/sys/dev/usb/umidi_quirks.c:1.18
--- src/sys/dev/usb/umidi_quirks.c:1.17 Sat Feb 11 05:28:30 2012
+++ src/sys/dev/usb/umidi_quirks.c Fri May 18 07:52:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.18 2012/05/18 07:52:54 jdc Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.18 2012/05/18 07:52:54 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: umidi_quirks
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/auconv.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/uaudioreg.h>
#include <dev/usb/umidireg.h>
