diff options
| author | kato <kato@FreeBSD.org> | 1998-08-10 16:55:54 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1998-08-10 16:55:54 +0000 |
| commit | 439d4f873f5c3d3614d763c6d50c7a53bb6933b6 (patch) | |
| tree | 849a99b5a6fda5dfb7156bec68d10b43e785ddec /sys/pc98 | |
| parent | 27e9e805e96496f2a2d2f895728fd350d0a65d71 (diff) | |
| download | FreeBSD-src-439d4f873f5c3d3614d763c6d50c7a53bb6933b6.zip FreeBSD-src-439d4f873f5c3d3614d763c6d50c7a53bb6933b6.tar.gz | |
Sync with sys/i386/isa/diskslice_machdep.c revision 1.31.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/pc98/atcompat_diskslice.c | 9 | ||||
| -rw-r--r-- | sys/pc98/pc98/diskslice_machdep.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/pc98/pc98/atcompat_diskslice.c b/sys/pc98/pc98/atcompat_diskslice.c index e88be98..c25afaf 100644 --- a/sys/pc98/pc98/atcompat_diskslice.c +++ b/sys/pc98/pc98/atcompat_diskslice.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: atcompat_diskslice.c,v 1.10 1998/07/21 12:06:04 kato Exp $ + * $Id: atcompat_diskslice.c,v 1.11 1998/07/27 09:49:22 kato Exp $ */ /* @@ -52,6 +52,7 @@ #endif #include <sys/disklabel.h> #define DOSPTYP_EXTENDED 5 +#define DOSPTYP_EXTENDEDX 15 #define DOSPTYP_ONTRACK 84 #define PC98 #include <sys/diskslice.h> @@ -343,7 +344,8 @@ reread_mbr: /* Handle extended partitions. */ sp -= NDOSPART; for (dospart = 0; dospart < NDOSPART; dospart++, sp++) - if (sp->ds_type == DOSPTYP_EXTENDED) + if (sp->ds_type == DOSPTYP_EXTENDED || + sp->ds_type == DOSPTYP_EXTENDEDX) atcompat_extended(dname, bp->b_dev, strat, lp, ssp, sp->ds_offset, sp->ds_size, sp->ds_offset, max_nsectors, max_ntracks, mbr_offset); @@ -415,7 +417,8 @@ atcompat_extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, if (dp->dp_scyl == 0 && dp->dp_shd == 0 && dp->dp_ssect == 0 && dp->dp_start == 0 && dp->dp_size == 0) continue; - if (dp->dp_typ == DOSPTYP_EXTENDED) { + if (dp->dp_typ == DOSPTYP_EXTENDED || + dp->dp_typ == DOSPTYP_EXTENDEDX) { char buf[32]; sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c index 1d976fa..e2688ff 100644 --- a/sys/pc98/pc98/diskslice_machdep.c +++ b/sys/pc98/pc98/diskslice_machdep.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.14 1998/07/21 12:06:04 kato Exp $ + * $Id: diskslice_machdep.c,v 1.15 1998/07/27 09:49:23 kato Exp $ */ /* @@ -50,6 +50,7 @@ #include <sys/disklabel.h> #ifndef PC98 #define DOSPTYP_EXTENDED 5 +#define DOSPTYP_EXTENDEDX 15 #define DOSPTYP_ONTRACK 84 #endif #include <sys/diskslice.h> @@ -486,7 +487,8 @@ reread_mbr: /* Handle extended partitions. */ sp -= NDOSPART; for (dospart = 0; dospart < NDOSPART; dospart++, sp++) - if (sp->ds_type == DOSPTYP_EXTENDED) + if (sp->ds_type == DOSPTYP_EXTENDED || + sp->ds_type == DOSPTYP_EXTENDEDX) extended(dname, bp->b_dev, strat, lp, ssp, sp->ds_offset, sp->ds_size, sp->ds_offset, max_nsectors, max_ntracks, mbr_offset); @@ -571,7 +573,8 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, #ifdef PC98 if (dp->dp_mid == 0xff) { /* XXX */ #else - if (dp->dp_typ == DOSPTYP_EXTENDED) { + if (dp->dp_typ == DOSPTYP_EXTENDED || + dp->dp_typ == DOSPTYP_EXTENDEDX) { #endif char buf[32]; |
