diff options
| author | nyan <nyan@FreeBSD.org> | 2002-11-07 14:54:53 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2002-11-07 14:54:53 +0000 |
| commit | 2a351475415b6fb03aaef8ee5cc67b602ce9dacf (patch) | |
| tree | 130dbae669e30b5052e4982cf5a836f19aa1de17 | |
| parent | 2b9783b539782804413026ab116195ec2d17ba59 (diff) | |
| download | FreeBSD-src-2a351475415b6fb03aaef8ee5cc67b602ce9dacf.zip FreeBSD-src-2a351475415b6fb03aaef8ee5cc67b602ce9dacf.tar.gz | |
Fixed pc98 support.
(merged i386 changes from chunk.c 1.41 and disk.c 1.100)
| -rw-r--r-- | lib/libdisk/chunk.c | 5 | ||||
| -rw-r--r-- | lib/libdisk/disk.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c index 819e7b3..199e6b7 100644 --- a/lib/libdisk/chunk.c +++ b/lib/libdisk/chunk.c @@ -275,10 +275,9 @@ Add_Chunk(struct disk *d, long offset, u_long size, const char *name, break; case p_pc98: switch (type) { - case freebsd: - subtype = 0xc494; - /* FALLTHROUGH */ case fat: + case pc98: + case freebsd: c1 = Find_Mother_Chunk(d->chunks, offset, end, whole); break; case part: diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c index 2a1b6aa..dc73860 100644 --- a/lib/libdisk/disk.c +++ b/lib/libdisk/disk.c @@ -24,7 +24,6 @@ __FBSDID("$FreeBSD$"); #include <sys/ioctl.h> #include <sys/disklabel.h> #include <sys/diskslice.h> -#include <sys/diskmbr.h> #include <sys/uuid.h> #include <sys/gpt.h> #include <paths.h> @@ -35,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include <assert.h> #include <uuid.h> -#define DOSPTYP_EXTENDED 5 #ifdef DEBUG #define DPRINT(x) warn x #define DPRINTX(x) warnx x @@ -274,8 +272,10 @@ Int_Open_Disk(const char *name) i = Add_Chunk(d, off, len, n, mbr, ty, 0, 0); else if (!strcmp(t, "BSD")) i = Add_Chunk(d, off, len, n, part, 0, 0, 0); + else if (!strcmp(t, "PC98") && ty == 0xc494) + i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0); else if (!strcmp(t, "PC98")) - i = Add_Chunk(d, off, len, n, pc98, 0, 0, 0); + i = Add_Chunk(d, off, len, n, pc98, ty, 0, 0); else if (!strcmp(t, "GPT")) i = Add_Chunk(d, off, len, n, ty, 0, 0, 0); else |
