diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-06-11 21:15:36 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-06-11 21:15:36 +0000 |
| commit | 43177235558bf8bdeed45272e325b9607be4bc8e (patch) | |
| tree | e52e481e0739381c9c316be3df30705d404846e0 /sys/arch/alpha/include/disklabel.h | |
| parent | 6697ef4d6370fd816213109f2b1890f82c64328c (diff) | |
Amiga is no longer amoung us. Some architectures were too sentimental
to cut all ties when it left for the attic. Eliminate (theoretical)
ability to read Amiga disklabels on those architectures.
mips64 compile tested by miod@
"whack away" deraadt@ "my amiga runs 3.2" niklas@
Diffstat (limited to 'sys/arch/alpha/include/disklabel.h')
| -rw-r--r-- | sys/arch/alpha/include/disklabel.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/arch/alpha/include/disklabel.h b/sys/arch/alpha/include/disklabel.h index 11eb2598036..f05e3477dc4 100644 --- a/sys/arch/alpha/include/disklabel.h +++ b/sys/arch/alpha/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.12 1999/12/04 03:35:55 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.13 2006/06/11 21:15:35 krw Exp $ */ /* $NetBSD: disklabel.h,v 1.1 1995/02/13 23:07:34 cgd Exp $ */ /* @@ -34,21 +34,19 @@ #ifndef _MACHINE_DISKLABEL_H_ #define _MACHINE_DISKLABEL_H_ -enum disklabel_tag { DLT_ALPHA, DLT_I386, DLT_AMIGA }; +enum disklabel_tag { DLT_ALPHA, DLT_I386 }; /* * What disklabels are we probing for, and in which order? */ #ifndef LABELPROBES -#define LABELPROBES DLT_ALPHA, DLT_I386, DLT_AMIGA +#define LABELPROBES DLT_ALPHA, DLT_I386 #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 AMIGA_LABELSECTOR 0 /* sector containing label */ -#define AMIGA_LABELOFFSET 64 /* offset of label in sector */ #define LABELSECTOR ALPHA_LABELSECTOR #define LABELOFFSET ALPHA_LABELOFFSET @@ -266,12 +264,6 @@ struct cpu_disklabel { struct dos_partition dosparts[NDOSPART]; struct dkbad bad; } _i386; - struct { - u_int32_t rdblock; /* RDBNULL -> inval. */ - u_int32_t pblist[MAXPARTITIONS];/* pblock number */ - int pbindex[MAXPARTITIONS]; /* index of pblock */ - int valid; /* valid? */ - } _amiga; } u; }; |