 @@ -1,14 +1,14 @@
-/* $NetBSD: pad.c,v 1.78 2022/03/31 19:30:16 pgoyette Exp $ */
+/* $NetBSD: pad.c,v 1.79 2023/01/24 08:17:11 mlelstv 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.78 2022/03/31 19:30:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.79 2023/01/24 08:17:11 mlelstv Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/audioio.h>
 #include <sys/buf.h>
 #include <sys/condvar.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 @@ -138,27 +138,27 @@ static const struct audio_format pad_for
 		.encoding	= AUDIO_ENCODING_SLINEAR_LE,
 		.validbits	= PADPREC,
 		.precision	= PADPREC,
 		.channels	= PADCHAN,
 		.channel_mask	= AUFMT_STEREO,
 		.frequency_type	= 1,
 		.frequency	= { PADFREQ },
 	},
 };
 extern void	padattach(int);
 static int	pad_add_block(struct pad_softc *, uint8_t *, int);
-static int	pad_get_block(struct pad_softc *, pad_block_t *, int);
+static int	pad_get_block(struct pad_softc *, pad_block_t *, int, int);
 static dev_type_open(pad_open);
 const struct cdevsw pad_cdevsw = {
 	.d_open		= pad_open,
 	.d_close	= noclose,
 	.d_read		= noread,
 	.d_write	= nowrite,
 	.d_ioctl	= noioctl,
 	.d_stop		= nostop,
 	.d_tty		= notty,
 	.d_poll		= nopoll,
 	.d_mmap		= nommap,
 @@ -270,61 +270,73 @@ static void
 pad_childdet(device_t self, device_t child)
+{
 	struct pad_softc *sc = device_private(self);
 	KASSERT(KERNEL_LOCKED_P());
 	if (child == sc->sc_audiodev)
 		sc->sc_audiodev = NULL;
+}
 static int
 pad_add_block(struct pad_softc *sc, uint8_t *blk, int blksize)
+{
-	int l;
+	int foff, flen, tlen;
 	KASSERT(blksize >= 0);
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	if (blksize > PAD_BUFSIZE ||
 	    sc->sc_buflen > PAD_BUFSIZE - (unsigned)blksize)
 		return ENOBUFS;
-	if (sc->sc_wpos + blksize <= PAD_BUFSIZE)
+	foff = sc->sc_wpos;
-		memcpy(sc->sc_audiobuf + sc->sc_wpos, blk, blksize);
+	if (sc->sc_wpos + blksize <= PAD_BUFSIZE) {
-	else {
+		flen = blksize;
-		l = PAD_BUFSIZE - sc->sc_wpos;
+		tlen = 0;
-		memcpy(sc->sc_audiobuf + sc->sc_wpos, blk, l);
+	} else {
-		memcpy(sc->sc_audiobuf, blk + l, blksize - l);
+		flen = PAD_BUFSIZE - sc->sc_wpos;
 		tlen = blksize - flen;
+	}
-	sc->sc_wpos += blksize;
+	sc->sc_wpos = foff + blksize;
 	if (sc->sc_wpos >= PAD_BUFSIZE)
 		sc->sc_wpos -= PAD_BUFSIZE;
 	/*
 	 * release interrupt lock for bulk copy to audio buffer
 	 */
 	mutex_exit(&sc->sc_intr_lock);
 	memcpy(sc->sc_audiobuf + foff, blk, flen);
 	memcpy(sc->sc_audiobuf, blk + flen, tlen);
 	mutex_enter(&sc->sc_intr_lock);
 	sc->sc_buflen += blksize;
 	cv_broadcast(&sc->sc_condvar);
 	return 0;
+}
 static int
