[src/trunk]: src/sys/arch/sun2/sun2 The mainbus doesn't define a device name ...

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

details:   https://anonhg.NetBSD.org/src/rev/79154eed2c9a
branches:  trunk
changeset: 508368:79154eed2c9a
user:      fredette <fredette%NetBSD.org@localhost>
date:      Tue Apr 10 12:37:49 2001 +0000

description:
The mainbus doesn't define a device name in the attach args
after attaching the special busses, so just match when it
isn't, instead of calling strcmp with it.

diffstat:

 sys/arch/sun2/sun2/mbio.c  |  4 ++--
 sys/arch/sun2/sun2/mbmem.c |  4 ++--
 sys/arch/sun2/sun2/obio.c  |  4 ++--
 sys/arch/sun2/sun2/obmem.c |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 131050919a4a -r 79154eed2c9a sys/arch/sun2/sun2/mbio.c
--- a/sys/arch/sun2/sun2/mbio.c Tue Apr 10 12:33:09 2001 +0000
+++ b/sys/arch/sun2/sun2/mbio.c Tue Apr 10 12:37:49 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbio.c,v 1.1 2001/04/06 15:05:56 fredette Exp $        */
+/*     $NetBSD: mbio.c,v 1.2 2001/04/10 12:37:49 fredette Exp $        */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
 {
        struct confargs *ca = aux;
 
-       return (cpu_has_multibus && strcmp(cf->cf_driver->cd_name, ca->ca_name) == 0);
+       return (cpu_has_multibus && (ca->ca_name == NULL || strcmp(cf->cf_driver->cd_name, ca->ca_name) == 0));
 }
 
 static void
diff -r 131050919a4a -r 79154eed2c9a sys/arch/sun2/sun2/mbmem.c
--- a/sys/arch/sun2/sun2/mbmem.c        Tue Apr 10 12:33:09 2001 +0000
+++ b/sys/arch/sun2/sun2/mbmem.c        Tue Apr 10 12:37:49 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbmem.c,v 1.1 2001/04/06 15:05:56 fredette Exp $       */
+/*     $NetBSD: mbmem.c,v 1.2 2001/04/10 12:37:49 fredette Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
 {
        struct confargs *ca = aux;
 
-       return (cpu_has_multibus && strcmp(cf->cf_driver->cd_name, ca->ca_name) == 0);
+       return (cpu_has_multibus && (ca->ca_name == NULL || strcmp(cf->cf_driver->cd_name, ca->ca_name) == 0));
 }
 
 static void
diff -r 131050919a4a -r 79154eed2c9a sys/arch/sun2/sun2/obio.c
--- a/sys/arch/sun2/sun2/obio.c Tue Apr 10 12:33:09 2001 +0000
+++ b/sys/arch/sun2/sun2/obio.c Tue Apr 10 12:37:49 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obio.c,v 1.1 2001/04/06 15:05:56 fredette Exp $        */
+/*     $NetBSD: obio.c,v 1.2 2001/04/10 12:37:49 fredette Exp $        */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
 {
        struct confargs *ca = aux;
 
-       return (strcmp(cf->cf_driver->cd_name, ca->ca_name) == 0);
+       return (ca->ca_name == NULL || strcmp(cf->cf_driver->cd_name, ca->ca_name) == 0);
 }
 
 static void
diff -r 131050919a4a -r 79154eed2c9a sys/arch/sun2/sun2/obmem.c
--- a/sys/arch/sun2/sun2/obmem.c        Tue Apr 10 12:33:09 2001 +0000
+++ b/sys/arch/sun2/sun2/obmem.c        Tue Apr 10 12:37:49 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obmem.c,v 1.1 2001/04/06 15:05:57 fredette Exp $       */
+/*     $NetBSD: obmem.c,v 1.2 2001/04/10 12:37:49 fredette Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
 {
        struct confargs *ca = aux;
 
-       return (strcmp(cf->cf_driver->cd_name, ca->ca_name) == 0);
+       return (ca->ca_name == NULL || strcmp(cf->cf_driver->cd_name, ca->ca_name) == 0);
 }
 
 static void