 @@ -1,1092 +1,1092 @@
-/*	$NetBSD: uaudio.c,v 1.134 2013/01/22 12:40:43 jmcneill Exp $	*/
+/*	$NetBSD: uaudio.c,v 1.135 2013/01/24 08:22:38 mrg Exp $	*/
 /*
  * Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology, and Matthew R. Green (mrg@eterna.com.au).
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 /*
  * USB audio specs: http://www.usb.org/developers/devclass_docs/audio10.pdf
  *                  http://www.usb.org/developers/devclass_docs/frmts10.pdf
  *                  http://www.usb.org/developers/devclass_docs/termt10.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.134 2013/01/22 12:40:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.135 2013/01/24 08:22:38 mrg Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/reboot.h>		/* for bootverbose */
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
 #include <dev/audiovar.h>
 #include <dev/mulaw.h>
 #include <dev/auconv.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usb_quirks.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/uaudioreg.h>
 /* #define UAUDIO_DEBUG */
 /* #define UAUDIO_MULTIPLE_ENDPOINTS */
 #ifdef UAUDIO_DEBUG
 #define DPRINTF(x,y...)		do { \
 		if (uaudiodebug) { \
 			struct lwp *l = curlwp; \
 			printf("%s[%d:%d]: "x, __func__, l->l_proc->p_pid, l->l_lid, y); \
 		} \
 	} while (0)
 #define DPRINTFN_CLEAN(n,x...)	do { \
 		if (uaudiodebug > (n)) \
 			printf(x); \
 	} while (0)
 #define DPRINTFN(n,x,y...)	do { \
 		if (uaudiodebug > (n)) { \
 			struct lwp *l = curlwp; \
 			printf("%s[%d:%d]: "x, __func__, l->l_proc->p_pid, l->l_lid, y); \
 		} \
 	} while (0)
