[src/trunk]: src/sys/arch/hpcmips/vr Removed vr4102ip_probe to reduce kernel ...

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

details:   https://anonhg.NetBSD.org/src/rev/3396a64bd542
branches:  trunk
changeset: 522073:3396a64bd542
user:      takemura <takemura%NetBSD.org@localhost>
date:      Mon Feb 11 08:15:41 2002 +0000

description:
Removed vr4102ip_probe to reduce kernel size.

diffstat:

 sys/arch/hpcmips/vr/vr4102ip.c |  15 ++-------------
 sys/arch/hpcmips/vr/vrip.c     |  32 ++++++++++++++++----------------
 sys/arch/hpcmips/vr/vripvar.h  |   3 ++-
 3 files changed, 20 insertions(+), 30 deletions(-)

diffs (106 lines):

diff -r 38762f264be6 -r 3396a64bd542 sys/arch/hpcmips/vr/vr4102ip.c
--- a/sys/arch/hpcmips/vr/vr4102ip.c    Mon Feb 11 07:55:49 2002 +0000
+++ b/sys/arch/hpcmips/vr/vr4102ip.c    Mon Feb 11 08:15:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vr4102ip.c,v 1.1 2002/02/11 07:55:51 takemura Exp $    */
+/*     $NetBSD: vr4102ip.c,v 1.2 2002/02/11 08:15:41 takemura Exp $    */
 
 /*-
  * Copyright (c) 2002 TAKEMURA Shin
@@ -57,7 +57,7 @@
 void   vr4102ipattach(struct device *, struct device *, void *);
 
 struct cfattach vr4102ip_ca = {
-       sizeof(struct vrip_softc), vr4102ipmatch, vr4102ipattach
+       sizeof(struct vrip_softc), vripmatch, vr4102ipattach
 };
 
 static const struct vrip_unit vr4102ip_units[] = {
@@ -100,17 +100,6 @@
                            VR4102_BCUINT_REG_W,VR4102_MBCUINT_REG_W    }
 };
 
-int
-vr4102ipmatch(struct device *parent, struct cfdata *match, void *aux)
-{
-       struct mainbus_attach_args *ma = aux;
-
-       if (strcmp(ma->ma_name, match->cf_driver->cd_name))
-               return (0);
-
-       return (1);
-}
-
 void
 vr4102ipattach(struct device *parent, struct device *self, void *aux)
 {
diff -r 38762f264be6 -r 3396a64bd542 sys/arch/hpcmips/vr/vrip.c
--- a/sys/arch/hpcmips/vr/vrip.c        Mon Feb 11 07:55:49 2002 +0000
+++ b/sys/arch/hpcmips/vr/vrip.c        Mon Feb 11 08:15:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vrip.c,v 1.19 2002/02/11 07:55:51 takemura Exp $       */
+/*     $NetBSD: vrip.c,v 1.20 2002/02/11 08:15:41 takemura Exp $       */
 
 /*-
  * Copyright (c) 1999, 2002
@@ -165,21 +165,6 @@
                            BCUINT_REG_W,       MBCUINT_REG_W   },
 };
 
-int
-vripmatch(struct device *parent, struct cfdata *match, void *aux)
-{
-       struct mainbus_attach_args *ma = aux;
-   
-#ifdef TX39XX 
-       if (!platid_match(&platid, &platid_mask_CPU_MIPS_VR_41XX))
-               return (0);
-#endif /* TX39XX */
-       if (strcmp(ma->ma_name, match->cf_driver->cd_name))
-               return (0);
-
-       return (1);
-}
-
 void
 vripattach(struct device *parent, struct device *self, void *aux)
 {
@@ -197,6 +182,21 @@
 }
 #endif /* SINGLE_VRIP_BASE */
 
+int
+vripmatch(struct device *parent, struct cfdata *match, void *aux)
+{
+       struct mainbus_attach_args *ma = aux;
+   
+#if defined(SINGLE_VRIP_BASE) && defined(TX39XX)
+       if (!platid_match(&platid, &platid_mask_CPU_MIPS_VR_41XX))
+               return (0);
+#endif /* SINGLE_VRIP_BASE && TX39XX */
+       if (strcmp(ma->ma_name, match->cf_driver->cd_name))
+               return (0);
+
+       return (1);
+}
+
 void
 vripattach_common(struct device *parent, struct device *self, void *aux)
 {
diff -r 38762f264be6 -r 3396a64bd542 sys/arch/hpcmips/vr/vripvar.h
--- a/sys/arch/hpcmips/vr/vripvar.h     Mon Feb 11 07:55:49 2002 +0000
+++ b/sys/arch/hpcmips/vr/vripvar.h     Mon Feb 11 08:15:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vripvar.h,v 1.8 2002/02/11 04:56:27 takemura Exp $     */
+/*     $NetBSD: vripvar.h,v 1.9 2002/02/11 08:15:41 takemura Exp $     */
 
 /*-
  * Copyright (c) 1999, 2002
@@ -68,6 +68,7 @@
 
 void vrip_intr_suspend(void);
 void vrip_intr_resume(void);
+int vripmatch(struct device *, struct cfdata *, void *);
 void vripattach_common(struct device *, struct device *, void *);
 
 #endif /* !_VRIPVAR_H_ */