Author: thompsa
Date: Thu Jun 4 21:59:28 2009
New Revision: 193465
URL: http://svn.freebsd.org/changeset/base/193465
Log:
revert r162516. We only support 1 or 2 channels per stream
which reflects mono and stereo.
Submitted by: Hans Petter Selasky
Modified:
head/sys/dev/sound/usb/uaudio.c
Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c Thu Jun 4 21:55:07 2009
(r193464)
+++ head/sys/dev/sound/usb/uaudio.c Thu Jun 4 21:59:28 2009
(r193465)
@@ -97,7 +97,7 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, def
#define MAKE_WORD(h,l) (((h) << 8) | (l))
#define BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1)
-#define UAUDIO_MAX_CHAN(x) (((x) < 2) ? (x) : 2) /* XXX fixme
later */
+#define UAUDIO_MAX_CHAN(x) (x)
struct uaudio_mixer_node {
int32_t minval;
@@ -940,6 +940,8 @@ uaudio_chan_fill_info_sub(struct uaudio_
bChannels = UAUDIO_MAX_CHAN(asf1d->bNrChannels);
bBitResolution = asf1d->bBitResolution;
+ DPRINTFN(9, "bChannels=%u\n", bChannels);
+
if (asf1d->bSamFreqType == 0) {
DPRINTFN(16, "Sample rate: %d-%dHz\n",
UA_SAMP_LO(asf1d), UA_SAMP_HI(asf1d));
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
