Borrow phk's axe and apply the next stage of config(8)'s evolution.

Use Warner Losh's "hint" driver to decode ascii strings to fill the
resource table at boot time.

config(8) no longer generates an ioconf.c table - ie: the configuration
no longer has to be compiled into the kernel.  You can reconfigure your
isa devices with the likes of this at loader(8) time:
  set hint.ed.0.port=0x320

userconfig will be rewritten to use this style interface one day and will
move to /boot/userconfig.4th or something like that.

It is still possible to statically compile in a set of hints into a kernel
if you do not wish to use loader(8).  See the "hints" directive in GENERIC
as an example.

All device wiring has been moved out of config(8).  There is a set of
helper scripts (see i386/conf/gethints.pl, and the same for alpha and pc98)
that extract the 'at isa? port foo irq bar' from the old files and produces
a hints file.  If you install this file as /boot/device.hints (and update
/boot/defaults/loader.conf - You can do a build/install in sys/boot) then
loader will load it automatically for you.  You can also compile in the
hints directly with:  hints "device.hints"  as well.

There are a few things that I'm not too happy with yet.  Under this scheme,
things like LINT would no longer be useful as "documentation" of settings.
I have renamed this file to 'NOTES' and stored the example hints strings
in it.  However... this is not something that config(8) understands, so
there is a script that extracts the build-specific data from the
documentation file (NOTES) to produce a LINT that can be config'ed and
built.  A stack of man4 pages will need updating. :-/

Also, since there is no longer a difference between 'device' and
'pseudo-device' I collapsed the two together, and the resulting 'device'
takes a 'number of units' for devices that still have it statically
allocated.  eg:  'device fe 4' will compile the fe driver with NFE set
to 4.  You can then set hints for 4 units (0 - 3).  Also note that
'device fe0' will be interpreted as "zero units of 'fe'" which would be
bad, so there is a config warning for this.  This is only needed for
old drivers that still have static limits on numbers of units.
All the statically limited drivers that I could find were marked.

Please exercise EXTREME CAUTION when transitioning!

Moral support by: phk, msmith, dfr, asmodai, imp, and others

1 files changed, 16 insertions, 22 deletions

diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 4a0748efdf6f..318d0d5d6f81 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -76,18 +76,16 @@ static int no_config_clobber = TRUE;
 int	debugging;
 int	profiling;
 
-static void configfile __P((void));
-static void get_srcdir __P((void));
-static void usage __P((void));
+static void configfile(void);
+static void get_srcdir(void);
+static void usage(void);
 
 /*
  * Config builds a set of files for building a UNIX
  * system given a description of the desired system.
  */
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char **argv)
 {
 
 	struct stat buf;
@@ -170,7 +168,6 @@ main(argc, argv)
 	case MACHINE_I386:
 	case MACHINE_PC98:
 	case MACHINE_ALPHA:
-		newbus_ioconf();	/* Print ioconf.c */
 		break;
 
 	default:
@@ -206,7 +203,7 @@ main(argc, argv)
  *	and save that in srcdir.
  */
 static void
-get_srcdir()
+get_srcdir(void)
 {
 	int i;
 	char *p;
@@ -225,7 +222,7 @@ get_srcdir()
 }
 
 static void
-usage()
+usage(void)
 {
 		fprintf(stderr, "usage: config [-gpr] [-d destdir] sysname\n");
 		exit(1);
@@ -238,12 +235,11 @@ usage()
  *	pointer to the word otherwise
  */
 char *
-get_word(fp)
-	register FILE *fp;
+get_word(FILE *fp)
 {
 	static char line[80];
-	register int ch;
-	register char *cp;
+	int ch;
+	char *cp;
 	int escaped_nl = 0;
 
 begin:
@@ -284,12 +280,11 @@ begin:
  *	(to allow embedded spaces).
  */
 char *
-get_quoted_word(fp)
-	register FILE *fp;
+get_quoted_word(FILE *fp)
 {
 	static char line[256];
-	register int ch;
-	register char *cp;
+	int ch;
+	char *cp;
 	int escaped_nl = 0;
 
 begin:
@@ -312,7 +307,7 @@ begin:
 	}
 	cp = line;
 	if (ch == '"' || ch == '\'') {
-		register int quote = ch;
+		int quote = ch;
 
 		while ((ch = getc(fp)) != EOF) {
 			if (ch == quote)
@@ -345,10 +340,9 @@ begin:
  * prepend the path to a filename
  */
 char *
-path(file)
-	char *file;
+path(char *file)
 {
-	register char *cp;
+	char *cp;
 
 	cp = malloc((size_t)(strlen(destdir) + (file ? strlen(file) : 0) + 2));
 	(void) strcpy(cp, destdir);
@@ -360,7 +354,7 @@ path(file)
 }
 
 static void
-configfile()
+configfile(void)
 {
 	FILE *fi, *fo;
 	char *p;