summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1999-06-18 04:49:24 +0000
committercgd <cgd@NetBSD.org>1999-06-18 04:49:24 +0000
commit7c02d93c04ee46782f54f4f0f41232d97d19558d (patch)
treeca3d1b3a910b6b559e9c4cf3502f0ee136933b74
parentbbf19ba1819013caa1e8e688c0df841c8b21f4f4 (diff)
nuke current definitions provided by __BUS_SPACE_COMPAT_OLDDEFS.
I'll do what I can to make new ones soon. 8-)
-rw-r--r--sys/arch/alpha/include/bus.h20
-rw-r--r--sys/arch/arm32/include/bus.h20
-rw-r--r--sys/arch/bebox/include/bus.h20
-rw-r--r--sys/arch/i386/include/bus.h20
-rw-r--r--sys/arch/macppc/include/bus.h8
-rw-r--r--sys/arch/vax/include/bus.h20
6 files changed, 6 insertions, 102 deletions
diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h
index 2ca3dcbe97d..cde632d4fb4 100644
--- a/sys/arch/alpha/include/bus.h
+++ b/sys/arch/alpha/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.28 1999/03/23 21:29:03 drochner Exp $ */
+/* $NetBSD: bus.h,v 1.29 1999/06/18 04:49:24 cgd Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -300,12 +300,6 @@ do { \
#define BUS_SPACE_BARRIER_READ 0x01
#define BUS_SPACE_BARRIER_WRITE 0x02
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define BUS_BARRIER_READ BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE BUS_SPACE_BARRIER_WRITE
-#endif
-
/*
* Bus read (single) operations.
@@ -415,18 +409,6 @@ do { \
#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \
__abs_copy(8, u_int64_t, (t), (h1), (o1), (h2), (o2), (c))
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define bus_space_copy_1(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_2(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_4(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_8(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#endif
-
/*
* Bus DMA methods.
diff --git a/sys/arch/arm32/include/bus.h b/sys/arch/arm32/include/bus.h
index b50a7059e8a..a0dbd1bf81a 100644
--- a/sys/arch/arm32/include/bus.h
+++ b/sys/arch/arm32/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.16 1999/03/29 12:42:51 mrg Exp $ */
+/* $NetBSD: bus.h,v 1.17 1999/06/18 04:49:25 cgd Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -256,12 +256,6 @@ struct bus_space {
#define BUS_SPACE_BARRIER_READ 0x01
#define BUS_SPACE_BARRIER_WRITE 0x02
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define BUS_BARRIER_READ 0x01
-#define BUS_BARRIER_WRITE 0x02
-#endif
-
/*
* Bus read (single) operations.
*/
@@ -370,18 +364,6 @@ struct bus_space {
#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \
__bs_copy(8, t, h1, o1, h2, o2, c)
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define bus_space_copy_1(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_2(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_4(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_8(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#endif
-
/*
* Macros to provide prototypes for all the functions used in the
* bus_space structure
diff --git a/sys/arch/bebox/include/bus.h b/sys/arch/bebox/include/bus.h
index ee4167d458b..cbc3fe60655 100644
--- a/sys/arch/bebox/include/bus.h
+++ b/sys/arch/bebox/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.18 1999/03/23 21:29:04 drochner Exp $ */
+/* $NetBSD: bus.h,v 1.19 1999/06/18 04:49:25 cgd Exp $ */
/* $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $ */
/*-
@@ -894,18 +894,6 @@ bus_space_copy_region_4(t, h1, o1, h2, o2, c)
#define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!!
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define bus_space_copy_1(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_2(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_4(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_8(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#endif
-
/*
* Bus read/write barrier methods.
*
@@ -919,12 +907,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 */
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define BUS_BARRIER_READ BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE BUS_SPACE_BARRIER_WRITE
-#endif
-
#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
/*
diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h
index d44e64200fe..9bb3757aae9 100644
--- a/sys/arch/i386/include/bus.h
+++ b/sys/arch/i386/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.23 1999/03/23 21:29:04 drochner Exp $ */
+/* $NetBSD: bus.h,v 1.24 1999/06/18 04:49:25 cgd Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -910,18 +910,6 @@ i386_memio_copy_region_4(t, h1, o1, h2, o2, c)
#define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!!
#endif
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define bus_space_copy_1(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_2(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_4(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_8(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#endif
-
/*
* Bus read/write barrier methods.
@@ -938,12 +926,6 @@ i386_memio_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 */
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define BUS_BARRIER_READ BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE BUS_SPACE_BARRIER_WRITE
-#endif
-
/*
* Flags used in various bus DMA methods.
diff --git a/sys/arch/macppc/include/bus.h b/sys/arch/macppc/include/bus.h
index 2756c2da78b..411f3a31ce6 100644
--- a/sys/arch/macppc/include/bus.h
+++ b/sys/arch/macppc/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.7 1999/03/23 21:29:05 drochner Exp $ */
+/* $NetBSD: bus.h,v 1.8 1999/06/18 04:49:25 cgd Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -695,12 +695,6 @@ bus_space_set_region_stream_4(tag, bsh, offset, val, count)
#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */
#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define BUS_BARRIER_READ BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE BUS_SPACE_BARRIER_WRITE
-#endif
-
#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
/*
diff --git a/sys/arch/vax/include/bus.h b/sys/arch/vax/include/bus.h
index 347732fe424..bf72e39e2c6 100644
--- a/sys/arch/vax/include/bus.h
+++ b/sys/arch/vax/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.7 1999/06/06 19:07:11 ragge Exp $ */
+/* $NetBSD: bus.h,v 1.8 1999/06/18 04:49:26 cgd Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -836,18 +836,6 @@ vax_mem_copy_region_4(t, h1, o1, h2, o2, c)
#define bus_space_copy_region_8 !!! bus_space_copy_region_8 unimplemented !!!
#endif
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define bus_space_copy_1(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_2(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_4(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_8(t, h1, o1, h2, o2, c) \
- bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#endif
-
/*
* Bus read/write barrier methods.
@@ -864,12 +852,6 @@ vax_mem_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 */
-#ifdef __BUS_SPACE_COMPAT_OLDDEFS
-/* compatibility definitions; deprecated */
-#define BUS_BARRIER_READ BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE BUS_SPACE_BARRIER_WRITE
-#endif
-
/*
* Flags used in various bus DMA methods.