 @@ -1,14 +1,14 @@
-/*	$NetBSD: auconv.c,v 1.22 2009/01/03 03:43:21 yamt Exp $	*/
+/*	$NetBSD: auconv.c,v 1.23 2011/09/06 01:16:44 jmcneill Exp $	*/
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.22 2009/01/03 03:43:21 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.23 2011/09/06 01:16:44 jmcneill Exp $");
 #include <sys/types.h>
 #include <sys/audioio.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/null.h>
 #include <sys/systm.h>
 #include <dev/audio_if.h>
 #include <dev/auconv.h>
 #include <dev/mulaw.h>
 #include <machine/limits.h>
 #ifndef _KERNEL
 @@ -195,27 +195,28 @@ static const struct conv_table alaw_tabl
 	 alaw_to_linear8, linear8_to_alaw},
 	{AUDIO_ENCODING_ULINEAR_LE, 8, 8,
 	 alaw_to_linear8, linear8_to_alaw},
 	{0, 0, 0, NULL, NULL}};
 #endif
 #ifdef AUCONV_DEBUG
 static const char *encoding_dbg_names[] = {
 	"none", AudioEmulaw, AudioEalaw, "pcm16",
 	"pcm8", AudioEadpcm, AudioEslinear_le, AudioEslinear_be,
 	AudioEulinear_le, AudioEulinear_be,
 	AudioEslinear, AudioEulinear,
 	AudioEmpeg_l1_stream, AudioEmpeg_l1_packets,
 	AudioEmpeg_l1_system, AudioEmpeg_l2_stream,
-	AudioEmpeg_l2_packets, AudioEmpeg_l2_system
+	AudioEmpeg_l2_packets, AudioEmpeg_l2_system,
 	AudioEac3
 };
 #endif
 void
 stream_filter_set_fetcher(stream_filter_t *this, stream_fetcher_t *p)
+{
 	this->prev = p;
+}
 void
 stream_filter_set_inputbuffer(stream_filter_t *this, audio_stream_t *stream)
+{
 	this->src = stream;
 @@ -815,27 +816,27 @@ auconv_exact_match(const struct audio_fo
 		if (!AUFMT_IS_VALID(&formats[i]))
 			continue;
 		if ((formats[i].mode & mode) == 0)
 			continue;
 		f_enc = auconv_normalize_encoding(formats[i].encoding,
 						  formats[i].precision);
 		DPRINTF(("%s: format[%d] normalized: %s\n",
 			 __func__, i, encoding_dbg_names[f_enc]));
 		if (f_enc != enc)
 			continue;
 		/**
 		 * XXX	we need encoding-dependent check.
 		 * XXX	Is to check precision/channels meaningful for
-		 *	MPEG encodings?
+		 *	MPEG/AC3 encodings?
 		 */
 		if (formats[i].validbits != param->validbits)
 			continue;
 		if (formats[i].precision != param->precision)
 			continue;
 		if (formats[i].channels != param->channels)
 			continue;
 		if (!auconv_is_supported_rate(&formats[i],
 					      param->sample_rate))
 			continue;
 		return i;
+	}
 	return -1;
 @@ -1026,26 +1027,27 @@ auconv_create_encodings(const struct aud
+			}
 #endif
 			break;
 		case AUDIO_ENCODING_ULAW:
 		case AUDIO_ENCODING_ALAW:
 		case AUDIO_ENCODING_ADPCM:
 		case AUDIO_ENCODING_MPEG_L1_STREAM:
 		case AUDIO_ENCODING_MPEG_L1_PACKETS:
 		case AUDIO_ENCODING_MPEG_L1_SYSTEM:
 		case AUDIO_ENCODING_MPEG_L2_STREAM:
 		case AUDIO_ENCODING_MPEG_L2_PACKETS:
 		case AUDIO_ENCODING_MPEG_L2_SYSTEM:
 		case AUDIO_ENCODING_AC3:
 			ADD_ENCODING(formats[i].encoding,
 				     formats[i].precision, 0);
 			break;
 		case AUDIO_ENCODING_SLINEAR:
 		case AUDIO_ENCODING_ULINEAR:
 		case AUDIO_ENCODING_LINEAR:
 		case AUDIO_ENCODING_LINEAR8:
 		default:
 			printf("%s: invalid encoding value "
 			       "for audio_format: %d\n",
 			       __func__, formats[i].encoding);
 			break;
 @@ -1065,27 +1067,28 @@ auconv_create_encodings(const struct aud
  * a sub-routine for auconv_create_encodings()
  */
 static int
 auconv_add_encoding(int enc, int prec, int flags,
 		    struct audio_encoding_set **buf, int *capacity)
+{
 	static const char *encoding_names[] = {
 		NULL, AudioEmulaw, AudioEalaw, NULL,
 		NULL, AudioEadpcm, AudioEslinear_le, AudioEslinear_be,
 		AudioEulinear_le, AudioEulinear_be,
 		AudioEslinear, AudioEulinear,
 		AudioEmpeg_l1_stream, AudioEmpeg_l1_packets,
 		AudioEmpeg_l1_system, AudioEmpeg_l2_stream,
-		AudioEmpeg_l2_packets, AudioEmpeg_l2_system
+		AudioEmpeg_l2_packets, AudioEmpeg_l2_system,
 		AudioEac3
 	};
 	struct audio_encoding_set *set;
 	struct audio_encoding_set *new_buf;
 	audio_encoding_t *e;
 	int i;
 	set = *buf;
 	/* already has the same encoding? */
 	e = set->items;
 	for (i = 0; i < set->size; i++, e++) {
 		if (e->encoding == enc && e->precision == prec) {
 			/* overwrite EMULATED flag */
 			if ((e->flags & AUDIO_ENCODINGFLAG_EMULATED)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: audio.c,v 1.252 2010/11/20 18:03:49 tsutsui Exp $	*/
+/*	$NetBSD: audio.c,v 1.253 2011/09/06 01:16:44 jmcneill Exp $	*/
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -51,27 +51,27 @@
  * generated.
+ *
  * If you try to set both play and record mode on a half-duplex
  * device, playing takes precedence.
  */
 /*
  * Todo:
  * - Add softaudio() isr processing for wakeup, poll, signals,
  *   and silence fill.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.252 2010/11/20 18:03:49 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.253 2011/09/06 01:16:44 jmcneill Exp $");
 #include "audio.h"
 #if NAUDIO > 0
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -1835,26 +1835,27 @@ audio_fill_silence(struct audio_params *
 	switch (params->encoding) {
 	case AUDIO_ENCODING_ULAW:
 		auzero0 = 0x7f;
 		break;
 	case AUDIO_ENCODING_ALAW:
 		auzero0 = 0x55;
 		break;
 	case AUDIO_ENCODING_MPEG_L1_STREAM:
 	case AUDIO_ENCODING_MPEG_L1_PACKETS:
 	case AUDIO_ENCODING_MPEG_L1_SYSTEM:
 	case AUDIO_ENCODING_MPEG_L2_STREAM:
 	case AUDIO_ENCODING_MPEG_L2_PACKETS:
 	case AUDIO_ENCODING_MPEG_L2_SYSTEM:
 	case AUDIO_ENCODING_AC3:
 	case AUDIO_ENCODING_ADPCM: /* is this right XXX */
 	case AUDIO_ENCODING_SLINEAR_LE:
 	case AUDIO_ENCODING_SLINEAR_BE:
 		auzero0 = 0;/* fortunately this works for any number of bits */
 		break;
 	case AUDIO_ENCODING_ULINEAR_LE:
 	case AUDIO_ENCODING_ULINEAR_BE:
 		if (params->precision > 8) {
 			nfill = (params->precision + NBBY - 1)/ NBBY;
 			auzero0 = 0x80;
 			auzero1 = 0;
 		} else
 			auzero0 = 0x80;
 @@ -2962,26 +2963,27 @@ audio_check_params(struct audio_params *
 		if (p->precision == 8 && p->encoding == AUDIO_ENCODING_SLINEAR_BE)
 			p->encoding = AUDIO_ENCODING_SLINEAR_LE;
 		if (p->precision == 8 && p->encoding == AUDIO_ENCODING_ULINEAR_BE)
 			p->encoding = AUDIO_ENCODING_ULINEAR_LE;
 		if (p->validbits > p->precision)
 			return EINVAL;
 		break;
 	case AUDIO_ENCODING_MPEG_L1_STREAM:
 	case AUDIO_ENCODING_MPEG_L1_PACKETS:
 	case AUDIO_ENCODING_MPEG_L1_SYSTEM:
 	case AUDIO_ENCODING_MPEG_L2_STREAM:
 	case AUDIO_ENCODING_MPEG_L2_PACKETS:
 	case AUDIO_ENCODING_MPEG_L2_SYSTEM:
 	case AUDIO_ENCODING_AC3:
 		break;
 	default:
 		return EINVAL;
+	}
 	/* sanity check # of channels*/
 	if (p->channels < 1 || p->channels > AUDIO_MAX_CHANNELS)
 		return EINVAL;
 	return 0;
+}
 int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: audioio.h,v 1.33 2009/09/29 15:58:54 sborrill Exp $	*/
+/*	$NetBSD: audioio.h,v 1.34 2011/09/06 01:16:43 jmcneill Exp $	*/
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -122,26 +122,27 @@ typedef struct audio_offset {
 #define	AUDIO_ENCODING_ADPCM		5 /* adaptive differential PCM */
 #define AUDIO_ENCODING_SLINEAR_LE	6
 #define AUDIO_ENCODING_SLINEAR_BE	7
 #define AUDIO_ENCODING_ULINEAR_LE	8
 #define AUDIO_ENCODING_ULINEAR_BE	9
 #define AUDIO_ENCODING_SLINEAR		10
 #define AUDIO_ENCODING_ULINEAR		11
 #define AUDIO_ENCODING_MPEG_L1_STREAM	12
 #define AUDIO_ENCODING_MPEG_L1_PACKETS	13
 #define AUDIO_ENCODING_MPEG_L1_SYSTEM	14
 #define AUDIO_ENCODING_MPEG_L2_STREAM	15
 #define AUDIO_ENCODING_MPEG_L2_PACKETS	16
 #define AUDIO_ENCODING_MPEG_L2_SYSTEM	17
 #define AUDIO_ENCODING_AC3		18
 typedef struct audio_encoding {
 	int	index;
 	char	name[MAX_AUDIO_DEV_LEN];
 	int	encoding;
 	int	precision;
 	int	flags;
 #define AUDIO_ENCODINGFLAG_EMULATED 1 /* software emulation mode */
 } audio_encoding_t;
 /*
  * Balance settings.
  */
 @@ -315,22 +316,23 @@ typedef struct mixer_ctrl {
 #define AudioEadpcm		"adpcm"
 #define AudioEslinear		"slinear"
 #define AudioEslinear_le	"slinear_le"
 #define AudioEslinear_be	"slinear_be"
 #define AudioEulinear		"ulinear"
 #define AudioEulinear_le	"ulinear_le"
 #define AudioEulinear_be	"ulinear_be"
 #define AudioEmpeg_l1_stream	"mpeg_l1_stream"
 #define AudioEmpeg_l1_packets	"mpeg_l1_packets"
 #define AudioEmpeg_l1_system	"mpeg_l1_system"
 #define AudioEmpeg_l2_stream	"mpeg_l2_stream"
 #define AudioEmpeg_l2_packets	"mpeg_l2_packets"
 #define AudioEmpeg_l2_system	"mpeg_l2_system"
 #define AudioEac3		"ac3"
 #define AudioCinputs	"inputs"
 #define AudioCoutputs	"outputs"
 #define AudioCrecord	"record"
 #define AudioCmonitor	"monitor"
 #define AudioCequalization	"equalization"
 #define AudioCmodem	"modem"
 #endif /* !_SYS_AUDIOIO_H_ */