diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/pdqreg.h | 8 | ||||
| -rw-r--r-- | sys/dev/pci/viaenv.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/ic/pdqreg.h b/sys/dev/ic/pdqreg.h index 7cbe3c66d63..2fe19c1ac3a 100644 --- a/sys/dev/ic/pdqreg.h +++ b/sys/dev/ic/pdqreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pdqreg.h,v 1.9 2002/06/02 22:50:00 deraadt Exp $ */ +/* $OpenBSD: pdqreg.h,v 1.10 2009/06/06 19:21:33 jasper Exp $ */ /* $NetBSD: pdqreg.h,v 1.6 1996/08/28 16:01:29 cgd Exp $ */ /*- @@ -54,11 +54,9 @@ #define PDQ_ASSERT(e) ((void)0) #else #ifdef __STDC__ -#define PDQ_ASSERT(e) ((e) ? (void)0 : \ - __assert("PDQ ", __FILE__, __LINE__, #e)) +#define PDQ_ASSERT(e) KASSERT(e) #else -#define PDQ_ASSERT(e) ((e) ? (void)0 : \ - __assert("PDQ ", __FILE__, __LINE__, "e")) +#define PDQ_ASSERT(e) KASSERT(e) #endif #endif #endif /* __NetBSD__ || __OpenBSD__ */ diff --git a/sys/dev/pci/viaenv.c b/sys/dev/pci/viaenv.c index 30e462696fb..a241b7996b0 100644 --- a/sys/dev/pci/viaenv.c +++ b/sys/dev/pci/viaenv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viaenv.c,v 1.12 2009/03/29 21:53:52 sthen Exp $ */ +/* $OpenBSD: viaenv.c,v 1.13 2009/06/06 19:21:33 jasper Exp $ */ /* $NetBSD: viaenv.c,v 1.9 2002/10/02 16:51:59 thorpej Exp $ */ /* @@ -168,7 +168,7 @@ val_to_uK(unsigned int val) int i = val / 4; int j = val % 4; - assert(i >= 0 && i <= 255); + KASSERT(i >= 0 && i <= 255); if (j == 0 || i == 255) return val_to_temp[i] * 10000; @@ -194,7 +194,7 @@ val_to_uV(unsigned int val, int index) static const long mult[] = {1250000, 1250000, 1670000, 2600000, 6300000}; - assert(index >= 0 && index <= 4); + KASSERT(index >= 0 && index <= 4); return (25LL * val + 133) * mult[index] / 2628; } |