aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1995-09-16 13:03:59 +0000
committerBruce Evans <bde@FreeBSD.org>1995-09-16 13:03:59 +0000
commit45c7e5044d994711ceef8734b784b6fa0cb7d621 (patch)
tree5dc6b511a2576a37d7a23d343fbcc631e3649010 /sys
parent81df7b69efc56b7362f4d0a7594a537b41feece5 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/i386/boot/biosboot/disk.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index 8227b1b71425..f6630ddad459 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:35:49 rpd
- * $Id: disk.c,v 1.14 1995/06/23 01:42:42 ache Exp $
+ * $Id: disk.c,v 1.15 1995/09/16 05:02:37 nate Exp $
*/
/*
@@ -92,15 +92,21 @@ devopen(void)
di = get_diskinfo(dosdev);
spt = SPT(di);
- /* Hack for 2.88MB drives */
- if (spt == 36) spt = 18;
+
+ /* Hack for 2.88MB floppy drives. */
+ if (!(dosdev & 0x80) && spt == 36)
+ spt = 18;
+
spc = spt * HEADS(di);
+
+#if 0 /* save a little more space and avoid surprises when booting from fd2 */
if (dosdev == 2)
{
boff = 0;
part = (spt == 15 ? 3 : 1);
}
else
+#endif
{
#ifdef EMBEDDED_DISKLABEL
dl = &disklabel;