diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-26 18:13:35 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-26 18:13:35 +0000 |
| commit | 348e0a7b32e18b5d443d9778194ee3c08f2bc123 (patch) | |
| tree | 2d9984e160df7ade62e6caca33ca73394e4b6614 /sys/arch/sgi/conf | |
| parent | c59ae6a58debfeb7c691946f04c9439b2212a8da (diff) | |
Add support for the Octane power button to power(4). Took me a while to
figure out how the interrupt was routed from xbridge to xheart... (it bypasses
the regular `have xbridge send a xio interrupt packet' mechanism)
Diffstat (limited to 'sys/arch/sgi/conf')
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC-IP30 | 3 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/files.sgi | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30 index 4cde85db51a..739d170a94e 100644 --- a/sys/arch/sgi/conf/GENERIC-IP30 +++ b/sys/arch/sgi/conf/GENERIC-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP30,v 1.13 2009/10/22 19:55:45 miod Exp $ +# $OpenBSD: GENERIC-IP30,v 1.14 2009/10/26 18:13:31 miod Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. # @@ -38,6 +38,7 @@ config bsd swap generic mainbus0 at root cpu* at mainbus0 clock0 at mainbus0 +power0 at mainbus0 #### Main local buses xbow0 at mainbus0 diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi index d4e242378bb..5925463c3e5 100644 --- a/sys/arch/sgi/conf/files.sgi +++ b/sys/arch/sgi/conf/files.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: files.sgi,v 1.35 2009/10/26 18:00:04 miod Exp $ +# $OpenBSD: files.sgi,v 1.36 2009/10/26 18:13:31 miod Exp $ # # maxpartitions must be first item in files.${ARCH} # @@ -148,8 +148,11 @@ file arch/sgi/dev/mkbc.c mkbc needs-flag # Power button device power -attach power at macebus -file arch/sgi/dev/power.c power +attach power at macebus with power_macebus +attach power at mainbus with power_mainbus +file arch/sgi/dev/power.c power | + power_macebus | power_mainbus + needs-flag # Raster operations include "dev/rasops/files.rasops" |