Fix recent breakage of non-floppies with 36 sectors/track.

Disable support for not looking at the label when booting from fd2d
(15-sector floppies in drive 2) and fd2b (other floppies in drive 2).
This commit is contained in:
Bruce Evans 1995-09-16 13:03:59 +00:00
parent 81df7b69ef
commit 45c7e5044d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=10819

View File

@ -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;