Support PC-98 machine.

5 files changed, 15 insertions, 5 deletions

diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index d3304e338400..fd4d6dc62160 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -159,6 +159,7 @@ char	*machinename;
 #define MACHINE_PMAX	6
 #define MACHINE_LUNA68K	7
 #define MACHINE_NEWS3400	8
+#define MACHINE_PC98	9
 
 /*
  * For each machine, a set of CPU's may be specified as supported.
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index f437b267d08b..9ad7b0dffce3 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -174,6 +174,9 @@ Config_spec:
 		} else if (!strcmp($2, "i386")) {
 			machine = MACHINE_I386;
 			machinename = "i386";
+		} else if (!strcmp($2, "pc98")) {
+			machine = MACHINE_PC98;
+			machinename = "pc98";
 		} else if (!strcmp($2, "mips")) {
 			machine = MACHINE_MIPS;
 			machinename = "mips";
@@ -960,6 +963,7 @@ check_nexus(dev, num)
 		break;
 
 	case MACHINE_I386:
+	case MACHINE_PC98:
 		if (!eq(dev->d_name, "isa"))
 			yyerror("only isa's should be connected to the nexus");
 		break;
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 008821aab7bf..4ff0ca56db81 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.22 1998/03/16 11:19:10 eivind Exp $";
+	"$Id: main.c,v 1.23 1998/04/23 16:37:06 bde Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -165,6 +165,7 @@ main(argc, argv)
 		break;
 
 	case MACHINE_I386:
+	case MACHINE_PC98:
 		i386_ioconf();		/* Print ioconf.c */
 		vector();		/* Create vector.s */
 		break;
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 817350ee7ed9..b7053a0fe19a 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.33 1997/09/21 22:12:50 gibbs Exp $";
+	"$Id: mkioconf.c,v 1.34 1998/04/02 04:25:41 eivind Exp $";
 #endif /* not lint */
 
 #include <err.h>
@@ -654,7 +654,10 @@ i386_ioconf()
 		fprintf(fp, " */\n");
 		fprintf(fp, "\n");
 		fprintf(fp, "#include <i386/isa/icu.h>\n");
-		fprintf(fp, "#include <i386/isa/isa.h>\n");
+		if (machine == MACHINE_I386)
+			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");
@@ -676,7 +679,7 @@ i386_ioconf()
 				seen_wdc++;
 			if (eq(dp->d_name, "fdc"))
 				seen_fdc++;
-			if (dp->d_irq == 2) {
+			if ((dp->d_irq == 2) && (machine == MACHINE_I386)) {
 				fprintf(stderr,
 		"remapped irq 2 to irq 9, please update your config file\n");
 				dp->d_irq = 9;
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 76954a7283d6..603be311aec2 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mkmakefile.c,v 1.27 1998/02/19 00:51:49 eivind Exp $";
+	"$Id: mkmakefile.c,v 1.28 1998/03/16 11:15:45 eivind Exp $";
 #endif /* not lint */
 
 /*
@@ -149,6 +149,7 @@ static	struct users {
 	{ 8, 2, 512 },			/* MACHINE_PMAX */
 	{ 8, 2, 512 },			/* MACHINE_LUNA68K */
 	{ 8, 2, 512 },			/* MACHINE_NEWS3400 */
+	{ 8, 2, 512 },			/* MACHINE_PC98 */
 };
 #define	NUSERS	(sizeof (users) / sizeof (users[0]))