summaryrefslogtreecommitdiff
path: root/sys/arch/mips
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-19 20:36:45 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-19 20:36:45 +0000
commitddc2bdf6cf5ce3bdbe1a0143306e59f839c48ecf (patch)
tree2f348b4eac2a9072aa2061a26c0b33cc9a0c43ae /sys/arch/mips
parent70c7ae29f65f33ad5dab03ec18ab6eda17bcc47d (diff)
add netbsd partition, rename 386BSD one to FreeBSD..
Diffstat (limited to 'sys/arch/mips')
-rw-r--r--sys/arch/mips/include/disklabel.h6
-rw-r--r--sys/arch/mips/mips/disksubr.c14
2 files changed, 14 insertions, 6 deletions
diff --git a/sys/arch/mips/include/disklabel.h b/sys/arch/mips/include/disklabel.h
index 7de65cec7eb..5a94cf9a4d1 100644
--- a/sys/arch/mips/include/disklabel.h
+++ b/sys/arch/mips/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.1 1998/01/28 11:14:39 pefo Exp $ */
+/* $OpenBSD: disklabel.h,v 1.2 1998/02/19 20:36:34 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -66,9 +66,9 @@ struct dos_partition {
#define DOSPTYP_FAT16C 0x0e /* 16-bit FAT, CHS-mapped */
#define DOSPTYP_ONTRACK 0x54
#define DOSPTYP_LINUX 0x83 /* That other thing */
-#define DOSPTYP_386BSD 0xa5 /* 386BSD partition type */
-#define DOSPTYP_NETBSD DOSPTYP_386BSD /* NetBSD partition type (XXX) */
+#define DOSPTYP_FREEBSD 0xa5 /* FreeBSD partition type */
#define DOSPTYP_OPENBSD 0xa6 /* OpenBSD partition type */
+#define DOSPTYP_NETBSD 0xa9 /* NetBSD partition type */
#include <sys/dkbad.h>
struct cpu_disklabel {
diff --git a/sys/arch/mips/mips/disksubr.c b/sys/arch/mips/mips/disksubr.c
index 0ad138cd7ab..5f25eec0375 100644
--- a/sys/arch/mips/mips/disksubr.c
+++ b/sys/arch/mips/mips/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.1 1998/01/28 12:12:07 pefo Exp $ */
+x1/* $OpenBSD: disksubr.c,v 1.2 1998/02/19 20:36:41 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -148,7 +148,12 @@ readdisklabel(dev, strat, lp, osdep)
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1;
i++, dp2++)
if (get_le(&dp2->dp_size) &&
- dp2->dp_typ == DOSPTYP_386BSD)
+ dp2->dp_typ == DOSPTYP_FREEBSD)
+ ourpart = i;
+ for (dp2=dp, i=0; i < NDOSPART && ourpart == -1;
+ i++, dp2++)
+ if (get_le(&dp2->dp_size) &&
+ dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart == -1)
goto donot;
@@ -416,7 +421,10 @@ writedisklabel(dev, strat, lp, osdep)
if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_OPENBSD)
ourpart = i;
for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
- if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_386BSD)
+ if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_FREEBSD)
+ ourpart = i;
+ for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++)
+ if (get_le(&dp2->dp_size) && dp2->dp_typ == DOSPTYP_NETBSD)
ourpart = i;
if (ourpart != -1) {