Get rid of (unused) MACH_CLASSP580 and flatten MACH_CLASSxxx values.

2 files changed, 14 insertions, 30 deletions

diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index 96f860eb50e..e207e898011 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.40 2006/06/30 15:13:18 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.41 2006/09/22 22:15:17 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $	*/
 
 /*
@@ -191,24 +191,18 @@ extern int astpending;		/* need to trap before returning to user mode */
 /*
  * Machine classes.  These define subsets of the above machines.
  */
-#define MACH_CLASSH	0x0000	/* Hopeless cases... */
-#define MACH_CLASSII	0x0001	/* MacII class */
-#define MACH_CLASSIIci	0x0004	/* Have RBV, but no Egret */
-#define MACH_CLASSIIsi	0x0005	/* Similar to IIci -- Have Egret. */
-#define MACH_CLASSIIvx	0x0006	/* Similar to IIsi -- different via2 emul? */
-#define MACH_CLASSLC	0x0007	/* Low-Cost/Performa/Wal-Mart Macs. */
-#define MACH_CLASSPB	0x0008	/* Powerbooks.  Power management. */
-#define MACH_CLASSDUO	0x0009	/* Powerbooks Duos.  More integration/Docks. */
-#define MACH_CLASSIIfx	0x0080	/* The IIfx is in a class by itself. */
-#define MACH_CLASSQ	0x0100	/* non-A/V Centris/Quadras. */
-#define MACH_CLASSAV	0x0101	/* A/V Centris/Quadras. */
-#define MACH_CLASSQ2	0x0102	/* More Centris/Quadras, different sccA. */
-#define MACH_CLASSP580	0x0103	/* Similar to Quadras, but not quite.. */
-
-#define MACH_68020	0
-#define MACH_68030	1
-#define MACH_68040	2
-#define MACH_PENTIUM	3	/* 66 and 99 MHz versions *only* */
+#define MACH_CLASSH	0	/* Hopeless cases... */
+#define MACH_CLASSII	1	/* MacII class */
+#define MACH_CLASSIIci	2	/* Have RBV, but no Egret */
+#define MACH_CLASSIIsi	3	/* Similar to IIci -- Have Egret. */
+#define MACH_CLASSIIvx	4	/* Similar to IIsi -- different via2 emul? */
+#define MACH_CLASSLC	5	/* Low-Cost/Performa/Wal-Mart Macs. */
+#define MACH_CLASSPB	6	/* Powerbooks.  Power management. */
+#define MACH_CLASSDUO	7	/* Powerbooks Duos.  More integration/Docks. */
+#define MACH_CLASSIIfx	8	/* The IIfx is in a class by itself. */
+#define MACH_CLASSQ	9	/* non-A/V Centris/Quadras. */
+#define MACH_CLASSAV	10	/* A/V Centris/Quadras. */
+#define MACH_CLASSQ2	11	/* More Centris/Quadras, different sccA. */
 
 #ifdef _KERNEL
 struct mac68k_machine_S {
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 615844225eb..3ea4490df77 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.133 2006/06/11 20:49:27 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.134 2006/09/22 22:15:19 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $	*/
 
 /*
@@ -1596,7 +1596,6 @@ setmachdep()
 
 		break;
 	case MACH_CLASSAV:
-	case MACH_CLASSP580:
 		VIA2 = VIA2OFF;
 		IOBase = 0x50f00000;
 		Via1Base = (volatile u_char *)IOBase;
@@ -1690,15 +1689,6 @@ mac68k_set_io_offsets(base)
 		sccA = (volatile u_char *)base + 0xc020;
 		SCSIBase = base + 0x10000;
 		break;
-	case MACH_CLASSP580:
-		/*
-		 * Here's a queer bird... it seems to be a cross between
-		 * the two different Quadra classes.
-		 */
-		Via1Base = (volatile u_char *)base;
-		sccA = (volatile u_char *)base + 0xc020;
-		SCSIBase = base;
-		break;
 	case MACH_CLASSAV:
 		Via1Base = (volatile u_char *)base;
 		sccA = (volatile u_char *)base + 0x4000;