-int	uaudiodebug = 6;
+int	uaudiodebug = 0;
 #else
 #define DPRINTF(x,y...)
 #define DPRINTFN_CLEAN(n,x...)
 #define DPRINTFN(n,x,y...)
 #endif
 #define UAUDIO_NCHANBUFS 6	/* number of outstanding request */
 #define UAUDIO_NFRAMES   10	/* ms of sound in each request */
 #define MIX_MAX_CHAN 8
 struct mixerctl {
 	uint16_t	wValue[MIX_MAX_CHAN]; /* using nchan */
 	uint16_t	wIndex;
 	uint8_t		nchan;
 	uint8_t		type;
 #define MIX_ON_OFF	1
 #define MIX_SIGNED_16	2
 #define MIX_UNSIGNED_16	3
 #define MIX_SIGNED_8	4
 #define MIX_SELECTOR	5
 #define MIX_SIZE(n) ((n) == MIX_SIGNED_16 || (n) == MIX_UNSIGNED_16 ? 2 : 1)
 #define MIX_UNSIGNED(n) ((n) == MIX_UNSIGNED_16)
 	int		minval, maxval;
 	u_int		delta;
 	u_int		mul;
 	uint8_t		class;
 	char		ctlname[MAX_AUDIO_DEV_LEN];
 	const char	*ctlunit;
 };
 #define MAKE(h,l) (((h) << 8) | (l))
 struct as_info {
 	uint8_t		alt;
 	uint8_t		encoding;
 	uint8_t		attributes; /* Copy of bmAttributes of
 				     * usb_audio_streaming_endpoint_descriptor
 				     */
 	usbd_interface_handle	ifaceh;
 	const usb_interface_descriptor_t *idesc;
 	const usb_endpoint_descriptor_audio_t *edesc;
 	const usb_endpoint_descriptor_audio_t *edesc1;
 	const struct usb_audio_streaming_type1_descriptor *asf1desc;
 	struct audio_format *aformat;
 	int		sc_busy;	/* currently used */
 };
 struct chan {
 	void	(*intr)(void *);	/* DMA completion intr handler */
 	void	*arg;		/* arg for intr() */
 	usbd_pipe_handle pipe;
 	usbd_pipe_handle sync_pipe;
 	u_int	sample_size;
 	u_int	sample_rate;
 	u_int	bytes_per_frame;
 	u_int	fraction;	/* fraction/1000 is the extra samples/frame */
 	u_int	residue;	/* accumulates the fractional samples */
 	u_char	*start;		/* upper layer buffer start */
 	u_char	*end;		/* upper layer buffer end */
 	u_char	*cur;		/* current position in upper layer buffer */
 	int	blksize;	/* chunk size to report up */
 	int	transferred;	/* transferred bytes not reported up */
 	int	altidx;		/* currently used altidx */
 	int	curchanbuf;
 	struct chanbuf {
 		struct chan	*chan;
 		usbd_xfer_handle xfer;
 		u_char		*buffer;
 		uint16_t	sizes[UAUDIO_NFRAMES];
 		uint16_t	offsets[UAUDIO_NFRAMES];
 		uint16_t	size;
 	} chanbufs[UAUDIO_NCHANBUFS];
 	struct uaudio_softc *sc; /* our softc */
 };
 /*
  * XXX Locking notes:
+ *
  *    The MI USB audio subsystem is not MP-SAFE.  Our strategy here
  *    is to ensure we have the kernel lock held when calling into
  *    usbd, and, generally, to have dropped the sc_intr_lock during
  *    these sections as well since the usb code will sleep.
  */
 struct uaudio_softc {
 	device_t	sc_dev;		/* base device */
 	kmutex_t	sc_lock;
 	kmutex_t	sc_intr_lock;
 	usbd_device_handle sc_udev;	/* USB device */
 	int		sc_ac_iface;	/* Audio Control interface */
 	usbd_interface_handle	sc_ac_ifaceh;
 	struct chan	sc_playchan;	/* play channel */
 	struct chan	sc_recchan;	/* record channel */
 	int		sc_nullalt;
 	int		sc_audio_rev;
 	struct as_info	*sc_alts;	/* alternate settings */
 	int		sc_nalts;	/* # of alternate settings */
 	int		sc_altflags;
 #define HAS_8		0x01
 #define HAS_16		0x02
 #define HAS_8U		0x04
 #define HAS_ALAW	0x08
 #define HAS_MULAW	0x10
 #define UA_NOFRAC	0x20		/* don't do sample rate adjustment */
 #define HAS_24		0x40
 	int		sc_mode;	/* play/record capability */
 	struct mixerctl *sc_ctls;	/* mixer controls */
 	int		sc_nctls;	/* # of mixer controls */
 	device_t	sc_audiodev;
 	struct audio_format *sc_formats;
 	int		sc_nformats;
 	struct audio_encoding_set *sc_encodings;
 	u_int		sc_channel_config;
 	char		sc_dying;
 	struct audio_device sc_adev;
 };
 struct terminal_list {
 	int size;
 	uint16_t terminals[1];
 };
 #define TERMINAL_LIST_SIZE(N)	(offsetof(struct terminal_list, terminals) \
 				+ sizeof(uint16_t) * (N))
 struct io_terminal {
 	union {
 		const uaudio_cs_descriptor_t *desc;
 		const struct usb_audio_input_terminal *it;
 		const struct usb_audio_output_terminal *ot;
 		const struct usb_audio_mixer_unit *mu;
 		const struct usb_audio_selector_unit *su;
 		const struct usb_audio_feature_unit *fu;
 		const struct usb_audio_processing_unit *pu;
 		const struct usb_audio_extension_unit *eu;
 	} d;
 	int inputs_size;
 	struct terminal_list **inputs; /* list of source input terminals */
 	struct terminal_list *output; /* list of destination output terminals */
 	int direct;		/* directly connected to an output terminal */
 };
 #define UAC_OUTPUT	0
 #define UAC_INPUT	1
 #define UAC_EQUAL	2
 #define UAC_RECORD	3
 #define UAC_NCLASSES	4
 #ifdef UAUDIO_DEBUG
 Static const char *uac_names[] = {
 	AudioCoutputs, AudioCinputs, AudioCequalization, AudioCrecord,
 };
 #endif
 Static usbd_status uaudio_identify_ac
 	(struct uaudio_softc *, const usb_config_descriptor_t *);
 Static usbd_status uaudio_identify_as
 	(struct uaudio_softc *, const usb_config_descriptor_t *);
 Static usbd_status uaudio_process_as
 	(struct uaudio_softc *, const char *, int *, int,
 	 const usb_interface_descriptor_t *);
 Static void	uaudio_add_alt(struct uaudio_softc *, const struct as_info *);
 Static const usb_interface_descriptor_t *uaudio_find_iface
 	(const char *, int, int *, int);
 Static void	uaudio_mixer_add_ctl(struct uaudio_softc *, struct mixerctl *);
 Static char	*uaudio_id_name
 	(struct uaudio_softc *, const struct io_terminal *, int);
 #ifdef UAUDIO_DEBUG
 Static void	uaudio_dump_cluster(const struct usb_audio_cluster *);
 #endif
 Static struct usb_audio_cluster uaudio_get_cluster
 	(int, const struct io_terminal *);
 Static void	uaudio_add_input
 	(struct uaudio_softc *, const struct io_terminal *, int);
 Static void	uaudio_add_output
 	(struct uaudio_softc *, const struct io_terminal *, int);
 Static void	uaudio_add_mixer
 	(struct uaudio_softc *, const struct io_terminal *, int);
 Static void	uaudio_add_selector
 	(struct uaudio_softc *, const struct io_terminal *, int);
 #ifdef UAUDIO_DEBUG
 Static const char *uaudio_get_terminal_name(int);
 #endif
 Static int	uaudio_determine_class
 	(const struct io_terminal *, struct mixerctl *);
 Static const char *uaudio_feature_name
 	(const struct io_terminal *, struct mixerctl *);
 Static void	uaudio_add_feature
 	(struct uaudio_softc *, const struct io_terminal *, int);
 Static void	uaudio_add_processing_updown
 	(struct uaudio_softc *, const struct io_terminal *, int);
 Static void	uaudio_add_processing
 	(struct uaudio_softc *, const struct io_terminal *, int);
 Static void	uaudio_add_extension
 	(struct uaudio_softc *, const struct io_terminal *, int);
 Static struct terminal_list *uaudio_merge_terminal_list
 	(const struct io_terminal *);
 Static struct terminal_list *uaudio_io_terminaltype
 	(int, struct io_terminal *, int);
 Static usbd_status uaudio_identify
 	(struct uaudio_softc *, const usb_config_descriptor_t *);
 Static int	uaudio_signext(int, int);
 Static int	uaudio_value2bsd(struct mixerctl *, int);
 Static int	uaudio_bsd2value(struct mixerctl *, int);
 Static int	uaudio_get(struct uaudio_softc *, int, int, int, int, int);
 Static int	uaudio_ctl_get
 	(struct uaudio_softc *, int, struct mixerctl *, int);
 Static void	uaudio_set
 	(struct uaudio_softc *, int, int, int, int, int, int);
 Static void	uaudio_ctl_set
 	(struct uaudio_softc *, int, struct mixerctl *, int, int);
 Static usbd_status uaudio_set_speed(struct uaudio_softc *, int, u_int);
 Static usbd_status uaudio_chan_open(struct uaudio_softc *, struct chan *);
 Static void	uaudio_chan_close(struct uaudio_softc *, struct chan *);
 Static usbd_status uaudio_chan_alloc_buffers
 	(struct uaudio_softc *, struct chan *);
 Static void	uaudio_chan_free_buffers(struct uaudio_softc *, struct chan *);
 Static void	uaudio_chan_init
 	(struct chan *, int, const struct audio_params *, int);
 Static void	uaudio_chan_set_param(struct chan *, u_char *, u_char *, int);
 Static void	uaudio_chan_ptransfer(struct chan *);
 Static void	uaudio_chan_pintr
 	(usbd_xfer_handle, usbd_private_handle, usbd_status);
 Static void	uaudio_chan_rtransfer(struct chan *);
 Static void	uaudio_chan_rintr
 	(usbd_xfer_handle, usbd_private_handle, usbd_status);
 Static int	uaudio_open(void *, int);
 Static void	uaudio_close(void *);
 Static int	uaudio_drain(void *);
 Static int	uaudio_query_encoding(void *, struct audio_encoding *);
 Static int	uaudio_set_params
 	(void *, int, int, struct audio_params *, struct audio_params *,
 	 stream_filter_list_t *, stream_filter_list_t *);
 Static int	uaudio_round_blocksize(void *, int, int, const audio_params_t *);
 Static int	uaudio_trigger_output
 	(void *, void *, void *, int, void (*)(void *), void *,
 	 const audio_params_t *);
 Static int	uaudio_trigger_input
 	(void *, void *, void *, int, void (*)(void *), void *,
 	 const audio_params_t *);
 Static int	uaudio_halt_in_dma(void *);
 Static int	uaudio_halt_out_dma(void *);
 Static int	uaudio_getdev(void *, struct audio_device *);
 Static int	uaudio_mixer_set_port(void *, mixer_ctrl_t *);
 Static int	uaudio_mixer_get_port(void *, mixer_ctrl_t *);
 Static int	uaudio_query_devinfo(void *, mixer_devinfo_t *);
 Static int	uaudio_get_props(void *);
 Static void	uaudio_get_locks(void *, kmutex_t **, kmutex_t **);
 Static const struct audio_hw_if uaudio_hw_if = {
 	uaudio_open,
 	uaudio_close,
 	uaudio_drain,
 	uaudio_query_encoding,
 	uaudio_set_params,
 	uaudio_round_blocksize,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	uaudio_halt_out_dma,
 	uaudio_halt_in_dma,
 	NULL,
 	uaudio_getdev,
 	NULL,
 	uaudio_mixer_set_port,
 	uaudio_mixer_get_port,
 	uaudio_query_devinfo,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	uaudio_get_props,
 	uaudio_trigger_output,
 	uaudio_trigger_input,
 	NULL,
 	uaudio_get_locks,
 };
 int uaudio_match(device_t, cfdata_t, void *);
 void uaudio_attach(device_t, device_t, void *);
 int uaudio_detach(device_t, int);
 void uaudio_childdet(device_t, device_t);
 int uaudio_activate(device_t, enum devact);
 extern struct cfdriver uaudio_cd;
 CFATTACH_DECL2_NEW(uaudio, sizeof(struct uaudio_softc),
     uaudio_match, uaudio_attach, uaudio_detach, uaudio_activate, NULL,
     uaudio_childdet);
 int
 uaudio_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usbif_attach_arg *uaa = aux;
 	/* Trigger on the control interface. */
 	if (uaa->class != UICLASS_AUDIO ||
 	    uaa->subclass != UISUBCLASS_AUDIOCONTROL ||
 	    (usbd_get_quirks(uaa->device)->uq_flags & UQ_BAD_AUDIO))
 		return UMATCH_NONE;
 	return UMATCH_IFACECLASS_IFACESUBCLASS;
