From 36a1932601c730683d263ee933dd90cd6dae96bf Mon Sep 17 00:00:00 2001 From: asami Date: Fri, 14 Jun 1996 11:02:28 +0000 Subject: The Great PC98 Merge. All new code is "#ifdef PC98"ed so this should make no difference to PC/AT (and its clones) users. Ok'd by: core Submitted by: FreeBSD(98) development team --- sys/fs/msdosfs/msdosfs_denode.c | 9 +++++- sys/fs/msdosfs/msdosfs_lookup.c | 9 +++++- sys/fs/msdosfs/msdosfs_vfsops.c | 67 ++++++++++++++++++++++++++++++++++++++++- sys/fs/msdosfs/msdosfs_vnops.c | 16 +++++++++- 4 files changed, 97 insertions(+), 4 deletions(-) (limited to 'sys/fs') diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index bec376c..90d598d 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_denode.c,v 1.16 1996/01/19 03:58:42 dyson Exp $ */ +/* $Id: msdosfs_denode.c,v 1.17 1996/06/12 03:37:42 davidg Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */ /*- @@ -495,6 +495,13 @@ detrunc(dep, length, flags, cred, p) NOCRED, &bp); } else { bn = de_blk(pmp, length); +#ifdef PC98 + /* + * 1024 byte/sector support + */ + if (pmp->pm_BytesPerSec == 1024) + DETOV(dep)->v_flag |= 0x10000; +#endif error = bread(DETOV(dep), bn, pmp->pm_bpcluster, NOCRED, &bp); } diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c index bc52390..db4f927 100644 --- a/sys/fs/msdosfs/msdosfs_lookup.c +++ b/sys/fs/msdosfs/msdosfs_lookup.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_lookup.c,v 1.5 1995/11/07 14:06:43 phk Exp $ */ +/* $Id: msdosfs_lookup.c,v 1.6 1995/12/03 16:42:01 bde Exp $ */ /* $NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $ */ /*- @@ -172,6 +172,13 @@ msdosfs_lookup(ap) printf("msdosfs_lookup(): cache hit, vnode %08x, file %s\n", vdp, dp->de_Name); #endif +#ifdef PC98 + /* + * 1024 byte/sector support + */ + if (pmp->pm_BytesPerSec == 1024) + vdp->v_flag |= 0x10000; +#endif return 0; } vput(vdp); diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 18dc492..7ada694 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.11 1996/01/05 18:31:43 wollman Exp $ */ +/* $Id: msdosfs_vfsops.c,v 1.12 1996/04/03 23:05:40 gpalmer Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */ /*- @@ -273,6 +273,10 @@ mountmsdosfs(devvp, mp, p) struct buf *bp0 = NULL; struct byte_bpb33 *b33; struct byte_bpb50 *b50; +#ifdef PC98 + u_int pc98_wrk; + u_int Phy_Sector_Size; +#endif /* * Multiple mounts of the same block special file aren't allowed. @@ -311,7 +315,12 @@ mountmsdosfs(devvp, mp, p) * also add some checking on the bsOemName field. So far I've seen * the following values: "IBM 3.3" "MSDOS3.3" "MSDOS5.0" */ +#ifdef PC98 + devvp->v_flag &= 0xffff; + error = bread(devvp, 0, 1024, NOCRED, &bp0); +#else error = bread(devvp, 0, 512, NOCRED, &bp0); +#endif if (error) goto error_exit; bp0->b_flags |= B_AGE; @@ -319,7 +328,14 @@ mountmsdosfs(devvp, mp, p) b33 = (struct byte_bpb33 *) bsp->bs33.bsBPB; b50 = (struct byte_bpb50 *) bsp->bs50.bsBPB; #ifdef MSDOSFS_CHECKSIG +#ifdef PC98 + if (bsp->bs50.bsBootSectSig != BOOTSIG && + bsp->bs50.bsBootSectSig != 0 && /* PC98 DOS 3.3x */ + bsp->bs50.bsBootSectSig != 15760 && /* PC98 DOS 5.0 */ + bsp->bs50.bsBootSectSig != 64070) { /* PC98 DOS 3.3B */ +#else if (bsp->bs50.bsBootSectSig != BOOTSIG) { +#endif error = EINVAL; goto error_exit; } @@ -353,7 +369,11 @@ mountmsdosfs(devvp, mp, p) /* XXX - We should probably check more values here */ if (!pmp->pm_BytesPerSec || !pmp->pm_SectPerClust || !pmp->pm_Heads || pmp->pm_Heads > 255 || +#ifdef PC98 + !pmp->pm_SecPerTrack || pmp->pm_SecPerTrack > 255) { +#else !pmp->pm_SecPerTrack || pmp->pm_SecPerTrack > 63) { +#endif error = EINVAL; goto error_exit; } @@ -365,6 +385,41 @@ mountmsdosfs(devvp, mp, p) pmp->pm_HiddenSects = getushort(b33->bpbHiddenSecs); pmp->pm_HugeSectors = pmp->pm_Sectors; } +#ifdef PC98 /* for PC98 added Satoshi Yasuda */ + Phy_Sector_Size = 512; + if ((devvp->v_rdev>>8) == 2) { /* floppy check */ + if (((devvp->v_rdev&077) == 2) && (pmp->pm_HugeSectors == 1232)) { + Phy_Sector_Size = 1024; /* 2HD */ + /* + * 1024byte/sector support + */ + devvp->v_flag |= 0x10000; + } else { + if ((((devvp->v_rdev&077) == 3) /* 2DD 8 or 9 sector */ + && (pmp->pm_HugeSectors == 1440)) /* 9 sector */ + || (((devvp->v_rdev&077) == 4) + && (pmp->pm_HugeSectors == 1280)) /* 8 sector */ + || (((devvp->v_rdev&077) == 5) + && (pmp->pm_HugeSectors == 2880))) { /* 1.44M */ + Phy_Sector_Size = 512; + } else { + if (((devvp->v_rdev&077) != 1) + && ((devvp->v_rdev&077) != 0)) { /* 2HC */ + error = EINVAL; + goto error_exit; + } + } + } + } + pc98_wrk = pmp->pm_BytesPerSec / Phy_Sector_Size; + pmp->pm_BytesPerSec = Phy_Sector_Size; + pmp->pm_SectPerClust = pmp->pm_SectPerClust * pc98_wrk; + pmp->pm_HugeSectors = pmp->pm_HugeSectors * pc98_wrk; + pmp->pm_ResSectors = pmp->pm_ResSectors * pc98_wrk; + pmp->pm_FATsecs = pmp->pm_FATsecs * pc98_wrk; + pmp->pm_SecPerTrack = pmp->pm_SecPerTrack * pc98_wrk; + pmp->pm_HiddenSects = pmp->pm_HiddenSects * pc98_wrk; +#endif /* */ pmp->pm_fatblk = pmp->pm_ResSectors; pmp->pm_rootdirblk = pmp->pm_fatblk + (pmp->pm_FATs * pmp->pm_FATsecs); @@ -420,8 +475,18 @@ mountmsdosfs(devvp, mp, p) bit <<= 1; } +#ifdef PC98 + if (Phy_Sector_Size == 512) { + pmp->pm_brbomask = 0x01ff; /* 512 byte blocks only (so far) */ + pmp->pm_bnshift = 9; /* shift right 9 bits to get bn */ + } else { + pmp->pm_brbomask = 0x03ff; + pmp->pm_bnshift = 10; + } +#else pmp->pm_brbomask = 0x01ff; /* 512 byte blocks only (so far) */ pmp->pm_bnshift = 9; /* shift right 9 bits to get bn */ +#endif /* * Release the bootsector buffer. diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 899d9f8..83efc30 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.29 1995/12/03 16:42:02 bde Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.30 1995/12/07 12:47:20 davidg Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- @@ -558,6 +558,13 @@ msdosfs_read(ap) NOCRED, &bp); } else { rablock = lbn + 1; +#ifdef PC98 + /* + * 1024byte/sector support + */ + if (pmp->pm_BytesPerSec == 1024) + vp->v_flag |= 0x10000; +#endif if (vp->v_lastr + 1 == lbn && rablock * pmp->pm_bpcluster < dep->de_FileSize) { rasize = pmp->pm_bpcluster; @@ -693,6 +700,13 @@ msdosfs_write(ap) osize = dep->de_FileSize; +#ifdef PC98 + /* + * 1024byte/sector support + */ + if (pmp->pm_BytesPerSec == 1024) + thisvp->v_flag |= 0x10000; +#endif /* * If we write beyond the end of the file, extend it to its ultimate * size ahead of the time to hopefully get a contiguous area. -- cgit v1.1