diff options
| -rw-r--r-- | sys/dev/pci/auich.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/autri.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/auvia.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/cmpci.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/eap.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/eso.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/fms.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/maestro.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/sv.c | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 656940bf833..b1880c5ac72 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auich.c,v 1.51 2005/04/05 21:08:47 marc Exp $ */ +/* $OpenBSD: auich.c,v 1.52 2005/04/14 12:42:16 mickey Exp $ */ /* * Copyright (c) 2000,2001 Michael Shalayeff @@ -906,7 +906,7 @@ auich_round_blocksize(v, blk) void *v; int blk; { - return blk & ~0x3f; + return (blk + 0x3f) & ~0x3f; } int diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index c57514c16bf..84606381a42 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autri.c,v 1.13 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: autri.c,v 1.14 2005/04/14 12:42:16 mickey Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -1048,7 +1048,7 @@ autri_round_blocksize(addr, block) void *addr; int block; { - return (block & -4); + return ((block + 3) & -4); } int diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 7cb0109082f..1b3a2cfa51b 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auvia.c,v 1.30 2005/04/11 19:31:43 matthieu Exp $ */ +/* $OpenBSD: auvia.c,v 1.31 2005/04/14 12:42:16 mickey Exp $ */ /* $NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $ */ /*- @@ -626,7 +626,7 @@ auvia_set_params(void *addr, int setmode, int usemode, int auvia_round_blocksize(void *addr, int blk) { - return (blk & -32); + return ((blk + 31) & -32); } diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index 90126e89b0f..4be9ca505d2 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.12 2003/09/09 03:42:19 kevlo Exp $ */ +/* $OpenBSD: cmpci.c,v 1.13 2005/04/14 12:42:16 mickey Exp $ */ /* * Copyright (c) 2000 Takuya SHIOZAKI @@ -725,7 +725,7 @@ cmpci_round_blocksize(handle, block) void *handle; int block; { - return (block & -4); + return ((block + 3) & -4); } int diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index f53a41bec41..5e73a993835 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.23 2004/12/17 08:04:45 jsg Exp $ */ +/* $OpenBSD: eap.c,v 1.24 2005/04/14 12:42:16 mickey Exp $ */ /* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */ /* @@ -1051,7 +1051,7 @@ eap_set_params(void *addr, int setmode, int usemode, int eap_round_blocksize(void *addr, int blk) { - return (blk & -32); /* keep good alignment */ + return ((blk + 31) & -32); /* keep good alignment */ } int diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index 8e9d95a2e05..1badaa5aaba 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.20 2003/05/01 22:44:21 jason Exp $ */ +/* $OpenBSD: eso.c,v 1.21 2005/04/14 12:42:16 mickey Exp $ */ /* $NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $ */ /* @@ -824,7 +824,7 @@ eso_round_blocksize(hdl, blk) int blk; { - return (blk & -32); /* keep good alignment; at least 16 req'd */ + return ((blk + 31) & -32); /* keep good alignment; at least 16 req'd */ } HIDE int diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index 921bfccb6fe..bb5ed48c195 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.15 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: fms.c,v 1.16 2005/04/14 12:42:16 mickey Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -641,7 +641,7 @@ fms_round_blocksize(addr, blk) void *addr; int blk; { - return blk & ~0xf; + return (blk + 0xf) & ~0xf; } int diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index 866ba27a9c3..98d77d80729 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.16 2003/06/06 02:56:39 fgsch Exp $ */ +/* $OpenBSD: maestro.c,v 1.17 2005/04/14 12:42:16 mickey Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -567,7 +567,7 @@ maestro_round_blocksize(self, blk) void *self; int blk; { - return (blk & ~0xf); + return ((blk + 0xf) & ~0xf); } size_t diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index f183ffe674e..3d46f04181f 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sv.c,v 1.16 2003/04/27 11:22:54 ho Exp $ */ +/* $OpenBSD: sv.c,v 1.17 2005/04/14 12:42:16 mickey Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -813,7 +813,7 @@ sv_round_blocksize(addr, blk) void *addr; int blk; { - return (blk & -32); /* keep good alignment */ + return ((blk + 31) & -32); /* keep good alignment */ } int |