From 81f9f199b5e2a6741e5a9a68d39dd00dadaa4e18 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Sun, 17 Jun 2007 00:27:31 +0000 Subject: 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 --- sys/arch/mvme68k/include/disklabel.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sys/arch/mvme68k/include') diff --git a/sys/arch/mvme68k/include/disklabel.h b/sys/arch/mvme68k/include/disklabel.h index 010ad0deefe..3776099140d 100644 --- a/sys/arch/mvme68k/include/disklabel.h +++ b/sys/arch/mvme68k/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.8 2003/06/03 21:09:01 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.9 2007/06/17 00:27:27 deraadt Exp $ */ /* * Copyright (c) 1996 Nivas Madhur @@ -34,7 +34,6 @@ #define LABELSECTOR 0 /* 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 */ /* * a cpu_disklabel is a disklabel that the bug (prom) can understand @@ -57,8 +56,10 @@ * around, make sure the various members are properly aligned and the * compiler won't do any additional padding. */ - struct cpu_disklabel { +}; + +struct mvmedisklabel { /* VID */ u_char vid_id[4]; u_char vid_0[16]; -- cgit v1.2.3