Let sgc(4) attach on models 362 and 382 - recent documents uploaded to

bitsavers confirm the long suspicion the onboard frame buffer on these
machines is an SGC device.

3 files changed, 28 insertions, 23 deletions

diff --git a/sys/arch/hp300/dev/sgc.c b/sys/arch/hp300/dev/sgc.c
index 9460a2246c5..96ad994a03d 100644
--- a/sys/arch/hp300/dev/sgc.c
+++ b/sys/arch/hp300/dev/sgc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sgc.c,v 1.5 2007/01/06 20:10:57 miod Exp $	*/
+/*	$OpenBSD: sgc.c,v 1.6 2010/04/15 20:35:21 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -64,17 +64,22 @@ static	int sgc_matched = 0;
 
 	/* Allow only one instance. */
 	if (sgc_matched)
-		return (0);
+		return 0;
 
 	/*
 	 * Leave out machines which can not have an SGC bus.
 	 */
 
-	if (machineid != HP_400 && machineid != HP_425 &&
-	    machineid != HP_433)
-		return (0);
-
-	return (sgc_matched = 1);
+	switch (machineid) {
+	case HP_362:
+	case HP_382:
+	case HP_400:
+	case HP_425:
+	case HP_433:
+		return sgc_matched = 1;
+	default:
+		return 0;
+	}
 }
 
 void
diff --git a/sys/arch/hp300/stand/common/ite.c b/sys/arch/hp300/stand/common/ite.c
index 904251690e1..b6898d110ef 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.8 2008/01/23 16:37:56 jsing Exp $	*/
+/*	$OpenBSD: ite.c,v 1.9 2010/04/15 20:35:22 miod Exp $	*/
 /*	$NetBSD: ite.c,v 1.12 1997/01/30 10:32:55 thorpej Exp $	*/
 
 /*
@@ -164,11 +164,19 @@ iteconfig()
 	}
 
 	/*
-	 * Now probe for SGC frame buffers
+	 * Now probe for SGC frame buffers.
+	 * Note that we do not tell 360 from 362 in the bootblocks.
 	 */
-	if (machineid != HP_400 && machineid != HP_425 &&
-	    machineid != HP_433)
+	switch (machineid) {
+	case HP_360:
+	case HP_382:
+	case HP_400:
+	case HP_425:
+	case HP_433:
+		break;
+	default:
 		return;
+	}
 
 	for (dtype = 0; dtype < nitesw; dtype++)
 		if (itesw[dtype].ite_hwid == GID_STI)
diff --git a/sys/arch/hp300/stand/common/version.c b/sys/arch/hp300/stand/common/version.c
index bee28a63fec..458c9e7ea00 100644
--- a/sys/arch/hp300/stand/common/version.c
+++ b/sys/arch/hp300/stand/common/version.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: version.c,v 1.8 2006/08/17 06:31:10 miod Exp $	*/
+/*	$OpenBSD: version.c,v 1.9 2010/04/15 20:35:22 miod Exp $	*/
 
 /*
  * Record major changes in the boot code here, and increment the version
@@ -7,25 +7,17 @@
 
 /*
  * 2.0			INITIAL REVISION
- *
  * 2.1			APCI support, config changes from NetBSD.
- *
  * 2.2			Grand reorganization.
- *
  * 2.3			Added CD9660 boot support.
- *
  * 2.4			Added/fixed 425e support.
- *
  * 2.5			Added SYS_CDBOOT.
- *
  * 2.6			Fixed RTC reading for 2001.
- *
  * 2.7			Minor syncs with the kernel (recognize more models
  *			and use the same logic to pick the console on 425e).
- *
  * 2.8			TurboVRX frame buffer support.
- *
- * 2.9			SGC frame buffers supports, bug fixes and code cleanup
+ * 2.9			SGC frame buffers support, bug fixes and code cleanup
+ * 2.10			SGC support on models 362 and 382.
  */
 
-const char version[] = "2.9";
+const char version[] = "2.10";