A media type of floppy is detected automatically.

Submitted by:	Watanabe Kazuhiro <CQG00620@nifty.ne.jp>

1 files changed, 0 insertions, 31 deletions

diff --git a/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c
index fc17459..0101bde 100644
--- a/usr.sbin/sysinstall/floppy.c
+++ b/usr.sbin/sysinstall/floppy.c
@@ -64,9 +64,6 @@ mediaInitFloppy(Device *dev)
     struct msdosfs_args dosargs;
     struct ufs_args u_args;
     char *mp;
-#ifdef PC98
-    char fddev[24];
-#endif
 
     if (floppyMounted)
 	return TRUE;
@@ -88,46 +85,18 @@ mediaInitFloppy(Device *dev)
     }
 
     memset(&dosargs, 0, sizeof dosargs);
-#ifdef PC98
-    dosargs.fspec = fddev;
-#else
     dosargs.fspec = dev->devname;
-#endif
     dosargs.uid = dosargs.gid = 0;
     dosargs.mask = 0777;
 
     memset(&u_args, 0, sizeof(u_args));
-#ifdef PC98
-    u_args.fspec = fddev;
-#else
     u_args.fspec = dev->devname;
-#endif
 
-#ifdef PC98
-    snprintf(fddev, sizeof (fddev), "%s.1200", dev->devname);
     if (mount("msdosfs", mp, MNT_RDONLY, (caddr_t)&dosargs) != -1)
 	goto success;
     if (mount("ufs", mp, MNT_RDONLY, (caddr_t)&u_args) != -1)
 	goto success;
 
-    snprintf(fddev, sizeof (fddev), "%s.1232", dev->devname);
-    if (mount("msdosfs", mp, MNT_RDONLY, (caddr_t)&dosargs) != -1)
-	goto success;
-    if (mount("ufs", mp, MNT_RDONLY, (caddr_t)&u_args) != -1)
-	goto success;
-
-    snprintf(fddev, sizeof (fddev), "%s.1440", dev->devname);
-    if (mount("msdosfs", mp, MNT_RDONLY, (caddr_t)&dosargs) != -1)
-	goto success;
-    if (mount("ufs", mp, MNT_RDONLY, (caddr_t)&u_args) != -1)
-	goto success;
-#else
-    if (mount("msdosfs", mp, MNT_RDONLY, (caddr_t)&dosargs) != -1)
-	goto success;
-    if (mount("ufs", mp, MNT_RDONLY, (caddr_t)&u_args) != -1)
-	goto success;
-#endif /* PC98 */
-
     msgConfirm("Error mounting floppy %s (%s) on %s : %s",
 	       dev->name, dev->devname, mp, strerror(errno));
     return FALSE;