-pad_get_block(struct pad_softc *sc, pad_block_t *pb, int maxblksize)
+pad_get_block(struct pad_softc *sc, pad_block_t *pb, int maxblksize, int dowait)
+{
 	int l, blksize, error;
 	KASSERT(maxblksize > 0);
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	if (sc->sc_buflen == 0 && !dowait)
 		return EAGAIN;
 	while (sc->sc_buflen == 0) {
 		DPRINTF("%s: wait\n", __func__);
 		error = cv_wait_sig(&sc->sc_condvar, &sc->sc_intr_lock);
 		DPRINTF("%s: wake up %d\n", __func__, err);
 		if (error)
 			return error;
+	}
 	blksize = uimin(maxblksize, sc->sc_buflen);
 	pb->pb_ptr = (sc->sc_audiobuf + sc->sc_rpos);
 	if (sc->sc_rpos + blksize < PAD_BUFSIZE) {
 		pb->pb_len = blksize;
 		sc->sc_rpos += blksize;
 @@ -490,34 +502,40 @@ static int
 fops_pad_read(struct file *fp, off_t *offp, struct uio *uio, kauth_cred_t cred,
     int ioflag)
+{
 	struct pad_softc *sc = fp->f_pad;
 	return pad_read(sc, offp, uio, cred, ioflag);
+}
 static int
 pad_read(struct pad_softc *sc, off_t *offp, struct uio *uio, kauth_cred_t cred,
     int ioflag)
+{
 	pad_block_t pb;
-	int err;
+	int err, first;
 	err = 0;
 	first = 1;
 	DPRINTF("%s: resid=%zu\n", __func__, uio->uio_resid);
 	while (uio->uio_resid > 0) {
 		mutex_enter(&sc->sc_intr_lock);
-		err = pad_get_block(sc, &pb, MIN(uio->uio_resid, INT_MAX));
+		err = pad_get_block(sc, &pb, MIN(uio->uio_resid, INT_MAX), first);
 		mutex_exit(&sc->sc_intr_lock);
 		first = 0;
 		if (err == EAGAIN) {
 			err = 0;
 			break;
+		}
 		if (err)
 			break;
 		DPRINTF("%s: move %d\n", __func__, pb.pb_len);
 		err = uiomove(pb.pb_ptr, pb.pb_len, uio);
 		if (err)
 			break;
+	}
 	return err;
+}
 static int
 @@ -547,56 +565,68 @@ pad_set_format(void *opaque, int setmode
 	/* XXX playback only */
 	pfil->codec = pad_swvol_codec;
 	pfil->context = sc;
 	return 0;
+}
 static int
 pad_start_output(void *opaque, void *block, int blksize,
     void (*intr)(void *), void *intrarg)
+{
 	struct pad_softc *sc = opaque;
 	int err;
-	int ms;
+	u_int framesize;
 	int ticks;
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	sc->sc_intr = intr;
 	sc->sc_intrarg = intrarg;
 	DPRINTF("%s: blksize=%d\n", __func__, blksize);
 	err = pad_add_block(sc, block, blksize);
 	if (err) {
 		DPRINTF("%s: failed: %d\n", __func__, err);
 		/* "Silently" drop overflows, but keep pace */
 		err = 0;
+	}
 	framesize = PADCHAN * (PADPREC / NBBY) * PADFREQ;
 	sc->sc_resid += blksize;
 	ticks = mstohz(sc->sc_resid * 1000 / framesize);
 	sc->sc_resid -= hztoms(ticks) * framesize / 1000;
 	ms = blksize * 1000 / PADCHAN / (PADPREC / NBBY) / PADFREQ;
 	DPRINTF("%s: callout ms=%d\n", __func__, ms);
-	callout_schedule(&sc->sc_pcallout, mstohz(ms));
+	callout_schedule(&sc->sc_pcallout, ticks);
 	return err;
+}
 static int
 pad_halt_output(void *opaque)
+{
 	struct pad_softc *sc = opaque;
 	DPRINTF("%s\n", __func__);
 	KASSERT(mutex_owned(&sc->sc_intr_lock));
 	callout_halt(&sc->sc_pcallout, &sc->sc_intr_lock);
 	sc->sc_intr = NULL;
 	sc->sc_intrarg = NULL;
 	sc->sc_buflen = 0;
 	sc->sc_resid = 0;
 	sc->sc_rpos = sc->sc_wpos = 0;
 	return 0;
+}
 static void
 pad_done_output(void *arg)
+{
 	struct pad_softc *sc = arg;
 	DPRINTF("%s\n", __func__);
 	mutex_enter(&sc->sc_intr_lock);

 @@ -1,14 +1,14 @@
-/* $NetBSD: padvar.h,v 1.16 2021/06/14 18:44:45 riastradh Exp $ */
+/* $NetBSD: padvar.h,v 1.17 2023/01/24 08:17:11 mlelstv 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.
 @@ -47,16 +47,18 @@ struct pad_softc {
 	kmutex_t	sc_lock;
 	kmutex_t	sc_intr_lock;
 	callout_t	sc_pcallout;
 	device_t	sc_audiodev;
 #define PAD_BUFSIZE	65536
 	uint8_t		sc_audiobuf[PAD_BUFSIZE];
 	u_int		sc_buflen;
 	u_int		sc_rpos;
 	u_int		sc_wpos;
 	uint8_t		sc_swvol;
 	u_int		sc_resid;
 };
 #endif /* !_SYS_DEV_PAD_PADVAR_H */