summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authormickey <mickey@openbsd.org>2002-03-01 23:27:57 +0000
committermickey <mickey@openbsd.org>2002-03-01 23:27:57 +0000
commitf6a96cd120596d55c2e79d6636c6446eadcba5ba (patch)
tree22725ae8f53e1887f11e778e565ed3c6b15a7c2d /sys
parentremove tcp_fasttimo and convert delayed acks to the timeout(9) API instead. (diff)
downloadwireguard-openbsd-f6a96cd120596d55c2e79d6636c6446eadcba5ba.tar.xz
wireguard-openbsd-f6a96cd120596d55c2e79d6636c6446eadcba5ba.zip
fix a few irq assignments
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/hppa/conf/GECKO9
-rw-r--r--sys/arch/hppa/conf/SHEPHERD_PIE8
-rw-r--r--sys/arch/hppa/conf/generic.hppa8
3 files changed, 15 insertions, 10 deletions
diff --git a/sys/arch/hppa/conf/GECKO b/sys/arch/hppa/conf/GECKO
index 8ca25918f20..2c03a463a4c 100644
--- a/sys/arch/hppa/conf/GECKO
+++ b/sys/arch/hppa/conf/GECKO
@@ -1,4 +1,4 @@
-# $OpenBSD: GECKO,v 1.13 2002/02/12 16:22:08 mickey Exp $
+# $OpenBSD: GECKO,v 1.14 2002/03/01 23:27:57 mickey Exp $
#
# HP 9000/712/{60,80,80i,100} boxens
#
@@ -20,9 +20,9 @@ config bsd swap generic
lasi0 at mainbus0 offset 0x100000 irq 28 # LASI host adapter (LSI ???)
lasi1 at mainbus0 offset 0x500000 irq 27 # LASI host adapter in the GIO
-#wax0 at mainbus0 irq 27? # WAX ASIC in the GIO slot
-sti0 at mainbus0 # onboard HCRX-8 graphics
-sti1 at mainbus0 # GIO slot HCRX-8 graphics A2263-65538
+#wax0 at mainbus0 irq 24 # WAX ASIC in the GIO slot
+sti0 at mainbus0 irq 11 # onboard HCRX-8 graphics
+sti1 at mainbus0 irq 12 # GIO slot HCRX-8 graphics A2263-65538
# internal I/O space
gsc0 at lasi0
@@ -30,6 +30,7 @@ gsc1 at lasi1
#gsc2 at wax0
com0 at gsc0 irq 5 # serial port
com1 at gsc1 irq 5 # serial port on A2263-6653[56]
+com2 at gsc0 irq 13 # only on asp w/o harmony
lpt0 at gsc0 irq 7 # both com0 and lpt0 are on LASI
ie0 at gsc0 irq 8 # 82C596 ether
ie1 at gsc1 irq 8 # 82C596 ether on A2263-66536
diff --git a/sys/arch/hppa/conf/SHEPHERD_PIE b/sys/arch/hppa/conf/SHEPHERD_PIE
index 0f1ade9bac6..6683622ed32 100644
--- a/sys/arch/hppa/conf/SHEPHERD_PIE
+++ b/sys/arch/hppa/conf/SHEPHERD_PIE
@@ -1,4 +1,4 @@
-# $OpenBSD: SHEPHERD_PIE,v 1.15 2002/02/11 21:37:21 mickey Exp $
+# $OpenBSD: SHEPHERD_PIE,v 1.16 2002/03/01 23:27:57 mickey Exp $
#
# Diskless kernel config
#
@@ -72,12 +72,13 @@ option USELEDS # blink 'em
lasi0 at mainbus0 offset 0x100000 irq 28 # LASI host adapter (LSI PN???)
lasi1 at mainbus0 offset 0x500000 irq 27 # GIO card
asp* at mainbus0 irq 28 # this one comes w/ Viper and leds
-#wax* at mainbus0 irq 27 # Wax may host EISA as well
+#wax* at mainbus0 irq 24 # Wax may host EISA as well
mongoose* at mainbus0 irq 17 # EISA Bus Adapter (i82350 or TI???)
#vmeb* at mainbus0 irq ? # VME bus adapter
#dino* at mainbus0 irq ? # PCI bus bridge
-sti* at mainbus0 irq ? # [H]CRX-{8,24,48}[Z] graphics
+sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics
+sti1 at mainbus0 irq 12
# internal i/o space
gsc0 at asp? # 7xx
@@ -111,6 +112,7 @@ option EISAVERBOSE
#medusa* at gsc? irq 4 # FDDI
com0 at gsc0 irq 5 # RS/232 serial port
com1 at gsc1 irq 5 # RS/232 serial port
+com2 at gsc0 irq 13 # only on asp0 w/o harmony
lpt0 at gsc? irq 7 # both com and lpt are on WD16C552
ie0 at gsc0 irq 8 # 82C5[89]6 ether
ie1 at gsc1 irq 8
diff --git a/sys/arch/hppa/conf/generic.hppa b/sys/arch/hppa/conf/generic.hppa
index 49462c9bf53..f394bfc63d8 100644
--- a/sys/arch/hppa/conf/generic.hppa
+++ b/sys/arch/hppa/conf/generic.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: generic.hppa,v 1.4 2000/08/15 20:27:37 mickey Exp $
+# $OpenBSD: generic.hppa,v 1.5 2002/03/01 23:27:57 mickey Exp $
#
# Generic kernel config (all that is supportted)
#
@@ -25,12 +25,13 @@ option USELEDS # blink 'em
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
+#wax* at mainbus0 irq 24 # Wax may host EISA as well
mongoose* at mainbus0 irq 17 # EISA Bus Adapter (i82350 or TI???)
#vmeb* at mainbus0 irq ? # VME bus adapter
#dino* at mainbus0 irq ? # PCI bus bridge
-sti* at mainbus0 irq ? # [H]CRX-{8,24,48}[Z] graphics
+sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics
+sti1 at mainbus0 irq 12
# internal i/o space
gsc* at lasi? # 712
@@ -53,6 +54,7 @@ hil* at gsc? irq 1 # Human Interface Loop, kbd and mouse
#medusa* at gsc? irq 4 # FDDI
com0 at gsc? irq 5 # RS/232 serial port
com1 at gsc? irq 6 # RS/232 serial port
+com2 at gsc? irq 13 # only on asp0 w/o harmony
lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 or LASI
ie0 at gsc? irq 8 # 82C5[89]6 ether
siop0 at gsc? irq 9 # NCR 53C7xx