significantly simplified disklabel infrastructure. MBR handling becomes MI

to support hotplug media on most architectures.  disklabel setup and
verification done using new helper functions.  Disklabels must *always*
have a correct checksum now.  Same code paths are used to learn on-disk
location disklabels, to avoid new errors sneaking in.  Tested on almost all
cases, testing help from todd, kettenis, krw, otto, dlg, robert, gwk, drahn

1 files changed, 1 insertions, 62 deletions

diff --git a/sys/arch/sh/include/disklabel.h b/sys/arch/sh/include/disklabel.h
index db6ded7f74b..5c38c2bd8c5 100644
--- a/sys/arch/sh/include/disklabel.h
+++ b/sys/arch/sh/include/disklabel.h
@@ -1,5 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.5 2006/10/20 23:47:43 krw Exp $	*/
-/*	$NetBSD: disklabel.h,v 1.2 2001/11/25 19:02:03 thorpej Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.6 2007/06/17 00:27:28 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -34,14 +33,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * RiscBSD kernel project
- *
- * disklabel.h
- *
- * machine specific disk label info
- *
- * Created      : 04/10/94
  */
 
 #ifndef _ARM_DISKLABEL_H_
@@ -50,58 +41,6 @@
 #define LABELSECTOR	1		/* sector containing label */
 #define LABELOFFSET	0		/* offset of label in sector */
 #define MAXPARTITIONS	16		/* number of partitions */
-#define RAW_PART	2		/* raw partition: XX?c */
-
-#if 0
-#include <arm/disklabel_acorn.h>
-#include <sys/disklabel_mbr.h>
-#endif
-
-/* MBR partition table */
-#define	DOSBBSECTOR	0		/* MBR sector number */
-#define	DOSPARTOFF	446		/* Offset of MBR partition table */
-#define	NDOSPART	4		/* # of partitions in MBR */
-#define	DOSMAGICOFF	510		/* Offset of magic number */
-#define	DOSMAGIC	0xaa55		/* Actual magic number */
-#define	MBRMAGIC	DOSMAGIC
-#define DOSMBR_SIGNATURE MBRMAGIC
-#define DOSMBR_SIGNATURE_OFF DOSMAGICOFF
-#define	DOSACTIVE	0x80
-
-
-struct dos_partition {
-	u_int8_t	dp_flag;	/* bootstrap flags */
-	u_int8_t	dp_shd;		/* starting head */
-	u_int8_t	dp_ssect;	/* starting sector */
-	u_int8_t	dp_scyl;	/* starting cylinder */
-	u_int8_t	dp_typ;		/* partition type (see below) */
-	u_int8_t	dp_ehd;		/* end head */
-	u_int8_t	dp_esect;	/* end sector */
-	u_int8_t	dp_ecyl;	/* end cylinder */
-	u_int32_t	dp_start;	/* absolute starting sector number */
-	u_int32_t	dp_size;	/* partition size in sectors */
-};
-
-/* Known DOS partition types. */
-#define	DOSPTYP_UNUSED	0x00		/* Unused partition */
-#define DOSPTYP_FAT12	0x01		/* 12-bit FAT */
-#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_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_EXTENDL 0x0f		/* Extended, LBA-mapped; contains sub-partitions */
-#define DOSPTYP_ONTRACK	0x54
-#define	DOSPTYP_LINUX	0x83		/* That other thing */
-#define DOSPTYP_FREEBSD	0xa5		/* FreeBSD partition type */
-#define DOSPTYP_OPENBSD	0xa6		/* OpenBSD partition type */
-#define DOSPTYP_NETBSD	0xa9		/* NetBSD partition type */
-
-/* Isolate the relevant bits to get sector and cylinder. */
-#define	DPSECT(s)	((s) & 0x3f)
-#define	DPCYL(c, s)	((c) + (((s) & 0xc0) << 2))
-
 
 struct cpu_disklabel {
 };