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@

8 files changed, 24 insertions, 224 deletions

diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 515dc643045..82b7687c203 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.43 2006/03/15 20:20:37 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.44 2006/06/11 21:15:35 krw Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -41,8 +41,6 @@
  *
  * XXX The DOS partitioning code is not endian-independent, only native
  * endian DOS partition tables can be parsed yet.
- *
- * XXX Amiga RDB partitioning is not understood yet.
  */
 
 #include <sys/param.h>
@@ -58,11 +56,9 @@
 #define DISKLABEL_ALPHA
 #elif (defined(i386) || defined(arc)) && !defined(DISKLABEL_I386)
 #define DISKLABEL_I386
-#elif defined(amiga) && !defined(DISKLABEL_AMIGA)
-#define DISKLABEL_AMIGA
 #endif
 
-#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
+#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_ALL)
 void	swapdisklabel(struct disklabel *d);
 char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
     int, int, struct disklabel *, int);
@@ -71,14 +67,10 @@ char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
 char   *readdoslabel(struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int *, int *, int);
 #endif
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-char   *readamigalabel(struct buf *, void (*)(struct buf *),
-    struct disklabel *, struct cpu_disklabel *, int);
-#endif
 
 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 };
 
-#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
+#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_ALL)
 
 /*
  * Byteswap all the fields that might be swapped.
@@ -269,12 +261,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 #endif
 			break;
 
-		case DLT_AMIGA:
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-			msg = readamigalabel(bp, strat, lp, osdep, spoofonly);
-#endif
-			break;
-
 		default:
 			panic("unrecognized disklabel tag %d", *tp);
 		}
@@ -546,26 +532,6 @@ donot:
 }
 #endif
 
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-/*
- * XXX RDB parsing is missing still.
- */
-char *
-readamigalabel(bp, strat, lp, osdep, spoofonly)
-	struct buf *bp;
-	void (*strat)(struct buf *);
-	struct disklabel *lp;
-	struct cpu_disklabel *osdep;
-	int spoofonly;
-{
-	char *msg;
-
-	msg = readbsdlabel(bp, strat, 0, AMIGA_LABELSECTOR, AMIGA_LABELOFFSET,
-	    BIG_ENDIAN, lp, spoofonly);
-	return (msg);
-}
-#endif
-
 /*
  * Check new disk label for sensibility
  * before setting it.
@@ -682,14 +648,6 @@ writedisklabel(dev, strat, lp, osdep)
 #endif
 			break;
 
-		case DLT_AMIGA:
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-			msg = readamigalabel(bp, strat, &dl, &cdl, 0);
-			labeloffset = AMIGA_LABELOFFSET;
-			endian = BIG_ENDIAN;
-#endif
-			break;
-
 		default:
 			panic("unrecognized disklabel tag %d", *tp);
 		}
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;
 };
 
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index 7052298e23c..7d13ed0f261 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.23 2006/03/15 20:20:39 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.24 2006/06/11 21:15:35 krw Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -42,8 +42,6 @@
  * XXX The DOS partitioning code is not endian-independent, only native
  * endian DOS partition tables can be parsed yet.
  *
- * XXX Amiga RDB partitioning is not understood yet.
- *
  * XXX HPUX disklabel is not understood yet.
  */
 
@@ -60,13 +58,11 @@
 #define DISKLABEL_ALPHA
 #elif (defined(i386) || defined(arc)) && !defined(DISKLABEL_I386)
 #define DISKLABEL_I386
-#elif defined(amiga) && !defined(DISKLABEL_AMIGA)
-#define DISKLABEL_AMIGA
 #elif (defined(hppa) || defined(hppa64)) && !defined(DISKLABEL_HPPA)
 #define DISKLABEL_HPPA
 #endif
 
-#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
+#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 void	swapdisklabel(struct disklabel *d);
 char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
     int, int, struct disklabel *, int);
@@ -75,10 +71,6 @@ char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
 char   *readdoslabel(struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int *, int *, int);
 #endif
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-char   *readamigalabel(struct buf *, void (*)(struct buf *),
-    struct disklabel *, struct cpu_disklabel *, int);
-#endif
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 char   *readliflabel(struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int *, int *, int);
@@ -86,7 +78,7 @@ char   *readliflabel(struct buf *, void (*)(struct buf *),
 
 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 };
 
-#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
+#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 
 /*
  * Byteswap all the fields that might be swapped.
@@ -277,12 +269,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 #endif
 			break;
 
-		case DLT_AMIGA:
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-			msg = readamigalabel(bp, strat, lp, osdep, spoofonly);
-#endif
-			break;
-
 		case DLT_HPPA:
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 			msg = readliflabel(bp, strat, lp, osdep, 0, 0, spoofonly);
@@ -561,26 +547,6 @@ donot:
 }
 #endif
 
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-/*
- * XXX RDB parsing is missing still.
- */
-char *
-readamigalabel(bp, strat, lp, osdep, spoofonly)
-	struct buf *bp;
-	void (*strat)(struct buf *);
-	struct disklabel *lp;
-	struct cpu_disklabel *osdep;
-	int spoofonly;
-{
-	char *msg;
-
-	msg = readbsdlabel(bp, strat, 0, AMIGA_LABELSECTOR, AMIGA_LABELOFFSET,
-	    BIG_ENDIAN, lp, spoofonly);
-	return (msg);
-}
-#endif
-
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 char *
 readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
@@ -861,14 +827,6 @@ writedisklabel(dev, strat, lp, osdep)
 #endif
 			break;
 
-		case DLT_AMIGA:
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-			msg = readamigalabel(bp, strat, &dl, &cdl, 0);
-			labeloffset = AMIGA_LABELOFFSET;
-			endian = BIG_ENDIAN;
-#endif
-			break;
-
 		case DLT_HPPA:
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 			msg = readliflabel(bp, strat, &dl, &cdl, &partoff,
diff --git a/sys/arch/hppa/include/disklabel.h b/sys/arch/hppa/include/disklabel.h
index 3e0ab8c6481..d9cdb94b2f8 100644
--- a/sys/arch/hppa/include/disklabel.h
+++ b/sys/arch/hppa/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.7 2004/08/01 07:34:18 mickey Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.8 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, DLT_HPPA };
+enum disklabel_tag { DLT_ALPHA, DLT_I386, DLT_HPPA };
 
 /*
  * What disklabels are we probing for, and in which order?
  */
 #ifndef LABELPROBES
-#define LABELPROBES		DLT_ALPHA, DLT_I386, DLT_AMIGA, DLT_HPPA
+#define LABELPROBES		DLT_ALPHA, 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	AMIGA_LABELSECTOR	0		/* sector containing label */
-#define	AMIGA_LABELOFFSET	64		/* offset of label in sector */
 #define	HPPA_LABELSECTOR	1		/* sector containing label */
 #define	HPPA_LABELOFFSET	0		/* offset of label in sector */
 
@@ -357,12 +355,6 @@ struct cpu_disklabel {
 			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;
-		struct {
 			struct lifvol lifvol;
 			struct lifdir lifdir[LIF_NUMDIR];
 			struct hpux_label hplabel;
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index dd6b18644dd..7dc23974450 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.6 2006/03/15 20:20:39 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.7 2006/06/11 21:15:35 krw Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -42,8 +42,6 @@
  * XXX The DOS partitioning code is not endian-independent, only native
  * endian DOS partition tables can be parsed yet.
  *
- * XXX Amiga RDB partitioning is not understood yet.
- *
  * XXX HPUX disklabel is not understood yet.
  */
 
@@ -60,13 +58,11 @@
 #define DISKLABEL_ALPHA
 #elif (defined(i386) || defined(arc)) && !defined(DISKLABEL_I386)
 #define DISKLABEL_I386
-#elif defined(amiga) && !defined(DISKLABEL_AMIGA)
-#define DISKLABEL_AMIGA
 #elif (defined(hppa) || defined(hppa64)) && !defined(DISKLABEL_HPPA)
 #define DISKLABEL_HPPA
 #endif
 
-#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
+#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 void	swapdisklabel(struct disklabel *d);
 char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
     int, int, struct disklabel *, int);
@@ -75,10 +71,6 @@ char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
 char   *readdoslabel(struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int *, int *, int);
 #endif
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-char   *readamigalabel(struct buf *, void (*)(struct buf *),
-    struct disklabel *, struct cpu_disklabel *, int);
-#endif
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 char   *readliflabel(struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int *, int *, int);
@@ -86,7 +78,7 @@ char   *readliflabel(struct buf *, void (*)(struct buf *),
 
 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 };
 
-#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
+#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 
 /*
  * Byteswap all the fields that might be swapped.
@@ -277,12 +269,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 #endif
 			break;
 
-		case DLT_AMIGA:
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-			msg = readamigalabel(bp, strat, lp, osdep, spoofonly);
-#endif
-			break;
-
 		case DLT_HPPA:
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 			msg = readliflabel(bp, strat, lp, osdep, 0, 0, spoofonly);
@@ -557,26 +543,6 @@ donot:
 }
 #endif
 
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-/*
- * XXX RDB parsing is missing still.
- */
-char *
-readamigalabel(bp, strat, lp, osdep, spoofonly)
-	struct buf *bp;
-	void (*strat)(struct buf *);
-	struct disklabel *lp;
-	struct cpu_disklabel *osdep;
-	int spoofonly;
-{
-	char *msg;
-
-	msg = readbsdlabel(bp, strat, 0, AMIGA_LABELSECTOR, AMIGA_LABELOFFSET,
-	    BIG_ENDIAN, lp, spoofonly);
-	return (msg);
-}
-#endif
-
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 char *
 readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
@@ -857,14 +823,6 @@ writedisklabel(dev, strat, lp, osdep)
 #endif
 			break;
 
-		case DLT_AMIGA:
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-			msg = readamigalabel(bp, strat, &dl, &cdl, 0);
-			labeloffset = AMIGA_LABELOFFSET;
-			endian = BIG_ENDIAN;
-#endif
-			break;
-
 		case DLT_HPPA:
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 			msg = readliflabel(bp, strat, &dl, &cdl, &partoff,
diff --git a/sys/arch/hppa64/include/disklabel.h b/sys/arch/hppa64/include/disklabel.h
index 423637e6644..b8d86419f00 100644
--- a/sys/arch/hppa64/include/disklabel.h
+++ b/sys/arch/hppa64/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.2 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, DLT_HPPA };
+enum disklabel_tag { DLT_ALPHA, DLT_I386, DLT_HPPA };
 
 /*
  * What disklabels are we probing for, and in which order?
  */
 #ifndef LABELPROBES
-#define LABELPROBES		DLT_ALPHA, DLT_I386, DLT_AMIGA, DLT_HPPA
+#define LABELPROBES		DLT_ALPHA, 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	AMIGA_LABELSECTOR	0		/* sector containing label */
-#define	AMIGA_LABELOFFSET	64		/* offset of label in sector */
 #define	HPPA_LABELSECTOR	1		/* sector containing label */
 #define	HPPA_LABELOFFSET	0		/* offset of label in sector */
 
@@ -357,12 +355,6 @@ struct cpu_disklabel {
 			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;
-		struct {
 			struct lifvol lifvol;
 			struct lifdir lifdir[LIF_NUMDIR];
 			struct hpux_label hplabel;
diff --git a/sys/arch/mips64/include/disklabel.h b/sys/arch/mips64/include/disklabel.h
index 6f7d3170e3c..90c300d9ac6 100644
--- a/sys/arch/mips64/include/disklabel.h
+++ b/sys/arch/mips64/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.3 2005/12/20 06:57:02 miod Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.4 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, DLT_HPPA, DLT_SGI };
+enum disklabel_tag { DLT_ALPHA, DLT_I386, DLT_HPPA, DLT_SGI };
 
 /*
  * What disklabels are we probing for, and in which order?
  */
 #ifndef LABELPROBES
-#define LABELPROBES	DLT_ALPHA, DLT_I386, DLT_AMIGA, DLT_HPPA, DLT_SGI
+#define LABELPROBES	DLT_ALPHA, DLT_I386, DLT_HPPA, DLT_SGI
 #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	HPPA_LABELSECTOR	1		/* sector containing label */
 #define	HPPA_LABELOFFSET	0		/* offset of label in sector */
 #define	SGI_LABELSECTOR		1		/* sector containing label */
@@ -420,12 +418,6 @@ struct cpu_disklabel {
 			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;
-		struct {
 			struct lifvol lifvol;
 			struct lifdir lifdir[LIF_NUMDIR];
 			struct hpux_label hplabel;
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index a5e9f1e9fd4..cef48a1ddc0 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.12 2006/03/15 20:20:40 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.13 2006/06/11 21:15:35 krw Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -42,8 +42,6 @@
  * XXX The DOS partitioning code is not endian-independent, only native
  * endian DOS partition tables can be parsed yet.
  *
- * XXX Amiga RDB partitioning is not understood yet.
- *
  * XXX HPUX disklabel is not understood yet.
  */
 
@@ -60,15 +58,13 @@
 #define DISKLABEL_ALPHA
 #elif (defined(i386) || defined(arc)) && !defined(DISKLABEL_I386)
 #define DISKLABEL_I386
-#elif defined(amiga) && !defined(DISKLABEL_AMIGA)
-#define DISKLABEL_AMIGA
 #elif defined(hppa) && !defined(DISKLABEL_HPPA)
 #define DISKLABEL_HPPA
 #elif defined(__sgi__) && !defined(DISKLABEL_SGI)
 #define DISKLABEL_SGI
 #endif
 
-#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL)
+#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL)
 void	swapdisklabel(struct disklabel *d);
 char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
     int, int, struct disklabel *, int);
@@ -77,10 +73,6 @@ char   *readbsdlabel(struct buf *, void (*)(struct buf *), int, int,
 char   *readdoslabel(struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int *, int *, int);
 #endif
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-char   *readamigalabel(struct buf *, void (*)(struct buf *),
-    struct disklabel *, struct cpu_disklabel *, int);
-#endif
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 char   *readliflabel(struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int *, int *, int);
@@ -93,7 +85,7 @@ void map_sgi_label(struct disklabel *, struct sgilabel *);
 
 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 };
 
-#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL)
+#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL)
 
 /*
  * Byteswap all the fields that might be swapped.
@@ -284,12 +276,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 #endif
 			break;
 
-		case DLT_AMIGA:
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-			msg = readamigalabel(bp, strat, lp, osdep, spoofonly);
-#endif
-			break;
-
 		case DLT_HPPA:
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 			msg = readliflabel(bp, strat, lp, osdep, 0, 0, spoofonly);
@@ -577,26 +563,6 @@ donot:
 }
 #endif
 
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-/*
- * XXX RDB parsing is missing still.
- */
-char *
-readamigalabel(bp, strat, lp, osdep, spoofonly)
-	struct buf *bp;
-	void (*strat)(struct buf *);
-	struct disklabel *lp;
-	struct cpu_disklabel *osdep;
-	int spoofonly;
-{
-	char *msg;
-
-	msg = readbsdlabel(bp, strat, 0, AMIGA_LABELSECTOR, AMIGA_LABELOFFSET,
-	    BIG_ENDIAN, lp, spoofonly);
-	return (msg);
-}
-#endif
-
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 char *
 readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly)
@@ -983,14 +949,6 @@ writedisklabel(dev, strat, lp, osdep)
 #endif
 			break;
 
-		case DLT_AMIGA:
-#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-			msg = readamigalabel(bp, strat, &dl, &cdl, 0);
-			labeloffset = AMIGA_LABELOFFSET;
-			endian = BIG_ENDIAN;
-#endif
-			break;
-
 		case DLT_HPPA:
 #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 			msg = readliflabel(bp, strat, &dl, &cdl, &partoff,