 @@ -1,14 +1,14 @@
-/*	$NetBSD: spkr.c,v 1.7 2017/06/01 09:44:30 pgoyette Exp $	*/
+/*	$NetBSD: spkr.c,v 1.7.2.1 2023/08/01 13:05:57 martin Exp $	*/
 /*
  * Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com)
  * Copyright (c) 1990 Andrew A. Chernov (ache@astral.msk.su)
  * Copyright (c) 1990 Lennart Augustsson (lennart@augustsson.net)
  * 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
 @@ -33,27 +33,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * spkr.c -- device driver for console speaker on 80386
+ *
  * v1.1 by Eric S. Raymond (esr@snark.thyrsus.com) Feb 1990
  *      modified for 386bsd by Andrew A. Chernov <ache@astral.msk.su>
  *      386bsd only clean version, all SYSV stuff removed
  *      use hz value from param.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.7 2017/06/01 09:44:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.7.2.1 2023/08/01 13:05:57 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/uio.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 @@ -154,51 +154,56 @@ playtone(struct spkr_softc *sc, int pitc
 	int sound, silence, snum = 1, sdenom = 1;
 	/* this weirdness avoids floating-point arithmetic */
 	for (; sustain; sustain--) {
 		snum *= NUM_MULT;
 		sdenom *= DENOM_MULT;
+	}
 	if (pitch == -1) {
 		(*sc->sc_rest)(sc->sc_dev, sc->sc_whole
 		    * snum / (val * sdenom));
 		return;
+	}
 	KASSERTMSG(pitch < __arraycount(pitchtab), "pitch=%d", pitch);
 	int fac = sc->sc_whole * (FILLTIME - sc->sc_fill);
 	int fval = FILLTIME * val;
 	sound = (sc->sc_whole * snum) / (val * sdenom) -  fac / fval;
 	silence = fac * snum / (fval * sdenom);
 #ifdef SPKRDEBUG
 	aprint_debug_dev(sc->sc_dev,
 	    "%s: pitch %d for %d ticks, rest for %d ticks\n", __func__,
 	    pitch, sound, silence);
 #endif /* SPKRDEBUG */
 	(*sc->sc_tone)(sc->sc_dev, pitchtab[pitch], sound);
 	if (sc->sc_fill != LEGATO)
 		(*sc->sc_rest)(sc->sc_dev, silence);
+}
 /* interpret and play an item from a notation string */
 static void
 playstring(struct spkr_softc *sc, const char *cp, size_t slen)
+{
 	int		pitch, lastpitch = OCTAVE_NOTES * DFLT_OCTAVE;
 #define GETNUM(cp, v)	\
 	for (v = 0; slen > 0 && isdigit((unsigned char)cp[1]); ) { \
 		if (v > INT_MAX/10 - (cp[1] - '0')) { \
 			v = INT_MAX; \
 			continue; \
 		} \
 		v = v * 10 + (*++cp - '0'); \
 		slen--; \
+	}
 	for (; slen--; cp++) {
 		int sustain, timeval, tempo;
 		char c = toupper((unsigned char)*cp);
 #ifdef SPKRDEBUG
 		aprint_debug_dev(sc->sc_dev, "%s: %c (%x)\n", __func__, c, c);
 #endif /* SPKRDEBUG */
 		switch (c) {
 @@ -262,46 +267,51 @@ playstring(struct spkr_softc *sc, const
 			break;
 		case 'O':
 			if (slen > 0 && (cp[1] == 'N' || cp[1] == 'n')) {
 				sc->sc_octprefix = sc->sc_octtrack = false;
 				++cp;
 				slen--;
 			} else if (slen > 0 && (cp[1] == 'L' || cp[1] == 'l')) {
 				sc->sc_octtrack = true;
 				++cp;
 				slen--;
 			} else {
 				GETNUM(cp, sc->sc_octave);
 				KASSERTMSG(sc->sc_octave >= 0, "%d",
 				    sc->sc_octave);
 				if (sc->sc_octave >= NOCTAVES)
 					sc->sc_octave = DFLT_OCTAVE;
 				sc->sc_octprefix = true;
+			}
 			break;
 		case '>':
 			if (sc->sc_octave < NOCTAVES - 1)
 				sc->sc_octave++;
 			sc->sc_octprefix = true;
 			break;
 		case '<':
 			if (sc->sc_octave > 0)
 				sc->sc_octave--;
 			sc->sc_octprefix = true;
 			break;
 		case 'N':
 			GETNUM(cp, pitch);
 			KASSERTMSG(pitch >= 0, "pitch=%d", pitch);
 			if (pitch >= __arraycount(pitchtab))
 				break;
 			for (sustain = 0; slen > 0 && cp[1] == '.'; cp++) {
 				slen--;
 				sustain++;
+			}
 			playtone(sc, pitch - 1, sc->sc_value, sustain);
 			break;
 		case 'L':
 			GETNUM(cp, sc->sc_value);
 			if (sc->sc_value <= 0 || sc->sc_value > MIN_VALUE)
 				sc->sc_value = DFLT_VALUE;
 			break;