+}
 void
 uaudio_attach(device_t parent, device_t self, void *aux)
+{
 	struct uaudio_softc *sc = device_private(self);
 	struct usbif_attach_arg *uaa = aux;
 	usb_interface_descriptor_t *id;
 	usb_config_descriptor_t *cdesc;
 	char *devinfop;
 	usbd_status err;
 	int i, j, found;
 	sc->sc_dev = self;
 	sc->sc_udev = uaa->device;
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
 	strlcpy(sc->sc_adev.name, "USB audio", sizeof(sc->sc_adev.name));
 	strlcpy(sc->sc_adev.version, "", sizeof(sc->sc_adev.version));
 	snprintf(sc->sc_adev.config, sizeof(sc->sc_adev.config), "usb:%08x",
 	    sc->sc_udev->cookie.cookie);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(uaa->device, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	cdesc = usbd_get_config_descriptor(sc->sc_udev);
 	if (cdesc == NULL) {
 		aprint_error_dev(self,
 		    "failed to get configuration descriptor\n");
 		return;
+	}
 	err = uaudio_identify(sc, cdesc);
 	if (err) {
 		aprint_error_dev(self,
 		    "audio descriptors make no sense, error=%d\n", err);
 		return;
+	}
 	sc->sc_ac_ifaceh = uaa->iface;
 	/* Pick up the AS interface. */
 	for (i = 0; i < uaa->nifaces; i++) {
 		if (uaa->ifaces[i] == NULL)
 			continue;
 		id = usbd_get_interface_descriptor(uaa->ifaces[i]);
 		if (id == NULL)
 			continue;
 		found = 0;
 		for (j = 0; j < sc->sc_nalts; j++) {
 			if (id->bInterfaceNumber ==
 			    sc->sc_alts[j].idesc->bInterfaceNumber) {
 				sc->sc_alts[j].ifaceh = uaa->ifaces[i];
 				found = 1;
+			}
+		}
 		if (found)
 			uaa->ifaces[i] = NULL;
+	}
 	for (j = 0; j < sc->sc_nalts; j++) {
 		if (sc->sc_alts[j].ifaceh == NULL) {
 			aprint_error_dev(self,
 			    "alt %d missing AS interface(s)\n", j);
 			return;
+		}
+	}
 	aprint_normal_dev(self, "audio rev %d.%02x\n",
 	       sc->sc_audio_rev >> 8, sc->sc_audio_rev & 0xff);
 	sc->sc_playchan.sc = sc->sc_recchan.sc = sc;
 	sc->sc_playchan.altidx = -1;
 	sc->sc_recchan.altidx = -1;
 	if (usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_AU_NO_FRAC)
 		sc->sc_altflags |= UA_NOFRAC;
 #ifndef UAUDIO_DEBUG
 	if (bootverbose)
 #endif
 		aprint_normal_dev(self, "%d mixer controls\n",
 		    sc->sc_nctls);
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
 			   sc->sc_dev);
 	DPRINTF("%s", "doing audio_attach_mi\n");
 	sc->sc_audiodev = audio_attach_mi(&uaudio_hw_if, sc, sc->sc_dev);
 	return;
+}
 int
 uaudio_activate(device_t self, enum devact act)
