diff options
| -rw-r--r-- | sys/arch/arm/include/bus.h | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/include/bus.h | 4 | ||||
| -rw-r--r-- | sys/arch/landisk/include/bus.h | 35 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/include/bus_mi.h | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/include/bus.h | 4 | ||||
| -rw-r--r-- | sys/arch/vax/include/bus.h | 28 |
6 files changed, 6 insertions, 73 deletions
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h index b2b2e80bbff..11711199a6a 100644 --- a/sys/arch/arm/include/bus.h +++ b/sys/arch/arm/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.6 2006/05/27 20:36:05 miod Exp $ */ +/* $OpenBSD: bus.h,v 1.7 2007/04/10 18:02:46 miod Exp $ */ /* $NetBSD: bus.h,v 1.12 2003/10/23 15:03:24 scw Exp $ */ /*- @@ -752,8 +752,6 @@ bs_c_2_proto(f); \ bs_c_4_proto(f); \ bs_c_8_proto(f); -#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) - /* Bus Space DMA macros */ /* diff --git a/sys/arch/hp300/include/bus.h b/sys/arch/hp300/include/bus.h index 2f00e5a124b..03873941e21 100644 --- a/sys/arch/hp300/include/bus.h +++ b/sys/arch/hp300/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.4 2007/01/06 20:11:01 miod Exp $ */ +/* $OpenBSD: bus.h,v 1.5 2007/04/10 18:02:48 miod Exp $ */ /* $NetBSD: bus.h,v 1.9 1998/01/13 18:32:15 scottr Exp $ */ /*- @@ -285,6 +285,4 @@ typedef const struct hp300_bus_space_tag *bus_space_tag_t; #define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ #define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ -#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) - #endif /* _HP300_BUS_H_ */ diff --git a/sys/arch/landisk/include/bus.h b/sys/arch/landisk/include/bus.h index 1794cc96183..b0dc8fb3a03 100644 --- a/sys/arch/landisk/include/bus.h +++ b/sys/arch/landisk/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.2 2006/10/07 20:52:40 miod Exp $ */ +/* $OpenBSD: bus.h,v 1.3 2007/04/10 18:02:48 miod Exp $ */ /* $NetBSD: bus.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -74,39 +74,6 @@ #include <sys/types.h> -#ifdef _KERNEL -/* - * Turn on BUS_SPACE_DEBUG if the global DEBUG option is enabled. - */ -#if defined(DEBUG) && !defined(BUS_SPACE_DEBUG) -#define BUS_SPACE_DEBUG -#endif - -#ifdef BUS_SPACE_DEBUG -#include <sys/systm.h> /* for printf() prototype */ -/* - * Macros for checking the aligned-ness of pointers passed to bus - * space ops. Strict alignment is required by the SuperH architecture, - * and a trap will occur if unaligned access is performed. These - * may aid in the debugging of a broken device driver by displaying - * useful information about the problem. - */ -#define __BUS_SPACE_ALIGNED_ADDRESS(p, t) \ - ((((u_long)(p)) & (sizeof(t)-1)) == 0) - -#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) \ -({ \ - if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \ - printf("%s 0x%lx not aligned to %lu bytes %s:%d\n", \ - d, (u_long)(p), (u_long)sizeof(t), __FILE__, __LINE__); \ - } \ - (void) 0; \ -}) -#else -#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) (void) 0 -#endif /* BUS_SPACE_DEBUG */ -#endif /* _KERNEL */ - typedef u_long bus_addr_t; typedef u_long bus_size_t; diff --git a/sys/arch/mvmeppc/include/bus_mi.h b/sys/arch/mvmeppc/include/bus_mi.h index bd3d0f43a59..0f7d27cbed1 100644 --- a/sys/arch/mvmeppc/include/bus_mi.h +++ b/sys/arch/mvmeppc/include/bus_mi.h @@ -1,5 +1,5 @@ /* $NetBSD: bus.h,v 1.1 2001/06/06 17:37:37 matt Exp $ */ -/* $OpenBSD: bus_mi.h,v 1.7 2003/12/04 21:13:37 miod Exp $ */ +/* $OpenBSD: bus_mi.h,v 1.8 2007/04/10 18:02:48 miod Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -958,8 +958,6 @@ bus_space_copy_region_4(t, h1, o1, h2, o2, c) #define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ #define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ -#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) - /* * Bus DMA methods. */ diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h index 52479e8be97..adabf7fa9e5 100644 --- a/sys/arch/sparc64/include/bus.h +++ b/sys/arch/sparc64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.20 2006/12/30 21:19:24 claudio Exp $ */ +/* $OpenBSD: bus.h,v 1.21 2007/04/10 18:02:48 miod Exp $ */ /* $NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $ */ /*- @@ -350,8 +350,6 @@ bus_space_barrier(t, h, o, s, f) #define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ #define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ -#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) - /* * Flags used in various bus DMA methods. */ diff --git a/sys/arch/vax/include/bus.h b/sys/arch/vax/include/bus.h index c377d4e927e..44d7cdfb65e 100644 --- a/sys/arch/vax/include/bus.h +++ b/sys/arch/vax/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.7 2005/05/25 18:29:58 jason Exp $ */ +/* $OpenBSD: bus.h,v 1.8 2007/04/10 18:02:48 miod Exp $ */ /* $NetBSD: bus.h,v 1.14 2000/06/26 04:56:13 simonb Exp $ */ /*- @@ -72,32 +72,6 @@ #ifndef _VAX_BUS_H_ #define _VAX_BUS_H_ -#ifdef BUS_SPACE_DEBUG -#include <sys/systm.h> /* for printf() prototype */ -/* - * Macros for sanity-checking the aligned-ness of pointers passed to - * bus space ops. These are not strictly necessary on the VAX, but - * could lead to performance improvements, and help catch problems - * with drivers that would creep up on other architectures. - */ -#define __BUS_SPACE_ALIGNED_ADDRESS(p, t) \ - ((((u_long)(p)) & (sizeof(t)-1)) == 0) - -#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) \ -({ \ - if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \ - printf("%s 0x%lx not aligned to %d bytes %s:%d\n", \ - d, (u_long)(p), sizeof(t), __FILE__, __LINE__); \ - } \ - (void) 0; \ -}) - -#define BUS_SPACE_ALIGNED_POINTER(p, t) __BUS_SPACE_ALIGNED_ADDRESS(p, t) -#else -#define __BUS_SPACE_ADDRESS_SANITY(p,t,d) (void) 0 -#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) -#endif /* BUS_SPACE_DEBUG */ - /* * Bus address and size types */ |