Module Name: src
Committed By: christos
Date: Thu Aug 20 09:44:24 UTC 2015
Modified Files:
src/usr.bin/config: defs.h mkheaders.c mkioconf.c
Log Message:
move driver attach declarations to ioconf.h
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/config/defs.h
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/config/mkheaders.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/config/mkioconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.64 src/usr.bin/config/defs.h:1.65
--- src/usr.bin/config/defs.h:1.64 Sun Nov 16 19:53:15 2014
+++ src/usr.bin/config/defs.h Thu Aug 20 05:44:24 2015
@@ -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 @@ extern const char *progname;
* 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
/*
Index: src/usr.bin/config/mkheaders.c
diff -u src/usr.bin/config/mkheaders.c:1.26 src/usr.bin/config/mkheaders.c:1.27
--- src/usr.bin/config/mkheaders.c:1.26 Thu Jan 22 15:01:22 2015
+++ src/usr.bin/config/mkheaders.c Thu Aug 20 05:44:24 2015
@@ -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 @@ emitioconfh(void)
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;
Index: src/usr.bin/config/mkioconf.c
diff -u src/usr.bin/config/mkioconf.c:1.28 src/usr.bin/config/mkioconf.c:1.29
--- src/usr.bin/config/mkioconf.c:1.28 Sat Nov 1 07:02:41 2014
+++ src/usr.bin/config/mkioconf.c Thu Aug 20 05:44:24 2015
@@ -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 @@ mkioconf(void)
return (1);
}
+ fprintf(fp, "#include \"ioconf.h\"\n");
+
emithdr(fp);
emitcfdrivers(fp);
emitexterns(fp);
@@ -476,10 +478,6 @@ emitpseudo(FILE *fp)
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;
