diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-04-15 13:05:15 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-04-15 13:05:15 +0000 |
| commit | ed13c9664b994c0ddb156c715cf792f1b37289b1 (patch) | |
| tree | f81d31a3cbff5f5f2034801acc087230736ec159 /sys/dev | |
| parent | bee6b17d20ce07473a4628b85fef532562745a0d (diff) | |
make sure aligment does not return zero block size
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/ad1848.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/ess.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/sbdsp.c | 4 | ||||
| -rw-r--r-- | sys/dev/sbus/cs4231.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c index 0d7b943187a..13379dc5ab2 100644 --- a/sys/dev/isa/ad1848.c +++ b/sys/dev/isa/ad1848.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ad1848.c,v 1.30 2004/01/09 21:32:23 brad Exp $ */ +/* $OpenBSD: ad1848.c,v 1.31 2005/04/15 13:05:14 mickey Exp $ */ /* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */ /* @@ -1156,7 +1156,7 @@ ad1848_round_blocksize(addr, blk) sc->sc_lastcc = -1; /* Round to a multiple of the biggest sample size. */ - blk &= -4; + blk = (blk + 3) & -4; return (blk); } diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c index 64ce29bce11..b0d41bffd1e 100644 --- a/sys/dev/isa/ess.c +++ b/sys/dev/isa/ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ess.c,v 1.9 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: ess.c,v 1.10 2005/04/15 13:05:14 mickey Exp $ */ /* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */ /* @@ -1661,7 +1661,7 @@ ess_round_blocksize(addr, blk) void *addr; int blk; { - return (blk & -8); /* round for max DMA size */ + return ((blk + 7) & -8); /* round for max DMA size */ } int diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c index b97e2fb5374..6f56edfc746 100644 --- a/sys/dev/isa/sbdsp.c +++ b/sys/dev/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbdsp.c,v 1.23 2004/01/09 21:32:24 brad Exp $ */ +/* $OpenBSD: sbdsp.c,v 1.24 2005/04/15 13:05:14 mickey Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -851,7 +851,7 @@ sbdsp_round_blocksize(addr, blk) void *addr; int blk; { - return blk & -4; /* round to biggest sample size */ + return (blk + 3) & -4; /* round to biggest sample size */ } int diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c index caddbc5848b..70a8c50dea3 100644 --- a/sys/dev/sbus/cs4231.c +++ b/sys/dev/sbus/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.24 2005/03/08 21:35:03 miod Exp $ */ +/* $OpenBSD: cs4231.c,v 1.25 2005/04/15 13:05:14 mickey Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -651,7 +651,7 @@ cs4231_set_params(void *vsc, int setmode, int usemode, int cs4231_round_blocksize(void *vsc, int blk) { - return (blk & (-4)); + return ((blk + 3) & (-4)); } int |