+{
 	struct uaudio_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		sc->sc_dying = 1;
 		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
+}
 void
 uaudio_childdet(device_t self, device_t child)
+{
 	struct uaudio_softc *sc = device_private(self);
 	KASSERT(sc->sc_audiodev == child);
 	sc->sc_audiodev = NULL;
+}
 int
 uaudio_detach(device_t self, int flags)
+{
 	struct uaudio_softc *sc = device_private(self);
 	int rv;
 	rv = 0;
 	/* Wait for outstanding requests to complete. */
 	usbd_delay_ms(sc->sc_udev, UAUDIO_NCHANBUFS * UAUDIO_NFRAMES);
 	if (sc->sc_audiodev != NULL)
 		rv = config_detach(sc->sc_audiodev, flags);
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
 			   sc->sc_dev);
 	if (sc->sc_formats != NULL)
 		free(sc->sc_formats, M_USBDEV);
 	auconv_delete_encodings(sc->sc_encodings);
 	mutex_destroy(&sc->sc_lock);
 	mutex_destroy(&sc->sc_intr_lock);
 	return rv;
+}
 Static int
 uaudio_query_encoding(void *addr, struct audio_encoding *fp)
+{
 	struct uaudio_softc *sc;
 	int flags;
 	sc = addr;
 	flags = sc->sc_altflags;
 	if (sc->sc_dying)
 		return EIO;
 	if (sc->sc_nalts == 0 || flags == 0)
 		return ENXIO;
 	return auconv_query_encoding(sc->sc_encodings, fp);
+}
 Static const usb_interface_descriptor_t *
 uaudio_find_iface(const char *tbuf, int size, int *offsp, int subtype)
+{
 	const usb_interface_descriptor_t *d;
 	while (*offsp < size) {
 		d = (const void *)(tbuf + *offsp);
 		*offsp += d->bLength;
 		if (d->bDescriptorType == UDESC_INTERFACE &&
 		    d->bInterfaceClass == UICLASS_AUDIO &&
 		    d->bInterfaceSubClass == subtype)
 			return d;
+	}
 	return NULL;
+}
 Static void
 uaudio_mixer_add_ctl(struct uaudio_softc *sc, struct mixerctl *mc)
