summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-09 18:05:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-09 18:05:48 +0000
commit7ce48a6e5031cf57aeef6bda2f6ad059f2041fc5 (patch)
tree53b0d565dda9e107793027d2efc1e04df42baeb3
parentdee7f16de5a81870bb319c545cbb42e2e7dadc51 (diff)
unify DOSPTYP_FAT* code (some architectures missed a filesystem type or two)
Diffstat
-rw-r--r--sys/arch/alpha/alpha/disksubr.c7
-rw-r--r--sys/arch/amd64/amd64/disksubr.c4
-rw-r--r--sys/arch/arm/arm/disksubr.c3
-rw-r--r--sys/arch/aviion/aviion/disksubr.c3
-rw-r--r--sys/arch/hppa/hppa/disksubr.c7
-rw-r--r--sys/arch/hppa64/hppa64/disksubr.c7
-rw-r--r--sys/arch/i386/i386/disksubr.c4
-rw-r--r--sys/arch/landisk/landisk/disksubr.c3
-rw-r--r--sys/arch/macppc/macppc/disksubr.c3
-rw-r--r--sys/arch/mips64/mips64/disksubr.c7
-rw-r--r--sys/arch/mvmeppc/mvmeppc/disksubr.c3
11 files changed, 26 insertions, 25 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index d83af88f3e8..a02595d5086 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.80 2007/06/09 18:03:59 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.81 2007/06/09 18:05:45 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -313,16 +313,15 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
+ case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
case DOSPTYP_FAT32L:
- case DOSPTYP_FAT16L:
pp->p_fstype = FS_MSDOS;
n++;
break;
case DOSPTYP_EXTEND:
case DOSPTYP_EXTENDL:
- part_blkno =
- letoh32(dp2->dp_start) + extoff;
+ part_blkno = letoh32(dp2->dp_start) + extoff;
if (!extoff) {
extoff = letoh32(dp2->dp_start);
part_blkno = 0;
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index a7fe2f31e56..883e5651b7b 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.43 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.44 2007/06/09 18:05:47 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -216,9 +216,9 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
- case DOSPTYP_FAT32L:
case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
+ case DOSPTYP_FAT32L:
pp->p_fstype = FS_MSDOS;
n++;
break;
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index 74a16f48ebe..c45b188a7d2 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.38 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.39 2007/06/09 18:05:47 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -189,6 +189,7 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
+ case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
case DOSPTYP_FAT32L:
pp->p_fstype = FS_MSDOS;
diff --git a/sys/arch/aviion/aviion/disksubr.c b/sys/arch/aviion/aviion/disksubr.c
index c468316b364..693f53f9522 100644
--- a/sys/arch/aviion/aviion/disksubr.c
+++ b/sys/arch/aviion/aviion/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.29 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.30 2007/06/09 18:05:47 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -189,6 +189,7 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
+ case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
case DOSPTYP_FAT32L:
pp->p_fstype = FS_MSDOS;
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index 3073277ff42..a33d94ee953 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.60 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.61 2007/06/09 18:05:47 deraadt Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -318,16 +318,15 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
+ case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
case DOSPTYP_FAT32L:
- case DOSPTYP_FAT16L:
pp->p_fstype = FS_MSDOS;
n++;
break;
case DOSPTYP_EXTEND:
case DOSPTYP_EXTENDL:
- part_blkno =
- letoh32(dp2->dp_start) + extoff;
+ part_blkno = letoh32(dp2->dp_start) + extoff;
if (!extoff) {
extoff = letoh32(dp2->dp_start);
part_blkno = 0;
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index cb36e7fb80b..0e82bae17f9 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.43 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.44 2007/06/09 18:05:47 deraadt Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -318,16 +318,15 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
+ case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
case DOSPTYP_FAT32L:
- case DOSPTYP_FAT16L:
pp->p_fstype = FS_MSDOS;
n++;
break;
case DOSPTYP_EXTEND:
case DOSPTYP_EXTENDL:
- part_blkno =
- letoh32(dp2->dp_start) + extoff;
+ part_blkno = letoh32(dp2->dp_start) + extoff;
if (!extoff) {
extoff = letoh32(dp2->dp_start);
part_blkno = 0;
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 5b39b485aec..a3f8b1628b3 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.83 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.84 2007/06/09 18:05:47 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -216,9 +216,9 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
- case DOSPTYP_FAT32L:
case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
+ case DOSPTYP_FAT32L:
pp->p_fstype = FS_MSDOS;
n++;
break;
diff --git a/sys/arch/landisk/landisk/disksubr.c b/sys/arch/landisk/landisk/disksubr.c
index 6706dd12e00..e52648d697c 100644
--- a/sys/arch/landisk/landisk/disksubr.c
+++ b/sys/arch/landisk/landisk/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.26 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.27 2007/06/09 18:05:47 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -189,6 +189,7 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
+ case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
case DOSPTYP_FAT32L:
pp->p_fstype = FS_MSDOS;
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 9532a75e1c2..9d2c3f466f8 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.48 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.49 2007/06/09 18:05:47 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -280,6 +280,7 @@ donot:
case DOSPTYP_FAT16B:
case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
+ case DOSPTYP_FAT32L:
pp->p_fstype = FS_MSDOS;
n++;
break;
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index fb8330d4b36..b2e2a2748e0 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.50 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.51 2007/06/09 18:05:47 deraadt Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -327,16 +327,15 @@ donot:
case DOSPTYP_FAT12:
case DOSPTYP_FAT16S:
case DOSPTYP_FAT16B:
+ case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
case DOSPTYP_FAT32L:
- case DOSPTYP_FAT16L:
pp->p_fstype = FS_MSDOS;
n++;
break;
case DOSPTYP_EXTEND:
case DOSPTYP_EXTENDL:
- part_blkno =
- letoh32(dp2->dp_start) + extoff;
+ part_blkno = letoh32(dp2->dp_start) + extoff;
if (!extoff) {
extoff = letoh32(dp2->dp_start);
part_blkno = 0;
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index 02082d25c2c..0f7cb2531ba 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.44 2007/06/09 04:08:39 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.45 2007/06/09 18:05:47 deraadt Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -194,6 +194,7 @@ donot:
case DOSPTYP_FAT16B:
case DOSPTYP_FAT16L:
case DOSPTYP_FAT32:
+ case DOSPTYP_FAT32L:
pp->p_fstype = FS_MSDOS;
n++;
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 01:31:13 +0000