From fbbeb4d0617c1eddc2fbcd9dbe0a7cb1c5bbbcf1 Mon Sep 17 00:00:00 2001 From: nat Date: Sat, 11 Feb 2017 08:36:30 +0000 Subject: [PATCH] Audio passed the atf test again. --- sys/dev/audio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 26f200c88178..5ec0fa5fb352 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -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 @@ -148,7 +148,7 @@ */ #include -__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 audio_ringbuffer *cb, 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, struct audio_ringbuffer *cb, 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, struct audio_ringbuffer *cb, 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)