d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed pc98 support.

Browse Source 
(merged i386 changes from chunk.c 1.41 and disk.c 1.100)
This commit is contained in:
nyan 2002-11-07 14:54:53 +00:00
parent 2b9783b539
commit 2a35147541
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libdisk/chunk.c
View File

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

6
lib/libdisk/disk.c
View File

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