remove unnecessary includes, initialize.

sys/arch/hpcsh/hpcsh/autoconf.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.4 2001/04/23 11:22:19 uch Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.5 2001/07/09 18:18:25 uch Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -42,23 +42,9 @@
  *	@(#)autoconf.c	8.1 (Berkeley) 6/10/93
  */
 
-#include <sys/cdefs.h>
-/*
- * Setup the system to run on the current machine.
- *
- * Configure() is called at boot time.  Available
- * devices are determined (from possibilities mentioned in ioconf.c),
- * and the drivers are initialized.
- */
-
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/map.h>
-#include <sys/buf.h>
-#include <sys/dkstat.h>
 #include <sys/conf.h>
 #include <sys/disklabel.h>
-#include <sys/reboot.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
@@ -71,13 +57,6 @@ static int booted_partition;
 static char booted_device_name[16];
 static void get_device(char *name);
 
-/*
- * Determine mass storage and memory configuration for a machine.
- * Print cpu type, and then iterate over an array of devices
- * found on the baseboard or in turbochannel option slots.
- * Once devices are configured, enable interrupts, and probe
- * for attached scsi devices.
- */
 void
 cpu_configure()
 {

sys/arch/hpcsh/hpcsh/bus_space.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.3 2001/03/15 17:30:56 uch Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.4 2001/07/09 18:18:25 uch Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,14 +33,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/map.h>
 #include <sys/extent.h>
 
-#include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 
 #ifdef BUS_SPACE_DEBUG

sys/arch/hpcsh/hpcsh/clock.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.1 2001/04/23 11:22:19 uch Exp $	*/
+/*	$NetBSD: clock.c,v 1.2 2001/07/09 18:18:25 uch Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 

sys/arch/hpcsh/hpcsh/conf.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.6 2001/07/08 10:42:37 uch Exp $	*/
+/*	$NetBSD: conf.c,v 1.7 2001/07/09 18:18:25 uch Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,13 +35,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
 #include <sys/conf.h>
-#include <sys/vnode.h>
-
-#include <dev/cons.h>
 
 /*
  * Block devices.

sys/arch/hpcsh/hpcsh/machdep.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.12 2001/07/08 15:15:25 uch Exp $	*/
+/*	$NetBSD: machdep.c,v 1.13 2001/07/09 18:18:25 uch Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -133,8 +133,8 @@ extern int	scdebug;
  * These variables are needed by /sbin/savecore
  */
 u_long	dumpmag = 0x8fca0101;	/* magic number */
-int 	dumpsize = 0;		/* pages */
+int 	dumpsize;		/* pages */
-long	dumplo = 0; 		/* blocks */
+long	dumplo; 		/* blocks */
 
 /* VM */
 static int	mem_cluster_init(paddr_t);

sys/arch/hpcsh/hpcsh/shb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: shb.c,v 1.5 2001/03/20 16:03:28 uch Exp $	*/
+/*	$NetBSD: shb.c,v 1.6 2001/07/09 18:18:25 uch Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.  All rights reserved.
@@ -32,25 +32,17 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/proc.h>
 
 #include <machine/autoconf.h>
-#include <machine/intr.h>
 #include <sh3/cpufunc.h>
 #include <sh3/intcreg.h>
 #include <sh3/trapreg.h>
 #include <machine/shbvar.h>
 
-#if 0
-#include <dev/isa/isareg.h>
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmareg.h>
-#endif
-
 #include <net/netisr.h>
+#include <hpcsh/hpcsh/debug.h>
 
 int shbmatch __P((struct device *, struct cfdata *, void *));
 void shbattach __P((struct device *, struct device *, void *));
@@ -371,6 +363,7 @@ intrhandler(p1, p2, p3, p4, frame)
 	if (intevt < 0xf00 && intevt != 0x420)
 		printf("INTEVT=%08x INTEVT2=%08x\n", intevt, intevt2);
 #endif
+	__dbg_heart_beat(HEART_BEAT_WHITE);
 
 #if 0
 	printf("intr_handler:int_no %x spc %x ssr %x r15 %x curproc %x\n",
@@ -617,6 +610,8 @@ void comsoft __P((void *));
 void
 Xsoftserial(void)
 {
+	__dbg_heart_beat(HEART_BEAT_BLUE);
+
 #if (NSCI > 0)
 	scisoft(NULL);
 #endif
@@ -634,6 +629,8 @@ Xsoftnet(void)
 {
 	int s, ni;
 
+	__dbg_heart_beat(HEART_BEAT_RED);
+
 	s = splhigh();
 	ni = netisr;
 	netisr = 0;
@@ -652,7 +649,7 @@ Xsoftnet(void)
 void
 Xsoftclock(void)
 {
-
+	__dbg_heart_beat(HEART_BEAT_GREEN);
         softclock(NULL);
 }