[src/trunk]: src/usr.bin/config move driver attach declarations to ioconf.h

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

details:   https://anonhg.NetBSD.org/src/rev/cae9cfdb09aa
branches:  trunk
changeset: 810154:cae9cfdb09aa
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 20 09:44:24 2015 +0000

description:
move driver attach declarations to ioconf.h

diffstat:

 usr.bin/config/defs.h      |   4 ++--
 usr.bin/config/mkheaders.c |  12 ++++++++++--
 usr.bin/config/mkioconf.c  |  10 ++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diffs (94 lines):

diff -r 9dbf7b7c428f -r cae9cfdb09aa usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Thu Aug 20 09:34:54 2015 +0000
+++ b/usr.bin/config/defs.h     Thu Aug 20 09:44:24 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.64 2014/11/17 00:53:15 uebayasi Exp $       */
+/*     $NetBSD: defs.h,v 1.65 2015/08/20 09:44:24 christos Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -107,7 +107,7 @@
  * The next two lines define the current version of the config(1) binary,
  * and the minimum version of the configuration files it supports.
  */
-#define CONFIG_VERSION         20141030
+#define CONFIG_VERSION         20150820
 #define CONFIG_MINVERSION      0
 
 /*
diff -r 9dbf7b7c428f -r cae9cfdb09aa usr.bin/config/mkheaders.c
--- a/usr.bin/config/mkheaders.c        Thu Aug 20 09:34:54 2015 +0000
+++ b/usr.bin/config/mkheaders.c        Thu Aug 20 09:44:24 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkheaders.c,v 1.26 2015/01/22 20:01:22 christos Exp $  */
+/*     $NetBSD: mkheaders.c,v 1.27 2015/08/20 09:44:24 christos Exp $  */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkheaders.c,v 1.26 2015/01/22 20:01:22 christos Exp $");
+__RCSID("$NetBSD: mkheaders.c,v 1.27 2015/08/20 09:44:24 christos Exp $");
 
 #include <sys/param.h>
 #include <ctype.h>
@@ -389,11 +389,19 @@
        const char *tfname;
        FILE *tfp;
        struct devbase *d;
+       struct devi *i;
 
        tfname = "tmp_ioconf.h";
        if ((tfp = fopen(tfname, "w")) == NULL)
                return (herr("open", tfname, NULL));
 
+        fputs("\n/* pseudo-devices */\n", tfp);
+        TAILQ_FOREACH(i, &allpseudo, i_next) {
+                fprintf(tfp, "void %sattach(int);\n",
+                    i->i_base->d_name);
+        }
+
+        fputs("\n/* driver structs */\n", tfp);
        TAILQ_FOREACH(d, &allbases, d_next) {
                if (!devbase_has_instances(d, WILD))
                        continue;
diff -r 9dbf7b7c428f -r cae9cfdb09aa usr.bin/config/mkioconf.c
--- a/usr.bin/config/mkioconf.c Thu Aug 20 09:34:54 2015 +0000
+++ b/usr.bin/config/mkioconf.c Thu Aug 20 09:44:24 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkioconf.c,v 1.28 2014/11/01 11:02:41 uebayasi Exp $   */
+/*     $NetBSD: mkioconf.c,v 1.29 2015/08/20 09:44:24 christos Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkioconf.c,v 1.28 2014/11/01 11:02:41 uebayasi Exp $");
+__RCSID("$NetBSD: mkioconf.c,v 1.29 2015/08/20 09:44:24 christos Exp $");
 
 #include <sys/param.h>
 #include <err.h>
@@ -92,6 +92,8 @@
                return (1);
        }
 
+       fprintf(fp, "#include \"ioconf.h\"\n");
+
        emithdr(fp);
        emitcfdrivers(fp);
        emitexterns(fp);
@@ -476,10 +478,6 @@
        struct devbase *d;
 
        fputs("\n/* pseudo-devices */\n", fp);
-       TAILQ_FOREACH(i, &allpseudo, i_next) {
-               fprintf(fp, "void %sattach(int);\n",
-                   i->i_base->d_name);
-       }
        fputs("\nconst struct pdevinit pdevinit[] = {\n", fp);
        TAILQ_FOREACH(i, &allpseudo, i_next) {
                d = i->i_base;