From 4f2068ec296f0204b11b5801ea7302d7da95681e Mon Sep 17 00:00:00 2001 From: augustss Date: Tue, 7 Oct 1997 22:40:43 +0000 Subject: [PATCH] Sanity check hi/lo water mark settings better. --- sys/dev/audio.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 9e51f24a667e..10af11976c50 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.71 1997/09/06 01:14:48 augustss Exp $ */ +/* $NetBSD: audio.c,v 1.72 1997/10/07 22:40:43 augustss Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -2154,8 +2154,8 @@ audiosetinfo(sc, ai) blks = ai->hiwat; if (blks > sc->sc_pr.maxblks) blks = sc->sc_pr.maxblks; - if (blks < 1) - blks = 1; + if (blks < 2) + blks = 2; sc->sc_pr.usedhigh = blks * sc->sc_pr.blksize; } if (ai->lowat != ~0) { @@ -2164,6 +2164,10 @@ audiosetinfo(sc, ai) blks = sc->sc_pr.maxblks - 1; sc->sc_pr.usedlow = blks * sc->sc_pr.blksize; } + if (ai->hiwat != ~0 || ai->lowat != ~0) { + if (sc->sc_pr.usedlow > sc->sc_pr.usedhigh - sc->sc_pr.blksize) + sc->sc_pr.usedlow = sc->sc_pr.usedhigh - sc->sc_pr.blksize; + } return (0); }