 @@ -1,14 +1,14 @@
-/* $NetBSD: pad.c,v 1.32 2017/06/01 09:44:30 pgoyette Exp $ */
+/* $NetBSD: pad.c,v 1.32.2.1 2017/06/10 06:05:47 snj 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.32 2017/06/01 09:44:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.32.2.1 2017/06/10 06:05:47 snj 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>
 @@ -312,51 +312,47 @@ pad_detach(device_t self, int flags)
 int
 pad_open(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	pad_softc_t *sc;
 	sc = device_lookup_private(&pad_cd, PADUNIT(dev));
 	if (sc == NULL)
 		return ENXIO;
 	if (atomic_swap_uint(&sc->sc_open, 1) != 0) {
 		return EBUSY;
+	}
 	getmicrotime(&sc->sc_last);
 	sc->sc_bytes_count = 0;
 	sc->sc_remainder = 0;
 	return 0;
+}
 int
 pad_close(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	pad_softc_t *sc;
 	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	    (PAD_BLKSIZE * 1000000 / PAD_BYTES_PER_SEC)
+#define BYTESTOSLEEP 	    (int64_t)(PAD_BLKSIZE)
-#define BYTESTOSLEEP 	    (PAD_BLKSIZE)
+#define TIMENEXTREAD	    (int64_t)(BYTESTOSLEEP * 1000000 / PAD_BYTES_PER_SEC)
 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));
 @@ -364,50 +360,46 @@ pad_read(dev_t dev, struct uio *uio, int
 		return ENXIO;
 	err = 0;
 	while (uio->uio_resid > 0 && !err) {
 		mutex_enter(&sc->sc_lock);
 		intr = sc->sc_intr;
 		intrarg = sc->sc_intrarg;
 		getmicrotime(&now);
 		nowusec = (now.tv_sec * 1000000) + now.tv_usec;
 		lastusec = (sc->sc_last.tv_sec * 1000000) +
 		     sc->sc_last.tv_usec;
-		if (lastusec + TIMENEXTREAD > nowusec &&
+		if (lastusec + TIMENEXTREAD > nowusec) {
-		     sc->sc_bytes_count >= BYTESTOSLEEP) {
+			if (sc->sc_bytes_count >= BYTESTOSLEEP) {
-			sc->sc_remainder +=
+				sc->sc_remainder +=
-			    ((lastusec + TIMENEXTREAD) - nowusec);
+				    ((lastusec + TIMENEXTREAD) - nowusec);
+			}
 			wait_ticks = (hz * sc->sc_remainder) / 1000000;
 			if (wait_ticks > 0) {
 				sc->sc_remainder -= wait_ticks * 1000000 / hz;
 				kpause("padwait", TRUE, wait_ticks,
 				    &sc->sc_lock);
+			}
+		}
 		if (sc->sc_bytes_count >= BYTESTOSLEEP)
 			sc->sc_bytes_count -= BYTESTOSLEEP;
 			getmicrotime(&sc->sc_last);
 		} else if (sc->sc_bytes_count >= BYTESTOSLEEP) {
 			sc->sc_bytes_count -= BYTESTOSLEEP;
 			getmicrotime(&sc->sc_last);
 		} else if (lastusec + TIMENEXTREAD <= nowusec) {
 			getmicrotime(&sc->sc_last);
 			sc->sc_remainder = 0;
 		err = pad_get_block(sc, &pb, min(uio->uio_resid, PAD_BLKSIZE));
 		if (!err) {
 			getmicrotime(&sc->sc_last);
 			sc->sc_bytes_count += pb.pb_len;
 			mutex_exit(&sc->sc_lock);
 			err = uiomove(pb.pb_ptr, pb.pb_len, uio);
 			continue;
+		}
 		if (intr) {
 			mutex_enter(&sc->sc_intr_lock);
 			kpreempt_disable();
 			(*intr)(intrarg);
 			kpreempt_enable();
 			mutex_exit(&sc->sc_intr_lock);
 			intr = sc->sc_intr;
 @@ -428,26 +420,27 @@ pad_read(dev_t dev, struct uio *uio, int
 	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);
 	sc->sc_bytes_count = 0;
 	sc->sc_remainder = 0;
 	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));

 @@ -1,14 +1,14 @@
-/* $NetBSD: padvar.h,v 1.8 2017/05/27 10:02:26 nat Exp $ */
+/* $NetBSD: padvar.h,v 1.8.2.1 2017/06/10 06:05:47 snj 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.
 @@ -34,26 +34,26 @@ typedef struct pad_softc {
 	u_int		sc_open;
 	struct audio_encoding_set *sc_encodings;
 	void		(*sc_intr)(void *);
 	void		*sc_intrarg;
 	kcondvar_t	sc_condvar;
 	kmutex_t	sc_lock;
 	kmutex_t	sc_intr_lock;
 	struct audio_softc *sc_audiodev;
 	int		sc_blksize;
-#define PAD_BLKSIZE	1024
+#define PAD_BLKSIZE	8192
 #define PAD_BUFSIZE	65536
 	uint8_t		sc_audiobuf[PAD_BUFSIZE];
 	uint32_t	sc_buflen;
 	uint32_t	sc_rpos, sc_wpos;
 	uint8_t		sc_swvol;
 	struct timeval	sc_last;
 	int		sc_bytes_count;
 	uint32_t	sc_remainder;
 } pad_softc_t;
 #endif /* !_SYS_DEV_PAD_PADVAR_H */