PERFORCE change 163521 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=163521

Change 163521 by hselasky at hselasky_laptop001 on 2009/06/04 20:29:57

	
	USB audio:
		 - revert r162516. We only support 1 or 2 channels per stream
		   which reflects mono and stereo.

Affected files ...

.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#46 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#46 (text+ko) ====

@@ -97,7 +97,7 @@
 
 #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 @@
 			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));