Because model 362 does not have an SGC bus (or a blind, deaf and mute one),

there is no way we can tell models 360 and 362 apart by probing for an SGC
bus, or for a frodo(4) chip since of the `lil' black swan' 3x2 models, only
model 382 has frodo. So don't bother trying to tell models 360 and 362
apart, and use a common 36X symbol. No functional change except for useless
code removal.

13 files changed, 33 insertions, 62 deletions

diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index e410009217e..26d48b91709 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.52 2011/06/29 20:52:09 matthew Exp $
+#	$OpenBSD: GENERIC,v 1.53 2011/08/18 19:54:16 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -55,7 +55,7 @@ hilms*		at hil?		# mice, buttons and tablets
 wsmouse*	at hilms? mux 0
 hilid*		at hil?		# ID module
 
-# Frodo utility chip found on 362, 382 and 4xx's
+# Frodo utility chip found on 382 and 4xx's
 frodo0		at intio?
 #isabr0		at frodo0	# ISA slot on some 4xx models
 
diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK
index 39835a9cf1f..ded5176713a 100644
--- a/sys/arch/hp300/conf/RAMDISK
+++ b/sys/arch/hp300/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.31 2011/06/29 20:52:09 matthew Exp $
+#	$OpenBSD: RAMDISK,v 1.32 2011/08/18 19:54:16 miod Exp $
 #
 # Ram disk kernel.
 #
@@ -66,7 +66,7 @@ wskbd*		at hilkbd? mux 1
 #wsmouse*	at hilms? mux 0
 #hilid*		at hil?		# ID module
 
-# Frodo utility chip found on 362, 382 and 4xx's
+# Frodo utility chip found on 382 and 4xx's
 frodo0		at intio?
 
 # 8250-like serial ports found on Frodo ASIC
diff --git a/sys/arch/hp300/dev/frodo.c b/sys/arch/hp300/dev/frodo.c
index ecc38fd8452..a8589989aea 100644
--- a/sys/arch/hp300/dev/frodo.c
+++ b/sys/arch/hp300/dev/frodo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frodo.c,v 1.13 2010/09/20 06:33:47 matthew Exp $	*/
+/*	$OpenBSD: frodo.c,v 1.14 2011/08/18 19:54:18 miod Exp $	*/
 /*	$NetBSD: frodo.c,v 1.5 1999/07/31 21:15:20 thorpej Exp $	*/
 
 /*-
@@ -57,7 +57,7 @@
 
 /*
  * Support for the "Frodo" (a.k.a. "Apollo Utility") chip found
- * in HP Apollo 9000/4xx workstations, as well as HP 9000/362 and 9000/382.
+ * in HP Apollo 9000/4xx workstations, as well as HP 9000/382.
  */
 
 #include <sys/param.h>
@@ -137,7 +137,6 @@ frodomatch(parent, match, aux)
 
 	/* only specific workstations can have this */
 	switch (machineid) {
-	case HP_362:
 	case HP_382:
 	case HP_400:
 	case HP_425:
diff --git a/sys/arch/hp300/dev/sgc.c b/sys/arch/hp300/dev/sgc.c
index 96ad994a03d..b0030934fc1 100644
--- a/sys/arch/hp300/dev/sgc.c
+++ b/sys/arch/hp300/dev/sgc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sgc.c,v 1.6 2010/04/15 20:35:21 miod Exp $	*/
+/*	$OpenBSD: sgc.c,v 1.7 2011/08/18 19:54:18 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -71,8 +71,6 @@ static	int sgc_matched = 0;
 	 */
 
 	switch (machineid) {
-	case HP_362:
-	case HP_382:
 	case HP_400:
 	case HP_425:
 	case HP_433:
diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index b194203d207..250929ceb04 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.21 2005/09/27 22:05:37 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.22 2011/08/18 19:54:18 miod Exp $
 #	$NetBSD: genassym.cf,v 1.11 1998/02/16 20:58:29 thorpej Exp $
 
 #
@@ -57,8 +57,7 @@ export	HP_330
 export	HP_340
 export	HP_345
 export	HP_350
-export	HP_360
-export	HP_362
+export	HP_36X
 export	HP_370
 export	HP_375
 export	HP_380
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s
index 523dac45382..2b9278768c3 100644
--- a/sys/arch/hp300/hp300/locore.s
+++ b/sys/arch/hp300/hp300/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.65 2010/06/29 20:30:31 guenther Exp $	*/
+/*	$OpenBSD: locore.s,v 1.66 2011/08/18 19:54:18 miod Exp $	*/
 /*	$NetBSD: locore.s,v 1.91 1998/11/11 06:41:25 thorpej Exp $	*/
 
 /*
@@ -203,7 +203,7 @@ Lhaveihpib:
 	movl	#HP_340,a0@		| yes, must be a 340
 	jra	Lstart1
 Lnot370:
-	movl	#HP_360,a0@		| type is at least a 360
+	movl	#HP_36X,a0@		| type is at least a 360
 	movl	#0,a1@(MMUCMD)		| clear magic cookie2
 	movl	a1@(MMUCMD),d0		| read it back
 	btst	#16,d0			| still on?
@@ -338,20 +338,12 @@ Lis320:
 	 */
 
 Lisa36x:
-#if defined(HP362)
 	/*
-	 * If we found a 360, we need to check for a 362 (neither the 360
-	 * nor the 362 have a nonzero mmuid). Since the 362 has a frodo
-	 * utility chip in the DIO hole, check for it.
+	 * There is currently no easy way of telling a 362 and a 360
+	 * apart, except perhaps checking for the 362 frame buffer if
+	 * it isn't disabled.
 	 */
-	movl	#FRODO_BASE, a0
-	ASRELOC(phys_badaddr, a3)
-	jbsr	a3@
-	tstl	d0			| found a frodo?
-	jne	Lstart1			| no, really a 360 or a 380
-	RELOC(machineid,a0)
-	movl	#HP_362,a0@
-#endif
+	/* FALLTHROUGH */
 
 Lstart1:
 	/*
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 1a980d774fe..f0da415f8ba 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.132 2011/06/26 22:39:59 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.133 2011/08/18 19:54:18 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $	*/
 
 /*
@@ -325,7 +325,7 @@ const char *hp300_models[] = {
 	"320",		/* HP_320 */
 	"318/319/330",	/* HP_330 */
 	"350",		/* HP_350 */
-	"360",		/* HP_360 */
+	"360",		/* HP_36X */
 	"370",		/* HP_370 */
 	"340",		/* HP_340 */
 	"345",		/* HP_345 */
@@ -335,7 +335,6 @@ const char *hp300_models[] = {
 	"425",		/* HP_425 */
 	"433",		/* HP_433 */
 	"385",		/* HP_385 */
-	"362",		/* HP_362 */
 	"382",		/* HP_382 */
 };
 
@@ -485,11 +484,8 @@ identifycpu()
 #if !defined(HP350)
 	case HP_350:
 #endif
-#if !defined(HP360)
-	case HP_360:
-#endif
-#if !defined(HP362)
-	case HP_362:
+#if !defined(HP360) && !defined(HP_362)
+	case HP_36X:
 #endif
 #if !defined(HP370)
 	case HP_370:
diff --git a/sys/arch/hp300/include/hp300spu.h b/sys/arch/hp300/include/hp300spu.h
index ed1933935cc..3d6b86bb959 100644
--- a/sys/arch/hp300/include/hp300spu.h
+++ b/sys/arch/hp300/include/hp300spu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hp300spu.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $	*/
+/*	$OpenBSD: hp300spu.h,v 1.10 2011/08/18 19:54:18 miod Exp $	*/
 /*	$NetBSD: hp300spu.h,v 1.2 1997/05/01 05:26:48 thorpej Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #define	HP_320		0	/* 16MHz 68020+HP MMU+16K external cache */
 #define	HP_330		1	/* 16MHz 68020+68851 MMU */
 #define	HP_350		2	/* 25MHz 68020+HP MMU+32K external cache */
-#define	HP_360		3	/* 25MHz 68030 */
+#define	HP_36X		3	/* 25MHz 68030 */
 #define	HP_370		4	/* 33MHz 68030+64K external cache */
 #define	HP_340		5	/* 16MHz 68030 */
 #define	HP_345		6	/* 50MHz 68030+32K external cache */
@@ -52,8 +52,7 @@
 #define	HP_425		10	/* 25MHz 68040 */
 #define HP_433		11	/* 33MHz 68040 */
 #define	HP_385		12	/* 33MHz 68040 */
-#define	HP_362		13	/* 25MHz 68030 */
-#define	HP_382		14	/* 25MHz 68040 */
+#define	HP_382		13	/* 25MHz 68040 */
 
 /* values for mmuid - used to differentiate similar CPU/cache combos */
 #define	MMUID_345	1	/* 345 */
diff --git a/sys/arch/hp300/stand/common/autoconf.c b/sys/arch/hp300/stand/common/autoconf.c
index dc3160f987d..b5c6effaa7c 100644
--- a/sys/arch/hp300/stand/common/autoconf.c
+++ b/sys/arch/hp300/stand/common/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.7 2006/08/17 06:31:10 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.8 2011/08/18 19:54:19 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.12 1997/01/30 10:32:51 thorpej Exp $	*/
 
 /*
@@ -98,10 +98,7 @@ configure()
 		cpuspeed = MHZ_16;
 		break;
 	case HP_350:
-	case HP_360:
-#if 0	/* bootblocks do not tell 360 apart from 362 at the moment */
-	case HP_362:
-#endif
+	case HP_36X:
 		cpuspeed = MHZ_25;
 		break;
 	case HP_370:
diff --git a/sys/arch/hp300/stand/common/dnkbd.c b/sys/arch/hp300/stand/common/dnkbd.c
index fa3a66fa429..9bfac1b34db 100644
--- a/sys/arch/hp300/stand/common/dnkbd.c
+++ b/sys/arch/hp300/stand/common/dnkbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dnkbd.c,v 1.4 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: dnkbd.c,v 1.5 2011/08/18 19:54:19 miod Exp $	*/
 /*	$NetBSD: dnkbd.c,v 1.3 1997/05/12 07:47:03 thorpej Exp $	*/
 
 /*-
@@ -153,12 +153,9 @@ dnkbd_init()
 {
 
 	/*
-	 * 362, 382, 400, 425, and 433 models can have a Domain keyboard.
-	 * Note that we do not tell 360 from 362 in the bootblocks.
+	 * 400, 425, and 433 models can have a Domain keyboard.
 	 */
 	switch (machineid) {
-	case HP_360:
-	case HP_382:
 	case HP_400:
 	case HP_425:
 	case HP_433:
diff --git a/sys/arch/hp300/stand/common/ite.c b/sys/arch/hp300/stand/common/ite.c
index b6898d110ef..5db82642333 100644
--- a/sys/arch/hp300/stand/common/ite.c
+++ b/sys/arch/hp300/stand/common/ite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ite.c,v 1.9 2010/04/15 20:35:22 miod Exp $	*/
+/*	$OpenBSD: ite.c,v 1.10 2011/08/18 19:54:19 miod Exp $	*/
 /*	$NetBSD: ite.c,v 1.12 1997/01/30 10:32:55 thorpej Exp $	*/
 
 /*
@@ -165,11 +165,8 @@ iteconfig()
 
 	/*
 	 * Now probe for SGC frame buffers.
-	 * Note that we do not tell 360 from 362 in the bootblocks.
 	 */
 	switch (machineid) {
-	case HP_360:
-	case HP_382:
 	case HP_400:
 	case HP_425:
 	case HP_433:
diff --git a/sys/arch/hp300/stand/common/machdep.c b/sys/arch/hp300/stand/common/machdep.c
index 5c026d1d694..0e39ceab203 100644
--- a/sys/arch/hp300/stand/common/machdep.c
+++ b/sys/arch/hp300/stand/common/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.7 2006/08/17 06:31:10 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.8 2011/08/18 19:54:19 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1997/06/28 07:20:25 thorpej Exp $	*/
 
 /*
@@ -62,12 +62,9 @@ getmachineid()
 		cp = "345"; break;
 	case HP_350:
 		cp = "350"; break;
-	case HP_360:
-		cp = "360"; break;
-#if 0	/* bootblocks do not tell 360 apart from 362 at the moment */
-	case HP_362:
-		cp = "362"; break;
-#endif
+	case HP_36X:
+		/* bootblocks do not tell 360 apart from 362 at the moment */
+		cp = "360/362"; break;
 	case HP_370:
 		cp = "370"; break;
 	case HP_375:
diff --git a/sys/arch/hp300/stand/uboot/srt0.S b/sys/arch/hp300/stand/uboot/srt0.S
index ff0d3321b58..fb19bdc58d7 100644
--- a/sys/arch/hp300/stand/uboot/srt0.S
+++ b/sys/arch/hp300/stand/uboot/srt0.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: srt0.S,v 1.6 2006/08/17 06:31:10 miod Exp $	*/
+/*	$OpenBSD: srt0.S,v 1.7 2011/08/18 19:54:19 miod Exp $	*/
 /*	$NetBSD: srt0.S,v 1.4 1997/05/12 07:56:00 thorpej Exp $	*/
 
 /*
@@ -113,7 +113,7 @@ ASENTRY_NOPROFILE(begin)
 	jra	ihpibcheck
 
 not370:
-	movl	#HP_360,a0@		| type is at least a 360
+	movl	#HP_36X,a0@		| type is at least a 360
 	movl	#0,MMUCMD		| clear magic cookie2
 	movl	MMUCMD,d0		| read it back
 	btst	#16,d0			| still on?