diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-03 20:00:23 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-03 20:00:23 +0000 |
| commit | 141511f529dd014f1123943b675252f612002909 (patch) | |
| tree | 34678c11938563da654bf6f33425fd39d76dee5c /sys/arch/hppa64/include | |
| parent | dd326d0b747ea6e80c64b072ac3845516fd575ab (diff) | |
Eliminate most of the #if/#endif maze in alpha, hppa, hppa64, and mips64
disklabel code that was intended to support cross-endian and cross-architecture
use of disklabels. Never actually used except for Alpha<->Amiga moves that now
can't happen anyway.
Leave native and DOS MBR disklabel code. Tested on alpha and hppa.
No functional change.
Diffstat (limited to 'sys/arch/hppa64/include')
| -rw-r--r-- | sys/arch/hppa64/include/disklabel.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/hppa64/include/disklabel.h b/sys/arch/hppa64/include/disklabel.h index 5e99a86c884..08bd639495c 100644 --- a/sys/arch/hppa64/include/disklabel.h +++ b/sys/arch/hppa64/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.4 2006/06/26 23:11:31 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.5 2006/07/03 20:00:22 krw Exp $ */ /* $NetBSD: disklabel.h,v 1.1 1995/02/13 23:07:34 cgd Exp $ */ /* @@ -34,17 +34,15 @@ #ifndef _MACHINE_DISKLABEL_H_ #define _MACHINE_DISKLABEL_H_ -enum disklabel_tag { DLT_ALPHA, DLT_I386, DLT_HPPA }; +enum disklabel_tag { DLT_I386, DLT_HPPA }; /* * What disklabels are we probing for, and in which order? */ #ifndef LABELPROBES -#define LABELPROBES DLT_ALPHA, DLT_I386, DLT_HPPA +#define LABELPROBES DLT_I386, DLT_HPPA #endif -#define ALPHA_LABELSECTOR 0 /* sector containing label */ -#define ALPHA_LABELOFFSET 64 /* offset of label in sector */ #define I386_LABELSECTOR 1 /* sector containing label */ #define I386_LABELOFFSET 0 /* offset of label in sector */ #define HPPA_LABELSECTOR 1 /* sector containing label */ @@ -192,8 +190,6 @@ struct cpu_disklabel { int labelsector; union { struct { - } _alpha; - struct { struct dos_partition dosparts[NDOSPART]; struct dkbad bad; } _i386; |