diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-07 23:47:38 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-07 23:47:38 +0000 |
| commit | 10157221a2659d2c272524b419801c7f9718ef12 (patch) | |
| tree | e41780893a681e8d7edd098722398f743353136a /sys/arch/hppa/include/disklabel.h | |
| parent | 82591ef1eb156d609b57ff16c71feb7d88b92aa1 (diff) | |
Unroll DLT_* logic into simple 'look for native disklabel, then try
DOS MBR' logic.
Leave DOS MBR logic inside #if defined(DISKLABEL_I386) blocks until
impact on install media can be evaluated. Eliminates most remnants
of cross-endian, cross-architecture disklabel processing attempts.
Fix some mips64 issues with last commit, found by kettenis@.
No functional change.
Diffstat (limited to 'sys/arch/hppa/include/disklabel.h')
| -rw-r--r-- | sys/arch/hppa/include/disklabel.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sys/arch/hppa/include/disklabel.h b/sys/arch/hppa/include/disklabel.h index a3e5b90e628..8f9f32a2c68 100644 --- a/sys/arch/hppa/include/disklabel.h +++ b/sys/arch/hppa/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.11 2006/07/03 20:00:22 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.12 2006/07/07 23:47:37 krw Exp $ */ /* $NetBSD: disklabel.h,v 1.1 1995/02/13 23:07:34 cgd Exp $ */ /* @@ -34,19 +34,10 @@ #ifndef _MACHINE_DISKLABEL_H_ #define _MACHINE_DISKLABEL_H_ -enum disklabel_tag { DLT_I386, DLT_HPPA }; - -/* - * What disklabels are we probing for, and in which order? - */ -#ifndef LABELPROBES -#define LABELPROBES DLT_I386, DLT_HPPA -#endif - -#define I386_LABELSECTOR 1 /* sector containing label */ -#define I386_LABELOFFSET 0 /* offset of label in sector */ #define HPPA_LABELSECTOR 1 /* sector containing label */ #define HPPA_LABELOFFSET 0 /* offset of label in sector */ +#define I386_LABELSECTOR 1 /* sector containing label */ +#define I386_LABELOFFSET 0 /* offset of label in sector */ #define LABELSECTOR HPPA_LABELSECTOR #define LABELOFFSET HPPA_LABELOFFSET @@ -186,7 +177,6 @@ struct hpux_label { #include <sys/dkbad.h> struct cpu_disklabel { - enum disklabel_tag labeltag; int labelsector; union { struct { |