Move fd back.

2 files changed, 14 insertions, 20 deletions

diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 99f29ed7b97..7a83cccc6ce 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.20 1996/11/10 10:23:46 downsj Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.21 1996/11/10 21:31:52 downsj Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -132,7 +132,7 @@ u_long	bootdev = 0;		/* should be dev_t, but not until 32 bits */
 static const char *devname[] = {
 	"wd",		/* 0 = wd */
 	"sw",		/* 1 = sw */
-	"",		/* 2 */
+	"fd",		/* 2 = fd */
 	"wt",		/* 3 = wt */
 	"sd",		/* 4 = sd */
 	"",		/* 5 */
@@ -150,7 +150,7 @@ static const char *devname[] = {
 	"",		/* 17 */
 	"acd",		/* 18 = acd */
 	"",		/* 19 */
-	"fd"		/* 20 = fd */
+	""		/* 20 */
 };
 
 dev_t	argdev = NODEV;
@@ -249,6 +249,9 @@ struct	genericconf {
 #if NWDC > 0
 	{ &wd_cd,  "wd",  0 },
 #endif
+#if NFDC > 0
+	{ &fd_cd,  "fd",  2 },
+#endif
 #if NSD > 0
 	{ &sd_cd,  "sd",  4 },
 #endif
@@ -261,9 +264,6 @@ struct	genericconf {
 #if NACD > 0
 	{ &acd_cd,  "acd",  18 },
 #endif
-#if NFDC > 0
-	{ &fd_cd,  "fd",  20 },
-#endif
 	{ 0 }
 };
 
@@ -278,7 +278,7 @@ setconf()
 	char *num;
 
 #ifdef INSTALL
-	if (((bootdev >> B_TYPESHIFT) & B_TYPEMASK) == 20) {
+	if (((bootdev >> B_TYPESHIFT) & B_TYPEMASK) == 2) {
 		printf("\n\nInsert file system floppy...\n");
 		if (!(boothowto & RB_ASKNAME))
 			cngetc();
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 018852fc7c9..74796a2a103 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.27 1996/11/06 02:30:57 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.28 1996/11/10 21:31:52 downsj Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -72,7 +72,7 @@ struct bdevsw	bdevsw[] =
 {
 	bdev_disk_init(NWDC,wd),	/* 0: ST506/ESDI/IDE disk */
 	bdev_swap_init(1,sw),		/* 1: swap pseudo-device */
-	bdev_notdef(),
+	bdev_disk_init(NFD,fd),		/* 2: floppy diskette */
 	bdev_tape_init(NWT,wt),		/* 3: QIC-02/QIC-36 tape */
 	bdev_disk_init(NSD,sd),		/* 4: SCSI disk */
 	bdev_tape_init(NST,st),		/* 5: SCSI tape */
@@ -89,9 +89,6 @@ struct bdevsw	bdevsw[] =
 	bdev_disk_init(NCCD,ccd),	/* 16: concatenated disk driver */
 	bdev_disk_init(NRD,rd),		/* 17: ram disk driver */
 	bdev_disk_init(NACD,acd),	/* 18: ATAPI CD-ROM */
-	bdev_notdef(),
-	bdev_disk_init(NFD,fd),		/* 20: floppy diskette */
-	bdev_disk_init((NFD>2?NFD-2:0),fd),/* 21: floppy diskette */
 };
 int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 
@@ -220,7 +217,7 @@ struct cdevsw	cdevsw[] =
 #else
 	cdev_tty_init(NCOM,com),	/* 8: serial port */
 #endif
-	cdev_notdef(),
+	cdev_disk_init(NFD,fd),		/* 9: floppy disk */
 	cdev_tape_init(NWT,wt),		/* 10: QIC-02/QIC-36 tape */
 	cdev_disk_init(NSCD,scd),	/* 11: Sony CD-ROM */
 	cdev_pc_init(NPC + NVT,pc),	/* 12: PC console */
@@ -232,7 +229,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NCCD,ccd),	/* 18: concatenated disk driver */
 	cdev_ss_init(NSS,ss),           /* 19: SCSI scanner */
 	cdev_uk_init(NUK,uk),		/* 20: unknown SCSI */
-	cdev_ocis_init(NAPM,apm),	/* 21: Advanced Power Management */
+	cdev_ocis_init(NAPM,apm),	/* 21: Advancded Power Management */
 	cdev_fd_init(1,filedesc),	/* 22: file descriptor pseudo-device */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 23: Berkeley packet filter */
 	cdev_disk_init(NACD,acd),	/* 24: ATAPI CD-ROM */
@@ -262,9 +259,6 @@ struct cdevsw	cdevsw[] =
 	cdev_gen_ipf(NIPF,ipl),         /* 44 ip filtering */
 	cdev_random_init(1,random),	/* 45 random data source */
 	cdev_uk_init(NPCTR,pctr),	/* 46: pentium performance counters */
-	cdev_notdef(),
-	cdev_disk_init(NFD,fd),		/* 48: floppy disk */
-	cdev_disk_init((NFD>2?NFD-2:0),fd),	/* 49: floppy disk */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
@@ -315,7 +309,7 @@ static int chrtoblktbl[] = {
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
 	/*  8 */	NODEV,
-	/*  9 */	NODEV,
+	/*  9 */	2,
 	/* 10 */	3,
 	/* 11 */	15,
 	/* 12 */	NODEV,
@@ -354,8 +348,8 @@ static int chrtoblktbl[] = {
 	/* 45 */	NODEV,
 	/* 46 */	NODEV,
 	/* 47 */	NODEV,
-	/* 48 */	20,
-	/* 49 */	21,
+	/* 48 */	NODEV,
+	/* 49 */	NODEV,
 };
 
 /*