 @@ -1,14 +1,14 @@
-/* $NetBSD: pad.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: pad.c,v 1.26 2016/10/15 07:08:06 nat Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -17,27 +17,27 @@
  * ``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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.26 2016/10/15 07:08:06 nat Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/condvar.h>
 #include <sys/select.h>
 #include <sys/audioio.h>
 #include <sys/vnode.h>
 @@ -64,51 +64,53 @@ typedef struct pad_block {
 enum {
 	PAD_OUTPUT_CLASS,
 	PAD_INPUT_CLASS,
 	PAD_OUTPUT_MASTER_VOLUME,
 	PAD_INPUT_DAC_VOLUME,
 	PAD_ENUM_LAST,
 };
 static int	pad_match(device_t, cfdata_t, void *);
 static void	pad_attach(device_t, device_t, void *);
 static int	pad_detach(device_t, int);
 static void	pad_childdet(device_t, device_t);
 static int	pad_audio_open(void *, int);
 static int	pad_query_encoding(void *, struct audio_encoding *);
 static int	pad_set_params(void *, int, int,
 				audio_params_t *, audio_params_t *,
 				stream_filter_list_t *, stream_filter_list_t *);
 static int	pad_start_output(void *, void *, int,
 				    void (*)(void *), void *);
 static int	pad_start_input(void *, void *, int,
 				   void (*)(void *), void *);
 static int	pad_halt_output(void *);
 static int	pad_halt_input(void *);
 static int	pad_getdev(void *, struct audio_device *);
 static int	pad_set_port(void *, mixer_ctrl_t *);
 static int	pad_get_port(void *, mixer_ctrl_t *);
 static int	pad_query_devinfo(void *, mixer_devinfo_t *);
 static int	pad_get_props(void *);
 static int	pad_round_blocksize(void *, int, int, const audio_params_t *);
 static void	pad_get_locks(void *, kmutex_t **, kmutex_t **);
 static stream_filter_t *pad_swvol_filter_le(struct audio_softc *,
     const audio_params_t *, const audio_params_t *);
 static stream_filter_t *pad_swvol_filter_be(struct audio_softc *,
     const audio_params_t *, const audio_params_t *);
 static void	pad_swvol_dtor(stream_filter_t *);
 static const struct audio_hw_if pad_hw_if = {
 	.open = pad_audio_open,
 	.query_encoding = pad_query_encoding,
 	.set_params = pad_set_params,
 	.start_output = pad_start_output,
 	.start_input = pad_start_input,
 	.halt_output = pad_halt_output,
 	.halt_input = pad_halt_input,
 	.getdev = pad_getdev,
 	.set_port = pad_set_port,
 	.get_port = pad_get_port,
 	.query_devinfo = pad_query_devinfo,
 	.get_props = pad_get_props,
 	.round_blocksize = pad_round_blocksize,
 	.get_locks = pad_get_locks,
 @@ -331,27 +333,27 @@ pad_close(dev_t dev, int flags, int fmt,
 	sc = device_lookup_private(&pad_cd, PADUNIT(dev));
 	if (sc == NULL)
 		return ENXIO;
 	KASSERT(sc->sc_open > 0);
 	sc->sc_open = 0;
 	return 0;
+}
 #define PAD_BYTES_PER_SEC (44100 * sizeof(int16_t) * 2)
 #define TIMENEXTREAD	(20 * 1000)
-#define BYTESTOSLEEP (PAD_BYTES_PER_SEC / (1000000 / TIMENEXTREAD))
+#define BYTESTOSLEEP ((PAD_BYTES_PER_SEC / (1000000 / TIMENEXTREAD)) + PAD_BLKSIZE)
 int
 pad_read(dev_t dev, struct uio *uio, int flags)
+{
 	struct timeval now;
 	uint64_t nowusec, lastusec;
 	pad_softc_t *sc;
 	pad_block_t pb;
 	void (*intr)(void *);
 	void *intrarg;
 	int err, wait_ticks;
 	sc = device_lookup_private(&pad_cd, PADUNIT(dev));
 @@ -410,26 +412,39 @@ pad_read(dev_t dev, struct uio *uio, int
 		err = cv_wait_sig(&sc->sc_condvar, &sc->sc_lock);
 		if (err != 0)
 			break;
 		intr = sc->sc_intr;
 		intrarg = sc->sc_intrarg;
+	}
 	mutex_exit(&sc->sc_lock);
 	return err;
+}
 static int
 pad_audio_open(void *opaque, int flags)
+{
 	pad_softc_t *sc;
 	sc = opaque;
 	if (sc->sc_open == 0)
 		return EIO;
 	getmicrotime(&sc->sc_last);
 	return 0;
+}
 static int
 pad_query_encoding(void *opaque, struct audio_encoding *ae)
+{
 	pad_softc_t *sc;
 	sc = (pad_softc_t *)opaque;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	return auconv_query_encoding(sc->sc_encodings, ae);
+}
 static int
 pad_set_params(void *opaque, int setmode, int usemode,
 @@ -467,26 +482,28 @@ pad_set_params(void *opaque, int setmode
 	return 0;
+}
 static int
 pad_start_output(void *opaque, void *block, int blksize,
     void (*intr)(void *), void *intrarg)
+{
 	pad_softc_t *sc;
 	int err;
 	sc = (pad_softc_t *)opaque;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	if (!sc->sc_open)
 		return EIO;
 	sc->sc_intr = intr;
 	sc->sc_intrarg = intrarg;
 	sc->sc_blksize = blksize;
 	err = pad_add_block(sc, block, blksize);
 	cv_broadcast(&sc->sc_condvar);
 	return err;
+}
 static int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: h_pad.c,v 1.1 2010/08/04 13:15:15 pooka Exp $	*/
+/*	$NetBSD: h_pad.c,v 1.2 2016/10/15 07:08:06 nat Exp $	*/
 /*
  * Copyright (c) 2010 Antti Kantee.  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.
+ *
 @@ -46,31 +46,31 @@
  */
 #define BUFSIZE 1024
 int
 main(int argc, char *argv[])
+{
 	char buf[BUFSIZE];
 	char zeros[BUFSIZE];
 	int padfd, audiofd;
 	ssize_t n;
 	rump_init();
 	audiofd = rump_sys_open("/dev/audio0", O_RDWR);
 	if (audiofd == -1)
 		err(1, "open audio");
 	padfd = rump_sys_open("/dev/pad0", O_RDONLY);
 	if (padfd == -1)
 		err(1, "open pad");
 	audiofd = rump_sys_open("/dev/audio0", O_RDWR);
 	if (audiofd == -1)
 		err(1, "open audio");
 	if ((n = rump_sys_write(audiofd, musa, sizeof(musa))) != sizeof(musa))
 		err(1, "write");
 	memset(zeros, 0, sizeof(zeros));
 	while ((n = rump_sys_read(padfd, buf, sizeof(buf))) > 0) {
 		if (memcmp(buf, zeros, sizeof(buf)) == 0)
 			break;
 		write(STDOUT_FILENO, buf, n);
+	}
+}