From 3ca46e441b3adf4324e382c58bb65fa9ae99f709 Mon Sep 17 00:00:00 2001
From: uch <uch@NetBSD.org>
Date: Thu, 28 Mar 2002 15:26:57 +0000
Subject: [PATCH] rework HD64461, HD64465 interrupt handling.

---
 sys/arch/hpcsh/conf/GENERIC     | 20 +++++++++++---------
 sys/arch/hpcsh/conf/HPW650PA    | 11 ++++++-----
 sys/arch/hpcsh/conf/files.hpcsh | 12 +++++++++---
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/sys/arch/hpcsh/conf/GENERIC b/sys/arch/hpcsh/conf/GENERIC
index 00a552bd5a17..00d345ae1a7c 100644
--- a/sys/arch/hpcsh/conf/GENERIC
+++ b/sys/arch/hpcsh/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.21 2002/03/24 18:14:27 uch Exp $
+# $NetBSD: GENERIC,v 1.22 2002/03/28 15:26:57 uch Exp $
 #
 # GENERIC machine description file
 # 
@@ -38,7 +38,6 @@ options		SH3
 #	HITACHI HPW50PA		25MHz		100MHz
 #
 
-#options		KSTACK_DEBUG
 options 	DDB			# in-kernel debugger
 #options 	KGDB			# in-kernel debugger
 #makeoptions	DEBUG="-g"	# compile full symbol table
@@ -50,6 +49,8 @@ options 	DDB			# in-kernel debugger
 # HITACHI PERSONA (SH4)
 #options 	"KGDB_DEVNAME=\"hd64465uart\""
 
+#options	HPC_DEBUG_INTERRUPT_MONITOR
+#options	KSTACK_DEBUG
 options 	DIAGNOSTIC		# extra kernel debugging checks
 options 	DEBUG			# extra kernel debugging support
 #options 	KTRACE			# system call tracing support
@@ -69,6 +70,9 @@ options 	EXEC_ELF32	# 32-bit ELF executables
 file-system 	FFS		# UFS
 file-system 	MSDOSFS		# MS-DOS file system
 file-system	NFS		# Sun NFS-compatible filesystem client
+file-system 	UNION		# union file system
+file-system 	KERNFS		# /kern
+file-system 	PROCFS		# /proc
 
 # File system options
 
@@ -92,14 +96,16 @@ options 	WS_KERNEL_BG=WSCOL_BLUE
 #
 mainbus0 at root
 
-shb* at mainbus?
+cpu*		at mainbus?
+shb*		at mainbus?
+pfckbd*		at mainbus?
 
 #
 # Workstation Console attachments
 #
 hpcfb*		at hd64461video?
 wsdisplay*	at hpcfb?
-pfckbd*		at mainbus?
+
 hpckbd*		at pfckbd?
 wskbd*		at hpckbd? mux 1
 
@@ -130,12 +136,8 @@ pcmcia1 at hd64461pcmcia? controller 1 socket ? # memory card only
 # PCMCIA network interfaces
 ne*	at pcmcia0 function ?		# NE2000-compatible Ethernet
 mbe*	at pcmcia0 function ?		# MB8696x based Ethernet
-ukphy*	at mii? phy ?			# generic unknown PHYs
 
-# PCMCIA SCSI interfaces
-aic*	at pcmcia0 function ?		# Adaptec APA-1460 SCSI
-scsibus* at aic?
-sd*	at scsibus? target ? lun ?	# SCSI disk drives
+ukphy*	at mii? phy ?			# generic unknown PHYs
 
 # PCMCIA IDE disk
 # PC-Card slot
diff --git a/sys/arch/hpcsh/conf/HPW650PA b/sys/arch/hpcsh/conf/HPW650PA
index 6600738a9dc4..435033b1e978 100644
--- a/sys/arch/hpcsh/conf/HPW650PA
+++ b/sys/arch/hpcsh/conf/HPW650PA
@@ -1,4 +1,4 @@
-#	$NetBSD: HPW650PA,v 1.6 2002/03/24 18:14:28 uch Exp $
+#	$NetBSD: HPW650PA,v 1.7 2002/03/28 15:26:58 uch Exp $
 #
 #	HITACHI PERSONA HPW650PA
 #
@@ -13,7 +13,7 @@ options		KLOADER_DEBUG
 options		SH4			# SH7750V 128MHz
 options 	PCLOCK=32000000		# 32MHz
 
-options		INTERRUPT_MONITOR
+options		HPC_DEBUG_INTERRUPT_MONITOR
 options		HPC_DEBUG_LCD
 
 options 	DDB			# in-kernel debugger
@@ -54,13 +54,14 @@ options 	WS_KERNEL_BG=WSCOL_BLUE
 #
 mainbus0 at root
 
+cpu*		at mainbus?
+shb*		at mainbus?
 bivideo*	at mainbus0
+
 hpcfb*		at bivideo?
 wsdisplay*	at hpcfb?
 
-shb0		at mainbus?
-
-hd64465if*	at shb0
+hd64465if*	at shb?
 com*		at hd64465if?
 hd64465pcmcia*	at hd64465if?
 
diff --git a/sys/arch/hpcsh/conf/files.hpcsh b/sys/arch/hpcsh/conf/files.hpcsh
index b2d1f74001db..6ec92678e53a 100644
--- a/sys/arch/hpcsh/conf/files.hpcsh
+++ b/sys/arch/hpcsh/conf/files.hpcsh
@@ -1,4 +1,4 @@
-#	$NetBSD: files.hpcsh,v 1.25 2002/03/27 10:44:38 uch Exp $
+#	$NetBSD: files.hpcsh,v 1.26 2002/03/28 15:26:58 uch Exp $
 #
 maxpartitions 8
 
@@ -16,6 +16,7 @@ file	arch/hpcsh/hpcsh/machdep.c
 file	arch/hpcsh/hpcsh/console.c
 file	arch/hpcsh/hpcsh/autoconf.c
 file	arch/hpcsh/hpcsh/bus_space.c
+#file	arch/hpcsh/hpcsh/bus_dma.c
 file	arch/hpcsh/hpcsh/clock_machdep.c
 
 file	arch/hpc/hpc/kloader.c
@@ -36,7 +37,6 @@ include "dev/hpc/files.hpcfb"
 
 include "arch/hpc/conf/files.debug"
 file	arch/hpcsh/hpcsh/debug.c
-defflag	opt_interrupt_monitor.h		INTERRUPT_MONITOR
 
 #
 # Machine-independent SCSI drivers
@@ -111,8 +111,14 @@ file	arch/hpcsh/dev/hd64465/hd64465pcmcia.c	hd64465pcmcia
 #attach	ohci at hd64465if with hd64465ohci
 #file	arch/hpcsh/dev/hd64465/hd64465ohci.c	hd64465ohci
 
+#
+# HD64461/HD64465 common
+#
+file	arch/hpcsh/dev/hd6446x/hd6446x_subr.S	hd64461if | hd64465if
+file	arch/hpcsh/dev/hd6446x/hd6446xintc.c	hd64461if | hd64465if
+
 include	"dev/mii/files.mii"
-include "dev/usb/files.usb"
+#include "dev/usb/files.usb"
 include	"dev/wscons/files.wscons"
 
 #