+{
 	int res;
 	size_t len;
 	struct mixerctl *nmc;
 	if (mc->class < UAC_NCLASSES) {
 		DPRINTF("adding %s.%s\n", uac_names[mc->class], mc->ctlname);
 	} else {
 		DPRINTF("adding %s\n", mc->ctlname);
+	}
 	len = sizeof(*mc) * (sc->sc_nctls + 1);
 	nmc = malloc(len, M_USBDEV, M_NOWAIT);
 	if (nmc == NULL) {
 		aprint_error("uaudio_mixer_add_ctl: no memory\n");
 		return;
+	}
 	/* Copy old data, if there was any */
 	if (sc->sc_nctls != 0) {
 		memcpy(nmc, sc->sc_ctls, sizeof(*mc) * (sc->sc_nctls));
 		free(sc->sc_ctls, M_USBDEV);
+	}
 	sc->sc_ctls = nmc;
 	mc->delta = 0;
 	if (mc->type == MIX_ON_OFF) {
 		mc->minval = 0;
 		mc->maxval = 1;
 	} else if (mc->type == MIX_SELECTOR) {
+		;
 	} else {
 		/* Determine min and max values. */
 		mc->minval = uaudio_signext(mc->type,
 			uaudio_get(sc, GET_MIN, UT_READ_CLASS_INTERFACE,
 				   mc->wValue[0], mc->wIndex,
 				   MIX_SIZE(mc->type)));
 		mc->maxval = 1 + uaudio_signext(mc->type,
 			uaudio_get(sc, GET_MAX, UT_READ_CLASS_INTERFACE,
 				   mc->wValue[0], mc->wIndex,
 				   MIX_SIZE(mc->type)));
 		mc->mul = mc->maxval - mc->minval;
 		if (mc->mul == 0)
 			mc->mul = 1;
 		res = uaudio_get(sc, GET_RES, UT_READ_CLASS_INTERFACE,
 				 mc->wValue[0], mc->wIndex,
 				 MIX_SIZE(mc->type));
 		if (res > 0)
 			mc->delta = (res * 255 + mc->mul/2) / mc->mul;
+	}
 	sc->sc_ctls[sc->sc_nctls++] = *mc;
 #ifdef UAUDIO_DEBUG
 	if (uaudiodebug > 2) {
 		int i;
 		DPRINTFN_CLEAN(2, "wValue=%04x", mc->wValue[0]);
 		for (i = 1; i < mc->nchan; i++)
 			DPRINTFN_CLEAN(2, ",%04x", mc->wValue[i]);
 		DPRINTFN_CLEAN(2, " wIndex=%04x type=%d name='%s' unit='%s' "
 			 "min=%d max=%d\n",
 			 mc->wIndex, mc->type, mc->ctlname, mc->ctlunit,
 			 mc->minval, mc->maxval);
+	}
 #endif
+}
 Static char *
 uaudio_id_name(struct uaudio_softc *sc,
     const struct io_terminal *iot, int id)
+{
 	static char tbuf[32];
 	snprintf(tbuf, sizeof(tbuf), "i%d", id);
 	return tbuf;
+}
 #ifdef UAUDIO_DEBUG
 Static void
 uaudio_dump_cluster(const struct usb_audio_cluster *cl)
+{
 	static const char *channel_names[16] = {
 		"LEFT", "RIGHT", "CENTER", "LFE",
 		"LEFT_SURROUND", "RIGHT_SURROUND", "LEFT_CENTER", "RIGHT_CENTER",
 		"SURROUND", "LEFT_SIDE", "RIGHT_SIDE", "TOP",
 		"RESERVED12", "RESERVED13", "RESERVED14", "RESERVED15",
 	};
 	int cc, i, first;
 	cc = UGETW(cl->wChannelConfig);
 	printf("cluster: bNrChannels=%u wChannelConfig=0x%.4x",
 		  cl->bNrChannels, cc);
 	first = TRUE;
 	for (i = 0; cc != 0; i++) {
 		if (cc & 1) {
 			printf("%c%s", first ? '<' : ',', channel_names[i]);
 			first = FALSE;
+		}
 		cc = cc >> 1;
+	}
 	printf("> iChannelNames=%u", cl->iChannelNames);
+}
 #endif
 Static struct usb_audio_cluster
 uaudio_get_cluster(int id, const struct io_terminal *iot)
+{
 	struct usb_audio_cluster r;
 	const uaudio_cs_descriptor_t *dp;
 	int i;
 	for (i = 0; i < 25; i++) { /* avoid infinite loops */
 		dp = iot[id].d.desc;
 		if (dp == 0)
 			goto bad;
 		switch (dp->bDescriptorSubtype) {
 		case UDESCSUB_AC_INPUT:
 			r.bNrChannels = iot[id].d.it->bNrChannels;
 			USETW(r.wChannelConfig, UGETW(iot[id].d.it->wChannelConfig));
 			r.iChannelNames = iot[id].d.it->iChannelNames;
 			return r;
 		case UDESCSUB_AC_OUTPUT:
 			id = iot[id].d.ot->bSourceId;
 			break;
 		case UDESCSUB_AC_MIXER:
 			r = *(const struct usb_audio_cluster *)
 				&iot[id].d.mu->baSourceId[iot[id].d.mu->bNrInPins];
 			return r;
 		case UDESCSUB_AC_SELECTOR:
 			/* XXX This is not really right */
 			id = iot[id].d.su->baSourceId[0];
 			break;
 		case UDESCSUB_AC_FEATURE:
 			id = iot[id].d.fu->bSourceId;
 			break;
 		case UDESCSUB_AC_PROCESSING:
 			r = *(const struct usb_audio_cluster *)
 				&iot[id].d.pu->baSourceId[iot[id].d.pu->bNrInPins];
 			return r;
 		case UDESCSUB_AC_EXTENSION:
 			r = *(const struct usb_audio_cluster *)
 				&iot[id].d.eu->baSourceId[iot[id].d.eu->bNrInPins];
 			return r;
 		default:
 			goto bad;
+		}
+	}
  bad:
 	aprint_error("uaudio_get_cluster: bad data\n");
 	memset(&r, 0, sizeof r);
 	return r;
+}
 Static void
 uaudio_add_input(struct uaudio_softc *sc, const struct io_terminal *iot, int id)
