More changes of carrel@netbsd.org's that I missed.

4 files changed, 14 insertions, 12 deletions

diff --git a/sys/arch/hp300/DOC/Options b/sys/arch/hp300/DOC/Options
index 0a522b44605..ff2ef258736 100644
--- a/sys/arch/hp300/DOC/Options
+++ b/sys/arch/hp300/DOC/Options
@@ -1,5 +1,5 @@
-$OpenBSD: Options,v 1.2 1997/01/12 15:12:10 downsj Exp $
-$NetBSD: Options,v 1.5 1996/10/13 16:52:40 christos Exp $
+$OpenBSD: Options,v 1.3 1997/02/04 07:15:22 downsj Exp $
+$NetBSD: Options,v 1.6 1997/01/31 23:01:21 carrel Exp $
 
 Here is a list of hp300 specific kernel compilation options and what they
 mean:
@@ -24,8 +24,9 @@ HP330
 	Support for old hp330 (and 318/319) machines: 16mhz 68020, 68551 PMMU
 	and 16mhz 68881.  Compiles in support for PMMU.
 
+HP340
 HP360
-	Support for old hp360 (and 340) machines: 25mhz 68030+MMU and 25mhz
+	Support for old 340 and hp360 machines: 25mhz 68030+MMU and 25mhz
 	68882.  Compiles in support for PMMU and 68030.  Differs from HP330
 	in support for 68030 on-chip data cache.
 
diff --git a/sys/arch/hp300/dev/dma.c b/sys/arch/hp300/dev/dma.c
index fb0e25179c1..64ac58a23b0 100644
--- a/sys/arch/hp300/dev/dma.c
+++ b/sys/arch/hp300/dev/dma.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: dma.c,v 1.5 1997/02/03 04:47:22 downsj Exp $	*/
-/*	$NetBSD: dma.c,v 1.11 1997/01/30 09:04:33 thorpej Exp $	*/
+/*	$OpenBSD: dma.c,v 1.6 1997/02/04 07:15:24 downsj Exp $	*/
+/*	$NetBSD: dma.c,v 1.12 1997/01/31 23:01:25 carrel Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997
@@ -277,7 +277,7 @@ dmafree(dq)
 #endif
 
 	DMA_CLEAR(dc);
-#if defined(HP360) || defined(HP370) || defined(HP380)
+#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP380)
 	/*
 	 * XXX we may not always go thru the flush code in dmastop()
 	 */
@@ -426,7 +426,7 @@ dmago(unit, addr, count, flags)
 	if (mmutype == MMU_68040 && (flags & DMAGO_READ))
 		dc->dm_flags |= DMAF_PCFLUSH;
 #endif
-#if defined(HP360) || defined(HP370)
+#if defined(HP340) || defined(HP360) || defined(HP370)
 	/*
 	 * Remember if we need to flush external physical cache when
 	 * DMA is done.  We only do this if we are reading (writing memory).
@@ -479,7 +479,7 @@ dmastop(unit)
 	dmatimo[unit] = 0;
 #endif
 	DMA_CLEAR(dc);
-#if defined(HP360) || defined(HP370) || defined(HP380)
+#if defined(HP340) || defined(HP360) || defined(HP370) || defined(HP380)
 	if (dc->dm_flags & DMAF_PCFLUSH) {
 		PCIA();
 		dc->dm_flags &= ~DMAF_PCFLUSH;
diff --git a/sys/arch/hp300/dev/grf_subr.c b/sys/arch/hp300/dev/grf_subr.c
index 6349ebc3ca7..cd8ca3fce4f 100644
--- a/sys/arch/hp300/dev/grf_subr.c
+++ b/sys/arch/hp300/dev/grf_subr.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: grf_subr.c,v 1.2 1997/02/03 04:47:30 downsj Exp $	*/
-/*	$NetBSD: grf_subr.c,v 1.2 1997/01/30 09:18:49 thorpej Exp $	*/
+/*	$OpenBSD: grf_subr.c,v 1.3 1997/02/04 07:15:26 downsj Exp $	*/
+/*	$NetBSD: grf_subr.c,v 1.3 1997/01/31 21:16:50 carrel Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -88,6 +88,7 @@ grfdev_attach(sc, init, regs, sw)
 			return;
 		}
 
+		gp->g_flags = GF_ALIVE;
 		gp->g_sw = sw;
 		gp->g_display.gd_id = gp->g_sw->gd_swid;
 	}
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index ae8b4d9a0a3..3308b0757f9 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.15 1997/02/04 06:21:30 downsj Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.16 1997/02/04 07:15:28 downsj Exp $	*/
 /*	$NetBSD: machdep.c,v 1.77 1996/12/11 16:49:23 thorpej Exp $	*/
 
 /*
@@ -616,7 +616,7 @@ identifycpu()
 #ifndef HP330
 	case HP_330:
 #endif
-#if !defined(HP360) && !defined(HP370)
+#if !defined(HP340) && !defined(HP360) && !defined(HP370)
 	case HP_340:
 	case HP_360:
 	case HP_370: