diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-01-20 23:34:38 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-01-20 23:34:38 +0000 |
| commit | 09c839285bbc7eb5a6fd783b65e8062bddd7bf9d (patch) | |
| tree | c26433986555f84a9e6a6b6a35d84bf7e4145f5e /sys/arch/zaurus/conf | |
| parent | 7e9121dd734b5d2fa58cbcd88fab714a947d8397 (diff) | |
Enable apm/scoop drivers and report A/C power status correctly.
ok drahn@
Diffstat (limited to 'sys/arch/zaurus/conf')
| -rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/RAMDISK | 8 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/files.zaurus | 6 |
3 files changed, 13 insertions, 9 deletions
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index d1d9e035b92..827715f48a7 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 2005/01/19 02:02:34 uwe Exp $ +# $OpenBSD: GENERIC,v 1.22 2005/01/20 23:34:36 uwe Exp $ # # GENERIC machine description file # @@ -60,8 +60,8 @@ pxaip0 at mainbus? pxaintc0 at pxaip? # interrupt controller pxagpio0 at pxaip? # GPIO -#scoop0 at pxaip? addr 0x10800000 size 0x2c -#scoop1 at pxaip? addr 0x14800000 size 0x2c +scoop0 at pxaip? +scoop1 at pxaip? saost0 at pxaip? addr 0x40a00000 size 0x20 ohci0 at pxaip? addr 0x4c000000 size 0x70 intr 3 usb* at ohci? @@ -183,7 +183,7 @@ lcd0 at pxaip? wsdisplay* at lcd? console ? # APM emulation -#apm0 at pxaip? +apm0 at pxaip? # Pseudo-Devices pseudo-device wsmux 2 # mouse & keyboard multiplexor diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK index dc500a93516..00335981668 100644 --- a/sys/arch/zaurus/conf/RAMDISK +++ b/sys/arch/zaurus/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.16 2005/01/19 02:02:34 uwe Exp $ +# $OpenBSD: RAMDISK,v 1.17 2005/01/20 23:34:36 uwe Exp $ # # GENERIC machine description file # @@ -66,8 +66,8 @@ pxaip0 at mainbus? pxaintc0 at pxaip? # interrupt controller pxagpio0 at pxaip? # GPIO -#scoop0 at pxaip? addr 0x10800000 size 0x2c -#scoop1 at pxaip? addr 0x14800000 size 0x2c +scoop0 at pxaip? +scoop1 at pxaip? saost0 at pxaip? addr 0x40a00000 size 0x20 ohci0 at pxaip? addr 0x4c000000 size 0x70 intr 3 usb* at ohci? @@ -163,7 +163,7 @@ lcd0 at pxaip? wsdisplay* at lcd? console ? # APM emulation -#apm0 at pxaip? +apm0 at pxaip? # Pseudo-Devices pseudo-device wsmux 2 # mouse & keyboard multiplexor diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus index e14ff5b196f..defaaf6e15b 100644 --- a/sys/arch/zaurus/conf/files.zaurus +++ b/sys/arch/zaurus/conf/files.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: files.zaurus,v 1.12 2005/01/19 02:02:34 uwe Exp $ +# $OpenBSD: files.zaurus,v 1.13 2005/01/20 23:34:36 uwe Exp $ # # First try for arm-specific configuration info # @@ -38,6 +38,10 @@ device scoop attach scoop at pxaip with scoop_pxaip file arch/zaurus/dev/zaurus_scoop.c scoop +# Power manager and APM emulation +attach apm at pxaip with apm_pxaip +file arch/zaurus/zaurus/zaurus_apm.c apm_pxaip + # # Machine-independent ATA drivers # |