+{
 	const struct usb_audio_input_terminal *d;
 	d = iot[id].d.it;
 #ifdef UAUDIO_DEBUG
 	DPRINTFN(2,"bTerminalId=%d wTerminalType=0x%04x "
 		    "bAssocTerminal=%d bNrChannels=%d wChannelConfig=%d "
 		    "iChannelNames=%d iTerminal=%d\n",
 		    d->bTerminalId, UGETW(d->wTerminalType), d->bAssocTerminal,
 		    d->bNrChannels, UGETW(d->wChannelConfig),
 		    d->iChannelNames, d->iTerminal);
 #endif
 	/* If USB input terminal, record wChannelConfig */
 	if ((UGETW(d->wTerminalType) & 0xff00) != 0x0100)
 		return;
 	sc->sc_channel_config = UGETW(d->wChannelConfig);
+}
 Static void
 uaudio_add_output(struct uaudio_softc *sc,
     const struct io_terminal *iot, int id)
+{
 #ifdef UAUDIO_DEBUG
 	const struct usb_audio_output_terminal *d;
 	d = iot[id].d.ot;
 	DPRINTFN(2,"bTerminalId=%d wTerminalType=0x%04x "
 		    "bAssocTerminal=%d bSourceId=%d iTerminal=%d\n",
 		    d->bTerminalId, UGETW(d->wTerminalType), d->bAssocTerminal,
 		    d->bSourceId, d->iTerminal);
 #endif
+}
 Static void
 uaudio_add_mixer(struct uaudio_softc *sc, const struct io_terminal *iot, int id)
+{
 	const struct usb_audio_mixer_unit *d;
 	const struct usb_audio_mixer_unit_1 *d1;
 	int c, chs, ichs, ochs, i, o, bno, p, mo, mc, k;
 	const uByte *bm;
 	struct mixerctl mix;
 	d = iot[id].d.mu;
 	DPRINTFN(2,"bUnitId=%d bNrInPins=%d\n",
 		    d->bUnitId, d->bNrInPins);
 	/* Compute the number of input channels */
 	ichs = 0;
 	for (i = 0; i < d->bNrInPins; i++)
 		ichs += uaudio_get_cluster(d->baSourceId[i], iot).bNrChannels;
 	/* and the number of output channels */
 	d1 = (const struct usb_audio_mixer_unit_1 *)&d->baSourceId[d->bNrInPins];
 	ochs = d1->bNrChannels;
 	DPRINTFN(2,"ichs=%d ochs=%d\n", ichs, ochs);
 	bm = d1->bmControls;
 	mix.wIndex = MAKE(d->bUnitId, sc->sc_ac_iface);
 	uaudio_determine_class(&iot[id], &mix);
 	mix.type = MIX_SIGNED_16;
 	mix.ctlunit = AudioNvolume;
 #define _BIT(bno) ((bm[bno / 8] >> (7 - bno % 8)) & 1)
 	for (p = i = 0; i < d->bNrInPins; i++) {
 		chs = uaudio_get_cluster(d->baSourceId[i], iot).bNrChannels;
 		mc = 0;
 		for (c = 0; c < chs; c++) {
 			mo = 0;
 			for (o = 0; o < ochs; o++) {
 				bno = (p + c) * ochs + o;
 				if (_BIT(bno))
 					mo++;
+			}
 			if (mo == 1)
 				mc++;
+		}
 		if (mc == chs && chs <= MIX_MAX_CHAN) {
 			k = 0;
 			for (c = 0; c < chs; c++)
 				for (o = 0; o < ochs; o++) {
 					bno = (p + c) * ochs + o;
 					if (_BIT(bno))
 						mix.wValue[k++] =
 							MAKE(p+c+1, o+1);
+				}
 			snprintf(mix.ctlname, sizeof(mix.ctlname), "mix%d-%s",
 			    d->bUnitId, uaudio_id_name(sc, iot,
 			    d->baSourceId[i]));
 			mix.nchan = chs;
 			uaudio_mixer_add_ctl(sc, &mix);
 		} else {
 			/* XXX */
+		}
 #undef _BIT
 		p += chs;
+	}
+}
 Static void
 uaudio_add_selector(struct uaudio_softc *sc, const struct io_terminal *iot, int id)
+{
 	const struct usb_audio_selector_unit *d;
 	struct mixerctl mix;
 	int i, wp;
 	d = iot[id].d.su;
 	DPRINTFN(2,"bUnitId=%d bNrInPins=%d\n",
 		    d->bUnitId, d->bNrInPins);
 	mix.wIndex = MAKE(d->bUnitId, sc->sc_ac_iface);
 	mix.wValue[0] = MAKE(0, 0);
 	uaudio_determine_class(&iot[id], &mix);
 	mix.nchan = 1;
 	mix.type = MIX_SELECTOR;
 	mix.ctlunit = "";
 	mix.minval = 1;
 	mix.maxval = d->bNrInPins;
 	mix.mul = mix.maxval - mix.minval;
 	wp = snprintf(mix.ctlname, MAX_AUDIO_DEV_LEN, "sel%d-", d->bUnitId);
 	for (i = 1; i <= d->bNrInPins; i++) {
 		wp += snprintf(mix.ctlname + wp, MAX_AUDIO_DEV_LEN - wp,
 			       "i%d", d->baSourceId[i - 1]);
 		if (wp > MAX_AUDIO_DEV_LEN - 1)
 			break;
+	}
 	uaudio_mixer_add_ctl(sc, &mix);
+}
 #ifdef UAUDIO_DEBUG
 Static const char *
 uaudio_get_terminal_name(int terminal_type)
