From b56fc99724bcff7ba3db2b6aa0794374d0c5d8c4 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Sat, 5 Aug 1995 16:47:34 +0000
Subject: [PATCH] Catch up with an include file change I missed before.

---
 sys/arch/hp300/stand/autoconf.c  | 2 +-
 sys/arch/hp300/stand/conf.c      | 2 +-
 sys/arch/hp300/stand/cons.c      | 7 ++++++-
 sys/arch/hp300/stand/consdefs.h  | 2 +-
 sys/arch/hp300/stand/dca.c       | 4 ++--
 sys/arch/hp300/stand/dcm.c       | 3 ++-
 sys/arch/hp300/stand/devopen.c   | 2 +-
 sys/arch/hp300/stand/fhpib.c     | 5 +++--
 sys/arch/hp300/stand/if_le.c     | 2 +-
 sys/arch/hp300/stand/ite.c       | 2 +-
 sys/arch/hp300/stand/netboot.c   | 2 +-
 sys/arch/hp300/stand/nhpib.c     | 3 ++-
 sys/arch/hp300/stand/pboot.c     | 6 +++---
 sys/arch/hp300/stand/rd.c        | 2 +-
 sys/arch/hp300/stand/samachdep.h | 4 +++-
 15 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/sys/arch/hp300/stand/autoconf.c b/sys/arch/hp300/stand/autoconf.c
index ba08b17266ac..17f3c20107c7 100644
--- a/sys/arch/hp300/stand/autoconf.c
+++ b/sys/arch/hp300/stand/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.8 1995/08/04 07:55:35 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.9 1995/08/05 16:47:34 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
diff --git a/sys/arch/hp300/stand/conf.c b/sys/arch/hp300/stand/conf.c
index 70d082d83bdb..9cb6365f0f5d 100644
--- a/sys/arch/hp300/stand/conf.c
+++ b/sys/arch/hp300/stand/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.7 1995/08/04 07:55:37 thorpej Exp $	*/
+/*	$NetBSD: conf.c,v 1.8 1995/08/05 16:47:36 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
diff --git a/sys/arch/hp300/stand/cons.c b/sys/arch/hp300/stand/cons.c
index 0f7648fc6e9b..80f2812c8f54 100644
--- a/sys/arch/hp300/stand/cons.c
+++ b/sys/arch/hp300/stand/cons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cons.c,v 1.7 1995/08/04 07:55:38 thorpej Exp $	*/
+/*	$NetBSD: cons.c,v 1.8 1995/08/05 16:47:37 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -64,6 +64,7 @@ struct consdev constab[] = {
 struct consdev *cn_tab;
 int noconsole;
 
+void
 cninit()
 {
 	register struct consdev *cp;
@@ -82,6 +83,7 @@ cninit()
 	}
 }
 
+int
 cngetc()
 {
 
@@ -91,6 +93,7 @@ cngetc()
 	return(0);
 }
 
+int
 cnputc(c)
 	int c;
 {
@@ -105,4 +108,6 @@ cnputc(c)
 #endif
 	if (cn_tab)
 		(*cn_tab->cn_putc)(0, c);
+
+	return (0);
 }
diff --git a/sys/arch/hp300/stand/consdefs.h b/sys/arch/hp300/stand/consdefs.h
index 57bfff267517..30ce1a12b68a 100644
--- a/sys/arch/hp300/stand/consdefs.h
+++ b/sys/arch/hp300/stand/consdefs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: consdefs.h,v 1.1 1995/08/04 07:55:39 thorpej Exp $	*/
+/*	$NetBSD: consdefs.h,v 1.2 1995/08/05 16:47:38 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
diff --git a/sys/arch/hp300/stand/dca.c b/sys/arch/hp300/stand/dca.c
index 95c328443f83..3c4ee3ea63c1 100644
--- a/sys/arch/hp300/stand/dca.c
+++ b/sys/arch/hp300/stand/dca.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dca.c,v 1.6 1995/08/04 07:55:40 thorpej Exp $	*/
+/*	$NetBSD: dca.c,v 1.7 1995/08/05 16:47:39 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -42,11 +42,11 @@
 
 #ifdef DCACONSOLE
 #include <sys/param.h>
-#include <machine/cpu.h>
 #include <dev/cons.h>
 
 #include <hp300/dev/dcareg.h>
 #include <hp300/stand/consdefs.h>
+#include <hp300/stand/samachdep.h>
 
 /* If not using 4.4 devs */
 #ifndef dca_reset
