 @@ -1,14 +1,14 @@
-/*	$NetBSD: audio.c,v 1.277 2016/12/11 10:28:00 martin Exp $	*/
+/*	$NetBSD: audio.c,v 1.278 2016/12/13 17:12:51 christos Exp $	*/
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss@yahoo.com.au>
  * All rights reserved.
+ *
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -138,27 +138,27 @@
  *	query_devinfo 		-	x
  *	allocm 			-	-	Called at attach time
  *	freem 			-	-	Called at attach time
  *	round_buffersize 	-	x
  *	mappage 		-	-	Mem. unchanged after attach
  *	get_props 		-	x
  *	trigger_output 		x	x
  *	trigger_input 		x	x
  *	dev_ioctl 		-	x
  *	get_locks 		-	-	Called at attach time
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.277 2016/12/11 10:28:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.278 2016/12/13 17:12:51 christos Exp $");
 #include "audio.h"
 #if NAUDIO > 0
 #include <sys/types.h>
 #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/kmem.h>
 #include <sys/malloc.h>
 @@ -295,26 +295,28 @@ static void stream_filter_list_prepend
 	 const audio_params_t *);
 static void stream_filter_list_set
 	(stream_filter_list_t *, int, stream_filter_factory_t,
 	 const audio_params_t *);
 int	audio_set_defaults(struct audio_softc *, u_int, int);
 static int audio_sysctl_frequency(SYSCTLFN_PROTO);
 static int audio_sysctl_precision(SYSCTLFN_PROTO);
 static int audio_sysctl_channels(SYSCTLFN_PROTO);
 int	audioprobe(device_t, cfdata_t, void *);
 void	audioattach(device_t, device_t, void *);
 int	audiodetach(device_t, int);
 int	audioactivate(device_t, enum devact);
 void	audiochilddet(device_t, device_t);
 int	audiorescan(device_t, const char *, const int *);
 #ifdef AUDIO_PM_IDLE
 static void	audio_idle(void *);
 static void	audio_activity(device_t, devactive_t);
 #endif
 static bool	audio_suspend(device_t dv, const pmf_qual_t *);
 static bool	audio_resume(device_t dv, const pmf_qual_t *);
 static void	audio_volume_down(device_t);
 static void	audio_volume_up(device_t);
 static void	audio_volume_toggle(device_t);
 static void	audio_mixer_capture(struct audio_softc *);
 @@ -426,28 +428,28 @@ struct audio_params vchan_default = {
 	.channels = 2,
 };
 /* The default audio mode: 8 kHz mono mu-law */
 const struct audio_params audio_default = {
 	.sample_rate = 8000,
 	.encoding = AUDIO_ENCODING_ULAW,
 	.precision = 8,
 	.validbits = 8,
 	.channels = 1,
 };
 CFATTACH_DECL3_NEW(audio, sizeof(struct audio_softc),
-    audioprobe, audioattach, audiodetach, audioactivate, NULL, NULL,
+    audioprobe, audioattach, audiodetach, audioactivate, audiorescan,
-    DVF_DETACH_SHUTDOWN);
+    audiochilddet, DVF_DETACH_SHUTDOWN);
 extern struct cfdriver audio_cd;
 int
 audioprobe(device_t parent, cfdata_t match, void *aux)
+{
 	struct audio_attach_args *sa;
 	sa = aux;
 	DPRINTF(("audioprobe: type=%d sa=%p hw=%p\n",
 		 sa->type, sa, sa->hwif));
 	return (sa->type == AUDIODEV_TYPE_AUDIO) ? 1 : 0;
+}
 @@ -827,26 +829,27 @@ bad_rec:
 	    audio_volume_up, true))
 		aprint_error_dev(self, "couldn't add volume up handler\n");
 	if (!pmf_event_register(self, PMFE_AUDIO_VOLUME_TOGGLE,
 	    audio_volume_toggle, true))
 		aprint_error_dev(self, "couldn't add volume toggle handler\n");
 #ifdef AUDIO_PM_IDLE
 	callout_schedule(&sc->sc_idle_counter, audio_idle_timeout * hz);
 #endif
 	kthread_create(PRI_NONE, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL,
 	    audio_rec_thread, sc, &sc->sc_recthread, "audiorec");
 	kthread_create(PRI_NONE, KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL,
 	    audio_play_thread, sc, &sc->sc_playthread, "audiomix");
 	audiorescan(self, "audio", NULL);
+}
 int
 audioactivate(device_t self, enum devact act)
+{
 	struct audio_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		mutex_enter(sc->sc_lock);
 		sc->sc_dying = true;
 		mutex_exit(sc->sc_lock);
 		return 0;
 @@ -961,26 +964,57 @@ audiodetach(device_t self, int flags)
 #ifdef AUDIO_PM_IDLE
 	callout_destroy(&sc->sc_idle_counter);
 #endif
 	seldestroy(&sc->sc_rsel);
 	seldestroy(&sc->sc_wsel);
 	cv_destroy(&sc->sc_rchan);
 	cv_destroy(&sc->sc_wchan);
 	cv_destroy(&sc->sc_lchan);
 	return 0;
+}
 void
 audiochilddet(device_t self, device_t child)
+{
 	/* we hold no child references, so do nothing */
+}
 static int
 audiosearch(device_t parent, cfdata_t cf, const int *locs, void *aux)
+{
 	if (config_match(parent, cf, aux))
 		config_attach_loc(parent, cf, locs, aux, NULL);
 	return 0;
+}
 int
 audiorescan(device_t self, const char *ifattr, const int *flags)
+{
 	struct audio_softc *sc = device_private(self);
 	if (!ifattr_match(ifattr, "audio"))
 		return 0;
 	config_search_loc(audiosearch, sc->dev, "audio", NULL, NULL);
 	return 0;
+}
 int
 au_portof(struct audio_softc *sc, char *name, int class)
+{
 	mixer_devinfo_t mi;
 	for (mi.index = 0; audio_query_devinfo(sc, &mi) == 0; mi.index++) {
 		if (mi.mixer_class == class && strcmp(mi.label.name, name) == 0)
 			return mi.index;
+	}
 	return -1;
+}
 void