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@

2 files changed, 6 insertions, 56 deletions

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;