[src/trunk]: src/sys/arch/pmax/ibus Make consistant with the new order.

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

details:   https://anonhg.NetBSD.org/src/rev/6e35c7a65ef8
branches:  trunk
changeset: 480523:6e35c7a65ef8
user:      ad <ad%NetBSD.org@localhost>
date:      Fri Jan 14 15:52:00 2000 +0000

description:
Make consistant with the new order.

diffstat:

 sys/arch/pmax/ibus/ibus.c         |   8 +++-----
 sys/arch/pmax/ibus/ibus_3max.c    |  11 +++++------
 sys/arch/pmax/ibus/ibusvar.h      |   8 ++++----
 sys/arch/pmax/ibus/mcclock_ibus.c |   7 ++-----
 4 files changed, 14 insertions(+), 20 deletions(-)

diffs (130 lines):

diff -r 3752580e21d1 -r 6e35c7a65ef8 sys/arch/pmax/ibus/ibus.c
--- a/sys/arch/pmax/ibus/ibus.c Fri Jan 14 15:47:42 2000 +0000
+++ b/sys/arch/pmax/ibus/ibus.c Fri Jan 14 15:52:00 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus.c,v 1.5 2000/01/09 03:55:51 simonb Exp $ */
+/*     $NetBSD: ibus.c,v 1.6 2000/01/14 15:52:00 ad Exp $      */
 
 /*
  * Copyright (c) 1998 Jonathan Stone.  All rights reserved.
@@ -31,8 +31,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-
-__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.5 2000/01/09 03:55:51 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.6 2000/01/14 15:52:00 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,7 +70,7 @@
                if (ia->ia_basz != 0 &&
                    badaddr((caddr_t)ia->ia_addr, ia->ia_basz) != 0)
                        continue;
-               (void) config_found_sm(self, ia, ibusprint, ibussubmatch);
+               config_found_sm(self, ia, ibusprint, ibussubmatch);
        }
 }
 
@@ -121,7 +120,6 @@
        (*sc->sc_intr_establish)(dev, cookie, level, handler, arg);
 }
 
-
 void
 ibus_intr_disestablish(dev, arg)
        struct device *dev;
diff -r 3752580e21d1 -r 6e35c7a65ef8 sys/arch/pmax/ibus/ibus_3max.c
--- a/sys/arch/pmax/ibus/ibus_3max.c    Fri Jan 14 15:47:42 2000 +0000
+++ b/sys/arch/pmax/ibus/ibus_3max.c    Fri Jan 14 15:52:00 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_3max.c,v 1.6 2000/01/10 03:24:35 simonb Exp $ */
+/*     $NetBSD: ibus_3max.c,v 1.7 2000/01/14 15:52:00 ad Exp $ */
 
 /*
  * Copyright (c) 1999 Tohru Nishimura.  All rights reserved.
@@ -31,15 +31,16 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-
-__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.6 2000/01/10 03:24:35 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.7 2000/01/14 15:52:00 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
 #include <dev/tc/tcvar.h>
+
 #include <pmax/ibus/ibusvar.h>
+
 #include <pmax/pmax/kn02.h>
 
 #define KV(x) MIPS_PHYS_TO_KSEG1(x)
@@ -67,9 +68,7 @@
 {
        struct tc_attach_args *ta = aux;
 
-       if (strncmp("KN02SYS ", ta->ta_modname, TC_ROM_LLEN) != 0)
-               return 0;
-       return 1;
+       return (strncmp("KN02SYS ", ta->ta_modname, TC_ROM_LLEN) == 0);
 }
 
 void
diff -r 3752580e21d1 -r 6e35c7a65ef8 sys/arch/pmax/ibus/ibusvar.h
--- a/sys/arch/pmax/ibus/ibusvar.h      Fri Jan 14 15:47:42 2000 +0000
+++ b/sys/arch/pmax/ibus/ibusvar.h      Fri Jan 14 15:52:00 2000 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: ibusvar.h,v 1.14 2000/01/14 13:45:21 simonb Exp $ */
+/*     $NetBSD: ibusvar.h,v 1.15 2000/01/14 15:52:00 ad Exp $  */
 
-#ifndef _IBUSVAR_H_
-#define _IBUSVAR_H_ 1
+#ifndef _PMAX_IBUS_IBUSVAR_H_
+#define _PMAX_IBUS_IBUSVAR_H_
 
 #include <machine/bus.h>
 
@@ -45,4 +45,4 @@
            int (*handler)(void *), void *arg));
 void   ibus_intr_disestablish __P((struct device *, void *));
 
-#endif /* _IBUSVAR_H_ */
+#endif /* !_PMAX_IBUS_IBUSVAR_H_ */
diff -r 3752580e21d1 -r 6e35c7a65ef8 sys/arch/pmax/ibus/mcclock_ibus.c
--- a/sys/arch/pmax/ibus/mcclock_ibus.c Fri Jan 14 15:47:42 2000 +0000
+++ b/sys/arch/pmax/ibus/mcclock_ibus.c Fri Jan 14 15:52:00 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_ibus.c,v 1.6 2000/01/10 03:24:36 simonb Exp $ */
+/*     $NetBSD: mcclock_ibus.c,v 1.7 2000/01/14 15:52:00 ad Exp $      */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,8 +28,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ibus.c,v 1.6 2000/01/10 03:24:36 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ibus.c,v 1.7 2000/01/14 15:52:00 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -40,7 +39,6 @@
 
 #include <pmax/ibus/ibusvar.h>
 
-
 static int     mcclock_ibus_match __P((struct device *, struct cfdata *,
                    void *));
 static void    mcclock_ibus_attach __P((struct device *, struct device *,
@@ -52,7 +50,6 @@
 };
 extern struct cfdriver ibus_cd;
 
-
 static int
 mcclock_ibus_match(parent, match, aux)
        struct device *parent;