[src/trunk]: src/sys #define __HAVE_DEVICE_REGISTER on ports that have it, an...

[danw <danw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/299a03a9f8ab
branches:  trunk
changeset: 481507:299a03a9f8ab
user:      danw <danw%NetBSD.org@localhost>
date:      Tue Feb 01 04:01:19 2000 +0000

description:
#define __HAVE_DEVICE_REGISTER on ports that have it, and check for
that, rather than a list of architecture defines, in config_attach

diffstat:

 sys/arch/alpha/include/types.h   |  4 +++-
 sys/arch/hp300/include/types.h   |  4 +++-
 sys/arch/i386/include/types.h    |  4 +++-
 sys/arch/sparc/include/types.h   |  4 +++-
 sys/arch/sparc64/include/types.h |  4 +++-
 sys/arch/vax/include/types.h     |  4 +++-
 sys/arch/x68k/include/types.h    |  4 +++-
 sys/kern/subr_autoconf.c         |  5 ++---
 8 files changed, 23 insertions(+), 10 deletions(-)

diffs (129 lines):

diff -r a1dc0cb5fd09 -r 299a03a9f8ab sys/arch/alpha/include/types.h
--- a/sys/arch/alpha/include/types.h    Tue Feb 01 03:08:36 2000 +0000
+++ b/sys/arch/alpha/include/types.h    Tue Feb 01 04:01:19 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.12 1998/08/14 16:50:03 thorpej Exp $ */
+/* $NetBSD: types.h,v 1.13 2000/02/01 04:01:21 danw Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -72,4 +72,6 @@
 
 #define __HAVE_NWSCONS
 
+#define __HAVE_DEVICE_REGISTER
+
 #endif /* _MACHTYPES_H_ */
diff -r a1dc0cb5fd09 -r 299a03a9f8ab sys/arch/hp300/include/types.h
--- a/sys/arch/hp300/include/types.h    Tue Feb 01 03:08:36 2000 +0000
+++ b/sys/arch/hp300/include/types.h    Tue Feb 01 04:01:19 2000 +0000
@@ -1,8 +1,10 @@
-/*     $NetBSD: types.h,v 1.8 1996/12/17 08:11:50 thorpej Exp $        */
+/*     $NetBSD: types.h,v 1.9 2000/02/01 04:01:21 danw Exp $   */
 
 #ifndef _MACHINE_TYPES_H_
 #define _MACHINE_TYPES_H_
 
 #include <m68k/types.h>
 
+#define __HAVE_DEVICE_REGISTER
+
 #endif
diff -r a1dc0cb5fd09 -r 299a03a9f8ab sys/arch/i386/include/types.h
--- a/sys/arch/i386/include/types.h     Tue Feb 01 03:08:36 2000 +0000
+++ b/sys/arch/i386/include/types.h     Tue Feb 01 04:01:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.20 1999/02/05 22:13:12 thorpej Exp $       */
+/*     $NetBSD: types.h,v 1.21 2000/02/01 04:01:22 danw Exp $  */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -77,4 +77,6 @@
 /* The x86 does not have strict alignment requirements. */
 #define        __NO_STRICT_ALIGNMENT
 
+#define __HAVE_DEVICE_REGISTER
+
 #endif /* _MACHTYPES_H_ */
diff -r a1dc0cb5fd09 -r 299a03a9f8ab sys/arch/sparc/include/types.h
--- a/sys/arch/sparc/include/types.h    Tue Feb 01 03:08:36 2000 +0000
+++ b/sys/arch/sparc/include/types.h    Tue Feb 01 04:01:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.17 1999/11/30 07:56:28 mrg Exp $ */
+/*     $NetBSD: types.h,v 1.18 2000/02/01 04:01:22 danw Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -102,4 +102,6 @@
 typedef paddr_t                        psize_t;
 #endif
 
+#define __HAVE_DEVICE_REGISTER
+
 #endif /* _MACHTYPES_H_ */
diff -r a1dc0cb5fd09 -r 299a03a9f8ab sys/arch/sparc64/include/types.h
--- a/sys/arch/sparc64/include/types.h  Tue Feb 01 03:08:36 2000 +0000
+++ b/sys/arch/sparc64/include/types.h  Tue Feb 01 04:01:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.10 1999/11/27 20:05:45 eeh Exp $ */
+/*     $NetBSD: types.h,v 1.11 2000/02/01 04:01:23 danw Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -99,4 +99,6 @@
 typedef paddr_t                        psize_t;
 #endif
 
+#define __HAVE_DEVICE_REGISTER
+
 #endif /* _MACHTYPES_H_ */
diff -r a1dc0cb5fd09 -r 299a03a9f8ab sys/arch/vax/include/types.h
--- a/sys/arch/vax/include/types.h      Tue Feb 01 03:08:36 2000 +0000
+++ b/sys/arch/vax/include/types.h      Tue Feb 01 04:01:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.14 1998/08/13 02:10:49 eeh Exp $   */
+/*     $NetBSD: types.h,v 1.15 2000/02/01 04:01:23 danw Exp $  */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -75,4 +75,6 @@
 
 typedef int32_t                 register_t;
 
+#define __HAVE_DEVICE_REGISTER
+
 #endif /* _MACHTYPES_H_ */
diff -r a1dc0cb5fd09 -r 299a03a9f8ab sys/arch/x68k/include/types.h
--- a/sys/arch/x68k/include/types.h     Tue Feb 01 03:08:36 2000 +0000
+++ b/sys/arch/x68k/include/types.h     Tue Feb 01 04:01:19 2000 +0000
@@ -1,8 +1,10 @@
-/*     $NetBSD: types.h,v 1.4 1998/08/04 16:51:53 minoura Exp $        */
+/*     $NetBSD: types.h,v 1.5 2000/02/01 04:01:23 danw Exp $   */
 
 #ifndef _MACHINE_TYPES_H_
 #define _MACHINE_TYPES_H_
 
 #include <m68k/types.h>
 
+#define __HAVE_DEVICE_REGISTER
+
 #endif
diff -r a1dc0cb5fd09 -r 299a03a9f8ab sys/kern/subr_autoconf.c
--- a/sys/kern/subr_autoconf.c  Tue Feb 01 03:08:36 2000 +0000
+++ b/sys/kern/subr_autoconf.c  Tue Feb 01 04:01:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_autoconf.c,v 1.48 2000/01/25 13:23:26 enami Exp $ */
+/*     $NetBSD: subr_autoconf.c,v 1.49 2000/02/01 04:01:19 danw Exp $  */
 
 /*
  * Copyright (c) 1992, 1993
@@ -409,8 +409,7 @@
                                cf->cf_unit++;
 #endif /* __BROKEN_CONFIG_UNIT_USAGE */
                }
-#if defined(__alpha__) || defined(hp300) || defined(__i386__) || \
-       defined(__sparc__) || defined(__vax__) || defined(x68k)
+#ifdef __HAVE_DEVICE_REGISTER
        device_register(dev, aux);
 #endif
        (*ca->ca_attach)(parent, dev, aux);