diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-06-09 18:01:37 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-06-09 18:01:37 +0000 |
| commit | 0eb06620d360aed253b9d38271307da0df9d3cde (patch) | |
| tree | f543a9f20bca7571a449fa00d14e061f2d0ff3ac /sys | |
| parent | 3085c38a438ec535c75962325f24bc5a8c5755f1 (diff) | |
it appears asp occupies more space than intially thought and
audio wraps off the edge making troubles.
make sure gsc attachment follows the amsk from the parents
and also extend the asp's range to a full 512m.
found by Graham Gower <graham.gower@gmail.com> on 735
testing by miod@ on 715
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/RAMDISK | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/asp.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/gsc/gscbus.c | 3 |
4 files changed, 9 insertions, 10 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index b518782a92e..2d07204776a 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.73 2005/05/26 23:18:27 drahn Exp $ +# $OpenBSD: GENERIC,v 1.74 2005/06/09 18:01:36 mickey Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -176,8 +176,8 @@ hilid* at hil? # ID module com0 at gsc0 offset 0x5000 irq 5 # on lasi com1 at gsc1 offset 0x5000 irq 5 com1 at gsc2 offset 0x2000 irq 6 # on wax -com0 at gsc0 offset 0x23000 irq 5 # on asp -com1 at gsc0 offset 0x22000 irq 6 +com0 at gsc0 offset 0x823000 irq 5 # on asp +com1 at gsc0 offset 0x822000 irq 6 com2 at gsc0 offset 0x0 irq 13 # only on asp0 w/o audio (off ?) com2 at gsc0 offset 0x4040 irq 13 # gecko's fax/voice/modems com3 at gsc0 offset 0x4060 irq 13 diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index 6d710c6ef96..189cb4c8fb5 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.48 2005/05/27 15:54:59 drahn Exp $ +# $OpenBSD: RAMDISK,v 1.49 2005/06/09 18:01:36 mickey Exp $ # # Diskless kernel config # @@ -179,8 +179,8 @@ hilkbd* at hil? # keyboard, knob and buttons com0 at gsc0 offset 0x5000 irq 5 # on lasi com1 at gsc1 offset 0x5000 irq 5 com1 at gsc2 offset 0x2000 irq 6 # on wax -com0 at gsc0 offset 0x23000 irq 5 # on asp -com1 at gsc0 offset 0x22000 irq 6 +com0 at gsc0 offset 0x823000 irq 5 # on asp +com1 at gsc0 offset 0x822000 irq 6 com2 at gsc0 offset 0x0 irq 13 # only on asp0 w/o audio (off ?) com2 at gsc0 offset 0x4040 irq 13 # gecko's fax/voice/modems com3 at gsc0 offset 0x4060 irq 13 diff --git a/sys/arch/hppa/dev/asp.c b/sys/arch/hppa/dev/asp.c index 828e446cff8..641e45a1e11 100644 --- a/sys/arch/hppa/dev/asp.c +++ b/sys/arch/hppa/dev/asp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asp.c,v 1.13 2004/04/07 18:24:19 mickey Exp $ */ +/* $OpenBSD: asp.c,v 1.14 2005/06/09 18:01:36 mickey Exp $ */ /* * Copyright (c) 1998-2003 Michael Shalayeff @@ -119,7 +119,7 @@ struct asp_softc { volatile struct asp_trs *sc_trs; }; -#define ASP_IOMASK 0xfff00000 +#define ASP_IOMASK 0xfe000000 /* ASP "Primary Controller" HPA */ #define ASP_CHPA 0xF0800000 diff --git a/sys/arch/hppa/gsc/gscbus.c b/sys/arch/hppa/gsc/gscbus.c index 3ee8f0a2cca..1e07ae84b75 100644 --- a/sys/arch/hppa/gsc/gscbus.c +++ b/sys/arch/hppa/gsc/gscbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gscbus.c,v 1.26 2004/09/15 20:11:29 mickey Exp $ */ +/* $OpenBSD: gscbus.c,v 1.27 2005/06/09 18:01:36 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -123,7 +123,6 @@ gscattach(parent, self, aux) sc->sc_dmatag._dmamem_unmap = gsc_dmamem_unmap; sc->sc_dmatag._dmamem_mmap = gsc_dmamem_mmap; - ga->ga_hpamask = HPPA_FLEX_MASK; pdc_scanbus(self, &ga->ga_ca, MAXMODBUS, 0); } |