diff options
| -rw-r--r-- | sys/conf/Makefile.i386 | 4 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 4 | ||||
| -rw-r--r-- | sys/i386/conf/Makefile.i386 | 4 | ||||
| -rw-r--r-- | usr.sbin/config/configvers.h | 4 | ||||
| -rw-r--r-- | usr.sbin/config/mkioconf.c | 23 |
5 files changed, 13 insertions, 26 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index ad464166f5e2..762f9ed92367 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.112 1998/05/20 20:54:04 eivind Exp $ +# $Id: Makefile.i386,v 1.113 1998/05/21 19:21:44 eivind Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 300003 +%VERSREQ= 300004 BINFORMAT?= aout #BINFORMAT?= aoutkld diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index ad464166f5e2..762f9ed92367 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.112 1998/05/20 20:54:04 eivind Exp $ +# $Id: Makefile.i386,v 1.113 1998/05/21 19:21:44 eivind Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 300003 +%VERSREQ= 300004 BINFORMAT?= aout #BINFORMAT?= aoutkld diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index ad464166f5e2..762f9ed92367 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.112 1998/05/20 20:54:04 eivind Exp $ +# $Id: Makefile.i386,v 1.113 1998/05/21 19:21:44 eivind Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 300003 +%VERSREQ= 300004 BINFORMAT?= aout #BINFORMAT?= aoutkld diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h index 1c74a87a7668..821811a17344 100644 --- a/usr.sbin/config/configvers.h +++ b/usr.sbin/config/configvers.h @@ -6,6 +6,6 @@ * The numbering scheme is inspired by the sys/conf/newvers.sh RELDATE * and <osreldate.h> system. * - * $Id: configvers.h,v 1.1 1997/10/22 00:38:48 peter Exp $ + * $Id: configvers.h,v 1.2 1997/11/06 03:11:40 msmith Exp $ */ -#define CONFIGVERS 300003 +#define CONFIGVERS 300004 diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index 6bb4b925b4e2..47a04b0e15d5 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mkioconf.c 8.2 (Berkeley) 1/21/94"; #endif static const char rcsid[] = - "$Id: mkioconf.c,v 1.35 1998/05/02 01:57:39 kato Exp $"; + "$Id: mkioconf.c,v 1.36 1998/06/09 14:02:06 dfr Exp $"; #endif /* not lint */ #include <err.h> @@ -618,7 +618,6 @@ i386_ioconf() int dev_id; FILE *fp, *fp1; static char *old_d_name; - static char old_shandler[32 + 1]; fp = fopen(path("ioconf.c.new"), "w"); if (fp == 0) @@ -658,22 +657,18 @@ i386_ioconf() fprintf(fp, "#include <i386/isa/isa.h>\n"); else fprintf(fp, "#include <pc98/pc98/pc98.h>\n"); - fprintf(fp1, "\n"); - fprintf(fp1, "#include <i386/isa/isa_device.h>\n"); - fprintf(fp1, "\n"); + fprintf(fp, "#include <i386/isa/isa_device.h>\n"); + fprintf(fp, "\n"); for (dp = dtab; dp != 0; dp = dp->d_next) { - int printed = 0; - mp = dp->d_conn; if (mp == 0 || mp == TO_NEXUS || !eq(mp->d_name, "isa")) continue; if (old_d_name == NULL || !eq(dp->d_name, old_d_name)) { old_d_name = dp->d_name; - fprintf(fp1, - "extern struct isa_driver %3sdriver;", + fprintf(fp, + "extern struct isa_driver %3sdriver;\n", old_d_name); - printed = 1; } if (eq(dp->d_name, "wdc")) seen_wdc++; @@ -684,14 +679,6 @@ i386_ioconf() "remapped irq 2 to irq 9, please update your config file\n"); dp->d_irq = 9; } - if (dp->d_vec != NULL && dp->d_vec->id != NULL && - !eq(shandler(dp), old_shandler)) { - strcpy(old_shandler, shandler(dp)); - fprintf(fp1, " inthand2_t %s;", old_shandler); - printed = 1; - } - if (printed) - fprintf(fp1, "\n"); } dev_id = 10; /* XXX must match mkglue.c */ isa_devtab(fp, "bio", &dev_id); |