Module Name: src Committed By: nat Date: Sat Feb 11 08:36:31 UTC 2017
Modified Files: src/sys/dev: audio.c Log Message: Audio passed the atf test again. To generate a diff of this commit: cvs rdiff -u -r1.302 -r1.303 src/sys/dev/audio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/audio.c diff -u src/sys/dev/audio.c:1.302 src/sys/dev/audio.c:1.303 --- src/sys/dev/audio.c:1.302 Fri Feb 10 19:31:42 2017 +++ src/sys/dev/audio.c Sat Feb 11 08:36:30 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.302 2017/02/10 19:31:42 nat Exp $ */ +/* $NetBSD: audio.c,v 1.303 2017/02/11 08:36:30 nat Exp $ */ /*- * Copyright (c) 2016 Nathanial Sloss <nathanialsl...@yahoo.com.au> @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.302 2017/02/10 19:31:42 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.303 2017/02/11 08:36:30 nat Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -5526,7 +5526,7 @@ mix_func8(struct audio_softc *sc, struct for (m = 0; m < cc; m++) { orig[m] += (int8_t)((int32_t)(tomix[m] * (vc->sc_swvol + 1)) / (sc->sc_opens * - 255)); + 256)); } if (&orig[m] >= (int8_t *)sc->sc_pr.s.end) @@ -5563,7 +5563,7 @@ mix_func16(struct audio_softc *sc, struc for (m = 0; m < cc / 2; m++) { orig[m] += (int16_t)((int32_t)(tomix[m] * (vc->sc_swvol + 1)) / (sc->sc_opens * - 255)); + 256)); } if (&orig[m] >= (int16_t *)sc->sc_pr.s.end) @@ -5600,7 +5600,7 @@ mix_func32(struct audio_softc *sc, struc for (m = 0; m < cc / 4; m++) { orig[m] += (int32_t)((int32_t)(tomix[m] * (vc->sc_swvol + 1)) / (sc->sc_opens * - 255)); + 256)); } if (&orig[m] >= (int32_t *)sc->sc_pr.s.end)