summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-24 04:22:44 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-24 04:22:44 +0000
commitb0c1a4093f70777c9c358394a31b46450046ac54 (patch)
tree86c57776f5397f3f7fde3dfc1b48de9715098131
parentae282bbf6006021f712e1dd09b6d30d57b77e630 (diff)
rename some DOS MBR partition types
-rw-r--r--sys/arch/alpha/alpha/disksubr.c5
-rw-r--r--sys/arch/alpha/include/disklabel.h5
-rw-r--r--sys/arch/arc/include/disklabel.h5
-rw-r--r--sys/arch/i386/i386/disksubr.c5
-rw-r--r--sys/arch/i386/include/disklabel.h5
-rw-r--r--sys/arch/mips/include/disklabel.h6
-rw-r--r--sys/arch/mips/mips/disksubr.c5
-rw-r--r--sys/arch/wgrisc/wgrisc/disksubr.c5
8 files changed, 25 insertions, 16 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 16d2dc3d617..f9128b8e3f9 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.18 1998/02/19 20:36:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.19 1998/02/24 04:22:40 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -445,8 +445,9 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
- case DOSPTYP_FAT16C:
case DOSPTYP_FAT32:
+ case DOSPTYP_FAT32L:
+ case DOSPTYP_FAT16L:
pp->p_fstype = FS_MSDOS;
n++;
break;
diff --git a/sys/arch/alpha/include/disklabel.h b/sys/arch/alpha/include/disklabel.h
index 34f59e5047d..256161b50fe 100644
--- a/sys/arch/alpha/include/disklabel.h
+++ b/sys/arch/alpha/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.9 1998/02/19 20:36:28 deraadt Exp $ */
+/* $OpenBSD: disklabel.h,v 1.10 1998/02/24 04:22:35 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.1 1995/02/13 23:07:34 cgd Exp $ */
/*
@@ -83,7 +83,8 @@ struct dos_partition {
#define DOSPTYP_EXTEND 0x05 /* Extended; contains sub-partitions */
#define DOSPTYP_FAT16B 0x06 /* 16-bit FAT, more than 32M */
#define DOSPTYP_FAT32 0x0b /* 32-bit FAT */
-#define DOSPTYP_FAT16C 0x0e /* 16-bit FAT, CHS-mapped */
+#define DOSPTYP_FAT32L 0x0c /* 32-bit FAT, LBA-mapped */
+#define DOSPTYP_FAT16L 0x0e /* 16-bit FAT, LBA-mapped */
#define DOSPTYP_ONTRACK 0x54
#define DOSPTYP_LINUX 0x83 /* That other thing */
#define DOSPTYP_FREEBSD 0xa5 /* FreeBSD partition type */
diff --git a/sys/arch/arc/include/disklabel.h b/sys/arch/arc/include/disklabel.h
index 5c902f6a889..e014963883d 100644
--- a/sys/arch/arc/include/disklabel.h
+++ b/sys/arch/arc/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.12 1998/02/19 20:36:30 deraadt Exp $ */
+/* $OpenBSD: disklabel.h,v 1.13 1998/02/24 04:22:36 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -66,7 +66,8 @@ struct dos_partition {
#define DOSPTYP_EXTEND 0x05 /* Extended; contains sub-partitions */
#define DOSPTYP_FAT16B 0x06 /* 16-bit FAT, more than 32M */
#define DOSPTYP_FAT32 0x0b /* 32-bit FAT */
-#define DOSPTYP_FAT16C 0x0e /* 16-bit FAT, CHS-mapped */
+#define DOSPTYP_FAT32L 0x0c /* 32-bit FAT, LBA-mapped */
+#define DOSPTYP_FAT16L 0x0e /* 16-bit FAT, LBA-mapped */
#define DOSPTYP_ONTRACK 0x54
#define DOSPTYP_LINUX 0x83 /* That other thing */
#define DOSPTYP_FREEBSD 0xa5 /* FreeBSD partition type */
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 9ca69a58faa..71c9bfc2292 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.32 1998/02/22 21:35:25 niklas Exp $ */
+/* $OpenBSD: disksubr.c,v 1.33 1998/02/24 04:22:41 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -217,8 +217,9 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
- case DOSPTYP_FAT16C:
case DOSPTYP_FAT32:
+ case DOSPTYP_FAT32L:
+ case DOSPTYP_FAT16L:
pp->p_fstype = FS_MSDOS;
n++;
break;
diff --git a/sys/arch/i386/include/disklabel.h b/sys/arch/i386/include/disklabel.h
index e929785d36f..9ea92468de3 100644
--- a/sys/arch/i386/include/disklabel.h
+++ b/sys/arch/i386/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.18 1998/02/19 20:36:31 deraadt Exp $ */
+/* $OpenBSD: disklabel.h,v 1.19 1998/02/24 04:22:37 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -65,7 +65,8 @@ struct dos_partition {
#define DOSPTYP_EXTEND 0x05 /* Extended; contains sub-partitions */
#define DOSPTYP_FAT16B 0x06 /* 16-bit FAT, more than 32M */
#define DOSPTYP_FAT32 0x0b /* 32-bit FAT */
-#define DOSPTYP_FAT16C 0x0e /* 16-bit FAT, CHS-mapped */
+#define DOSPTYP_FAT32L 0x0c /* 32-bit FAT, LBA-mapped */
+#define DOSPTYP_FAT16L 0x0e /* 16-bit FAT, LBA-mapped */
#define DOSPTYP_ONTRACK 0x54
#define DOSPTYP_LINUX 0x83 /* That other thing */
#define DOSPTYP_FREEBSD 0xa5 /* FreeBSD partition type */
diff --git a/sys/arch/mips/include/disklabel.h b/sys/arch/mips/include/disklabel.h
index 5a94cf9a4d1..65ad34864dc 100644
--- a/sys/arch/mips/include/disklabel.h
+++ b/sys/arch/mips/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.2 1998/02/19 20:36:34 deraadt Exp $ */
+/* $OpenBSD: disklabel.h,v 1.3 1998/02/24 04:22:39 deraadt Exp $ */
/* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */
/*
@@ -63,7 +63,9 @@ struct dos_partition {
#define DOSPTYP_FAT16S 0x04 /* 16-bit FAT, less than 32M */
#define DOSPTYP_EXTEND 0x05 /* Extended; contains sub-partitions */
#define DOSPTYP_FAT16B 0x06 /* 16-bit FAT, more than 32M */
-#define DOSPTYP_FAT16C 0x0e /* 16-bit FAT, CHS-mapped */
+#define DOSPTYP_FAT32 0x0b /* 32-bit FAT */
+#define DOSPTYP_FAT32L 0x0c /* 32-bit FAT, LBA-mapped */
+#define DOSPTYP_FAT16L 0x0e /* 16-bit FAT, LBA-mapped */
#define DOSPTYP_ONTRACK 0x54
#define DOSPTYP_LINUX 0x83 /* That other thing */
#define DOSPTYP_FREEBSD 0xa5 /* FreeBSD partition type */
diff --git a/sys/arch/mips/mips/disksubr.c b/sys/arch/mips/mips/disksubr.c
index e9394adacd5..8ee71293e04 100644
--- a/sys/arch/mips/mips/disksubr.c
+++ b/sys/arch/mips/mips/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.3 1998/02/21 11:54:40 pefo Exp $ */
+/* $OpenBSD: disksubr.c,v 1.4 1998/02/24 04:22:42 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -220,8 +220,9 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
- case DOSPTYP_FAT16C:
case DOSPTYP_FAT32:
+ case DOSPTYP_FAT32L:
+ case DOSPTYP_FAT16L:
pp->p_fstype = FS_MSDOS;
n++;
break;
diff --git a/sys/arch/wgrisc/wgrisc/disksubr.c b/sys/arch/wgrisc/wgrisc/disksubr.c
index 5e70dcb6175..177dc34f278 100644
--- a/sys/arch/wgrisc/wgrisc/disksubr.c
+++ b/sys/arch/wgrisc/wgrisc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.8 1998/02/19 20:36:44 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.9 1998/02/24 04:22:43 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -216,8 +216,9 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
- case DOSPTYP_FAT16C:
case DOSPTYP_FAT32:
+ case DOSPTYP_FAT32L:
+ case DOSPTYP_FAT16L:
pp->p_fstype = FS_MSDOS;
n++;
break;