From ea32beb755635f842b507221018ad1dc4a59021b Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Thu, 25 Feb 1999 17:18:35 +0000
Subject: sync and cleanup

---
 sys/arch/hppa/conf/GECKO   | 15 ++++++++-------
 sys/arch/hppa/conf/GENERIC | 21 ++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'sys/arch/hppa/conf')

diff --git a/sys/arch/hppa/conf/GECKO b/sys/arch/hppa/conf/GECKO
index 5fb1a7fc9cb..1bb0f3c7bb6 100644
--- a/sys/arch/hppa/conf/GECKO
+++ b/sys/arch/hppa/conf/GECKO
@@ -1,4 +1,4 @@
-#	$OpenBSD: GECKO,v 1.3 1999/02/25 16:35:17 mickey Exp $
+#	$OpenBSD: GECKO,v 1.4 1999/02/25 17:18:34 mickey Exp $
 #
 # HP 9000/712/{60,80,80i,100} boxens
 #
@@ -29,12 +29,13 @@ config	bsd swap generic
 
 mainbus0	at root		# root "bus"
 
-mem0	at mainbus0
+mem0	at mainbus0		# /dev/*mem, and memory controller
 pdc0	at mainbus0		# PDC/IODC wrapper for boot console
 cpu0	at mainbus0 #irq 31	# HP PA7100LC processor
-lasi*	at mainbus0 irq 28	# LASI host adapter (LSI ???)
-sti0	at mainbus0 		# STI graphics
-#sti1	at mainbus0 		# STI graphics (add-in card)
+lasi0	at mainbus0 irq 28	# LASI host adapter (LSI ???)
+#lasi1	at mainbus0 irq ?	# LASI host adapter in the GIO slot
+sti0	at mainbus0 		# onboard HCRX-8 graphics
+#sti1	at mainbus0 		# GIO slot HCRX-8 graphics
 
 # internal I/O space
 gsc*	at lasi?
@@ -55,10 +56,10 @@ fdc0	at gsc?	irq ?	# PC floppy controller (WD37C65C)
 # MI devices
 wsdisplay*	at sti?
 wskbd*		at pckbd?
-#wsmouse*	at pms?
+wsmouse*	at pms?
 
 option	FD_DEBUG
-fd0	at fdc0	drive 0	# floppy drives
+fd0	at fdc0	drive ?	# floppy drives
 
 sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 313ac82f602..6a5fcf708e4 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.4 1999/02/25 16:59:24 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.5 1999/02/25 17:18:34 mickey Exp $
 #
 # Generic kernel config (all that is supportted)
 #
@@ -35,10 +35,9 @@ config	bsd swap generic
 
 mainbus0 at root		# root "bus"
 
-mem*	at mainbus0
-cpu*	at mainbus0
-pdc0	at mainbus0
-
+mem*	at mainbus0		# /dev/*mem and memory controller (Viper)
+pdc0	at mainbus0		# PDC/IODC wrapper for boot console
+cpu*	at mainbus0 #irq 31	# HP PA-RISC cpu
 lasi*	at mainbus0 irq 28	# LASI host adapter (LSI PN???)
 asp*	at mainbus0 irq 28	# this one comes w/ Viper and leds
 #wax*	at mainbus0 irq 28	# Wax may host EISA as well
@@ -71,16 +70,16 @@ com0	at gsc? irq 5	# RS/232 serial port
 com1	at gsc? irq 6	# RS/232 serial port
 lpt0	at gsc? irq 7	# LPT centronics iface
 ie0	at gsc? irq 8	# 82C5[89]6 ether
-#siop0	at gsc? irq 9	# NCR 53C7xx
-#siop1	at gsc? irq 3	# NCR 53C7xx (Fast/Wide)
-#scsibus* at siop?
+siop0	at gsc? irq 9	# NCR 53C7xx
+siop1	at gsc? irq 3	# NCR 53C7xx (Fast/Wide)
+scsibus* at siop?
 #aone*	at gsc? irq 13	# Audio Type 1 (PSB 2160-N)
 #audio* at aone?
 #atwo*	at gsc?	irq 13	# Audio Type 2 (CS4215)
 #audio* at atwo?
 pckbc*	at gsc? irq 27
 pckbd*	at pckbc?	# PS/2 keyboard
-#pms*	at pckbc?	# PS/2 mouse
+pms*	at pckbc?	# PS/2 mouse
 #fdc*	at gsc?		# PC floppy controller (WD37C65C)
 #option	FD_DEBUG
 
@@ -105,10 +104,10 @@ scsibus* at bha?
 # MI devices
 option	WSEMUL_DUMB
 #wsdisplay*	at vgafb?
-#wsdisplay*	at sti?
+wsdisplay*	at sti?
 wskbd*		at pckbd?
 #wskbd*		at hkbd?
-#wsmouse*	at pms?
+wsmouse*	at pms?
 #wsmouse*	at hms?
 
 #fd*	at fdc?	drive ?	# floppy drives
-- 
cgit v1.2.3