diff --git a/sys/arch/hp300/stand/dcm.c b/sys/arch/hp300/stand/dcm.c
index 605ac77d3191..afc9fe33a81a 100644
--- a/sys/arch/hp300/stand/dcm.c
+++ b/sys/arch/hp300/stand/dcm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dcm.c,v 1.6 1995/08/04 07:55:41 thorpej Exp $	*/
+/*	$NetBSD: dcm.c,v 1.7 1995/08/05 16:47:40 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -47,6 +47,7 @@
 #include <hp300/dev/device.h>
 #include <hp300/dev/dcmreg.h>
 #include <hp300/stand/consdefs.h>
+#include <hp300/stand/samachdep.h>
 
 struct dcmdevice *dcmcnaddr = NULL;
 
diff --git a/sys/arch/hp300/stand/devopen.c b/sys/arch/hp300/stand/devopen.c
index 81365ad81735..fe22240ed693 100644
--- a/sys/arch/hp300/stand/devopen.c
+++ b/sys/arch/hp300/stand/devopen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: devopen.c,v 1.4 1995/08/04 07:55:42 thorpej Exp $	*/
+/*	$NetBSD: devopen.c,v 1.5 1995/08/05 16:47:41 thorpej Exp $	*/
 
 /*-
  *  Copyright (c) 1993 John Brezak
diff --git a/sys/arch/hp300/stand/fhpib.c b/sys/arch/hp300/stand/fhpib.c
index 8766c30cacfb..c20071c0ceb3 100644
--- a/sys/arch/hp300/stand/fhpib.c
+++ b/sys/arch/hp300/stand/fhpib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fhpib.c,v 1.4 1994/10/26 07:27:18 cgd Exp $	*/
+/*	$NetBSD: fhpib.c,v 1.5 1995/08/05 16:47:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -41,7 +41,8 @@
 
 #include <sys/param.h>
 #include <hp300/dev/fhpibreg.h>
-#include "hpibvar.h"
+#include <hp300/stand/hpibvar.h>
+#include <hp300/stand/samachdep.h>
 
 fhpibinit(unit)
 	register int unit;
diff --git a/sys/arch/hp300/stand/if_le.c b/sys/arch/hp300/stand/if_le.c
index 4a36c69f32fd..ef7e13dbdc8c 100644
--- a/sys/arch/hp300/stand/if_le.c
+++ b/sys/arch/hp300/stand/if_le.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.4 1995/08/04 07:55:43 thorpej Exp $	*/
+/*	$NetBSD: if_le.c,v 1.5 1995/08/05 16:47:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1993 Adam Glass
diff --git a/sys/arch/hp300/stand/ite.c b/sys/arch/hp300/stand/ite.c
index 55b22e2c633a..8e650d6d0df5 100644
--- a/sys/arch/hp300/stand/ite.c
+++ b/sys/arch/hp300/stand/ite.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.8 1995/08/04 07:55:45 thorpej Exp $	*/
+/*	$NetBSD: ite.c,v 1.9 1995/08/05 16:47:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
diff --git a/sys/arch/hp300/stand/netboot.c b/sys/arch/hp300/stand/netboot.c
index b340a91072ea..9296fca2e4ae 100644
--- a/sys/arch/hp300/stand/netboot.c
+++ b/sys/arch/hp300/stand/netboot.c
@@ -323,7 +323,7 @@ main()
 	bootdev = -1;	/* network */
 	
 	printf("\n>> NetBSD NETWORK BOOT HP9000/%s CPU [%s]\n",
-	       getmachineid(), "$Revision: 1.4 $");
+	       getmachineid(), "$Revision: 1.5 $");
 
 	s = netif_open(NULL);	/* XXX machdep may be "le" */
 	if (s < 0)
diff --git a/sys/arch/hp300/stand/nhpib.c b/sys/arch/hp300/stand/nhpib.c
index 228c76a9411f..9b536bb3ce32 100644
--- a/sys/arch/hp300/stand/nhpib.c
+++ b/sys/arch/hp300/stand/nhpib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nhpib.c,v 1.4 1994/10/26 07:27:46 cgd Exp $	*/
+/*	$NetBSD: nhpib.c,v 1.5 1995/08/05 16:47:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -42,6 +42,7 @@
 #include <sys/param.h>
 #include <hp300/dev/nhpibreg.h>
 #include <hp300/stand/hpibvar.h>
+#include <hp300/stand/samachdep.h>
 
 nhpibinit(unit)
 {
diff --git a/sys/arch/hp300/stand/pboot.c b/sys/arch/hp300/stand/pboot.c
index a6cc765002a8..0984268ae163 100644
--- a/sys/arch/hp300/stand/pboot.c
+++ b/sys/arch/hp300/stand/pboot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pboot.c,v 1.6 1995/08/04 07:55:47 thorpej Exp $	*/
+/*	$NetBSD: pboot.c,v 1.7 1995/08/05 16:47:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$NetBSD: pboot.c,v 1.6 1995/08/04 07:55:47 thorpej Exp $";
+static char rcsid[] = "$NetBSD: pboot.c,v 1.7 1995/08/05 16:47:47 thorpej Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -70,7 +70,7 @@ main()
 	int currname = 0;
 
 	printf("\n>> NetBSD BOOT HP9000/%s CPU [%s]\n",
-	       getmachineid(), "$Revision: 1.6 $");
+	       getmachineid(), "$Revision: 1.7 $");
 
 	bdev   = B_TYPE(bootdev);
 	badapt = B_ADAPTOR(bootdev);
diff --git a/sys/arch/hp300/stand/rd.c b/sys/arch/hp300/stand/rd.c
index d54a27217966..0c4b9b4cfc4a 100644
--- a/sys/arch/hp300/stand/rd.c
+++ b/sys/arch/hp300/stand/rd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rd.c,v 1.8 1995/08/04 07:55:48 thorpej Exp $	*/
+/*	$NetBSD: rd.c,v 1.9 1995/08/05 16:47:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
diff --git a/sys/arch/hp300/stand/samachdep.h b/sys/arch/hp300/stand/samachdep.h
index 7c3fa1a72aef..192d2b4241af 100644
--- a/sys/arch/hp300/stand/samachdep.h
+++ b/sys/arch/hp300/stand/samachdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: samachdep.h,v 1.4 1994/10/26 07:27:55 cgd Exp $	*/
+/*	$NetBSD: samachdep.h,v 1.5 1995/08/05 16:47:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -71,6 +71,8 @@ extern	int howto;
 extern	unsigned int bootdev;
 extern	char *getmachineid();
 
+#define DELAY(n)	{ register int N = cpuspeed * (n); while (--N > 0); }
+
 /* bogon grfinfo structure to keep grf_softc happy */
 struct grfinfo {
 	int	grf_foo;