+{
 	static char tbuf[100];
 	switch (terminal_type) {
 	/* USB terminal types */
 	case UAT_UNDEFINED:	return "UAT_UNDEFINED";
 	case UAT_STREAM:	return "UAT_STREAM";
 	case UAT_VENDOR:	return "UAT_VENDOR";
 	/* input terminal types */
 	case UATI_UNDEFINED:	return "UATI_UNDEFINED";
 	case UATI_MICROPHONE:	return "UATI_MICROPHONE";
 	case UATI_DESKMICROPHONE:	return "UATI_DESKMICROPHONE";
 	case UATI_PERSONALMICROPHONE:	return "UATI_PERSONALMICROPHONE";
 	case UATI_OMNIMICROPHONE:	return "UATI_OMNIMICROPHONE";
 	case UATI_MICROPHONEARRAY:	return "UATI_MICROPHONEARRAY";
 	case UATI_PROCMICROPHONEARR:	return "UATI_PROCMICROPHONEARR";
 	/* output terminal types */
 	case UATO_UNDEFINED:	return "UATO_UNDEFINED";
 	case UATO_SPEAKER:	return "UATO_SPEAKER";
 	case UATO_HEADPHONES:	return "UATO_HEADPHONES";
 	case UATO_DISPLAYAUDIO:	return "UATO_DISPLAYAUDIO";
 	case UATO_DESKTOPSPEAKER:	return "UATO_DESKTOPSPEAKER";
 	case UATO_ROOMSPEAKER:	return "UATO_ROOMSPEAKER";
 	case UATO_COMMSPEAKER:	return "UATO_COMMSPEAKER";
 	case UATO_SUBWOOFER:	return "UATO_SUBWOOFER";
 	/* bidir terminal types */
 	case UATB_UNDEFINED:	return "UATB_UNDEFINED";
 	case UATB_HANDSET:	return "UATB_HANDSET";
 	case UATB_HEADSET:	return "UATB_HEADSET";
 	case UATB_SPEAKERPHONE:	return "UATB_SPEAKERPHONE";
 	case UATB_SPEAKERPHONEESUP:	return "UATB_SPEAKERPHONEESUP";
 	case UATB_SPEAKERPHONEECANC:	return "UATB_SPEAKERPHONEECANC";
 	/* telephony terminal types */
 	case UATT_UNDEFINED:	return "UATT_UNDEFINED";
 	case UATT_PHONELINE:	return "UATT_PHONELINE";
 	case UATT_TELEPHONE:	return "UATT_TELEPHONE";
 	case UATT_DOWNLINEPHONE:	return "UATT_DOWNLINEPHONE";
 	/* external terminal types */
 	case UATE_UNDEFINED:	return "UATE_UNDEFINED";
 	case UATE_ANALOGCONN:	return "UATE_ANALOGCONN";
 	case UATE_LINECONN:	return "UATE_LINECONN";
 	case UATE_LEGACYCONN:	return "UATE_LEGACYCONN";
 	case UATE_DIGITALAUIFC:	return "UATE_DIGITALAUIFC";
 	case UATE_SPDIF:	return "UATE_SPDIF";
 	case UATE_1394DA:	return "UATE_1394DA";
 	case UATE_1394DV:	return "UATE_1394DV";
 	/* embedded function terminal types */
 	case UATF_UNDEFINED:	return "UATF_UNDEFINED";
 	case UATF_CALIBNOISE:	return "UATF_CALIBNOISE";
 	case UATF_EQUNOISE:	return "UATF_EQUNOISE";
 	case UATF_CDPLAYER:	return "UATF_CDPLAYER";
 	case UATF_DAT:	return "UATF_DAT";
 	case UATF_DCC:	return "UATF_DCC";
 	case UATF_MINIDISK:	return "UATF_MINIDISK";
 	case UATF_ANALOGTAPE:	return "UATF_ANALOGTAPE";
 	case UATF_PHONOGRAPH:	return "UATF_PHONOGRAPH";
 	case UATF_VCRAUDIO:	return "UATF_VCRAUDIO";
 	case UATF_VIDEODISCAUDIO:	return "UATF_VIDEODISCAUDIO";
 	case UATF_DVDAUDIO:	return "UATF_DVDAUDIO";
 	case UATF_TVTUNERAUDIO:	return "UATF_TVTUNERAUDIO";
 	case UATF_SATELLITE:	return "UATF_SATELLITE";
 	case UATF_CABLETUNER:	return "UATF_CABLETUNER";
 	case UATF_DSS:	return "UATF_DSS";
 	case UATF_RADIORECV:	return "UATF_RADIORECV";
 	case UATF_RADIOXMIT:	return "UATF_RADIOXMIT";
 	case UATF_MULTITRACK:	return "UATF_MULTITRACK";
 	case UATF_SYNTHESIZER:	return "UATF_SYNTHESIZER";
 	default:
 		snprintf(tbuf, sizeof(tbuf), "unknown type (0x%.4x)", terminal_type);
 		return tbuf;
+	}
+}
 #endif
 Static int
 uaudio_determine_class(const struct io_terminal *iot, struct mixerctl *mix)
+{
 	int terminal_type;
 	if (iot == NULL || iot->output == NULL) {
 		mix->class = UAC_OUTPUT;
 		return 0;
+	}
 	terminal_type = 0;
 	if (iot->output->size == 1)
 		terminal_type = iot->output->terminals[0];
 	/*
 	 * If the only output terminal is USB,
 	 * the class is UAC_RECORD.
 	 */
 	if ((terminal_type & 0xff00) == (UAT_UNDEFINED & 0xff00)) {
 		mix->class = UAC_RECORD;
 		if (iot->inputs_size == 1
 		    && iot->inputs[0] != NULL
 		    && iot->inputs[0]->size == 1)
 			return iot->inputs[0]->terminals[0];
 		else
 			return 0;
+	}
 	/*
 	 * If the ultimate destination of the unit is just one output
 	 * terminal and the unit is connected to the output terminal
 	 * directly, the class is UAC_OUTPUT.
 	 */
 	if (terminal_type != 0 && iot->direct) {
 		mix->class = UAC_OUTPUT;
 		return terminal_type;
+	}
 	/*
 	 * If the unit is connected to just one input terminal,
 	 * the class is UAC_INPUT.
 	 */
 	if (iot->inputs_size == 1 && iot->inputs[0] != NULL
 	    && iot->inputs[0]->size == 1) {
 		mix->class = UAC_INPUT;
 		return iot->inputs[0]->terminals[0];
+	}
 	/*
 	 * Otherwise, the class is UAC_OUTPUT.
 	 */
 	mix->class = UAC_OUTPUT;
 	return terminal_type;
+}
 Static const char *
 uaudio_feature_name(const struct io_terminal *iot, struct mixerctl *mix)
+{
 	int terminal_type;
 	terminal_type = uaudio_determine_class(iot, mix);
 	if (mix->class == UAC_RECORD && terminal_type == 0)
 		return AudioNmixerout;
 	DPRINTF("terminal_type=%s\n", uaudio_get_terminal_name(terminal_type));
 	switch (terminal_type) {
 	case UAT_STREAM:
 		return AudioNdac;
 	case UATI_MICROPHONE:
 	case UATI_DESKMICROPHONE:
 	case UATI_PERSONALMICROPHONE:
 	case UATI_OMNIMICROPHONE:
 	case UATI_MICROPHONEARRAY:
 	case UATI_PROCMICROPHONEARR:
 		return AudioNmicrophone;
 	case UATO_SPEAKER:
 	case UATO_DESKTOPSPEAKER:
 	case UATO_ROOMSPEAKER:
 	case UATO_COMMSPEAKER:
 		return AudioNspeaker;
 	case UATO_HEADPHONES:
 		return AudioNheadphone;
 	case UATO_SUBWOOFER:
 		return AudioNlfe;
 	/* telephony terminal types */
 	case UATT_UNDEFINED:
 	case UATT_PHONELINE:
 	case UATT_TELEPHONE:
 	case UATT_DOWNLINEPHONE:
 		return "phone";
 	case UATE_ANALOGCONN:
 	case UATE_LINECONN:
 	case UATE_LEGACYCONN:
 		return AudioNline;
 	case UATE_DIGITALAUIFC:
 	case UATE_SPDIF:
 	case UATE_1394DA:
 	case UATE_1394DV:
 		return AudioNaux;
 	case UATF_CDPLAYER:
 		return AudioNcd;
 	case UATF_SYNTHESIZER:
 		return AudioNfmsynth;
 	case UATF_VIDEODISCAUDIO:
 	case UATF_DVDAUDIO:
 	case UATF_TVTUNERAUDIO:
 		return AudioNvideo;
 	case UAT_UNDEFINED:
 	case UAT_VENDOR:
 	case UATI_UNDEFINED:
 /* output terminal types */
 	case UATO_UNDEFINED:
 	case UATO_DISPLAYAUDIO:
 /* bidir terminal types */
 	case UATB_UNDEFINED:
 	case UATB_HANDSET:
 	case UATB_HEADSET:
 	case UATB_SPEAKERPHONE:
 	case UATB_SPEAKERPHONEESUP:
 	case UATB_SPEAKERPHONEECANC:
 /* external terminal types */
 	case UATE_UNDEFINED:
 /* embedded function terminal types */
 	case UATF_UNDEFINED:
 	case UATF_CALIBNOISE:
 	case UATF_EQUNOISE:
 	case UATF_DAT:
 	case UATF_DCC:
 	case UATF_MINIDISK:
 	case UATF_ANALOGTAPE:
 	case UATF_PHONOGRAPH:
 	case UATF_VCRAUDIO:
 	case UATF_SATELLITE:
 	case UATF_CABLETUNER:
 	case UATF_DSS:
 	case UATF_RADIORECV:
 	case UATF_RADIOXMIT:
 	case UATF_MULTITRACK:
 	case 0xffff:
 	default: