diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2010-12-26 15:41:01 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-12-26 15:41:01 +0000 |
commit | 55d0ea063b25d8b25fea5135f59de22437ecd4ea (patch) | |
tree | 42c739678ad68f903e06cc29eb0db1df3bf6298e /sys/arch/mvme88k/dev | |
parent | 47f20d782a94ebc11fb4c7b43294559377be4989 (diff) |
Kill pmap_phys_address(), and force every driver's mmap() routine to return
a physical address [more precisely, something suitable to pass to pmap_enter()'sphysical address argument].
This allows MI drivers to implement mmap() routines without having to know
about the pmap_phys_address() implementation and #ifdef obfuscation.
Diffstat (limited to 'sys/arch/mvme88k/dev')
-rw-r--r-- | sys/arch/mvme88k/dev/nvram.c | 4 | ||||
-rw-r--r-- | sys/arch/mvme88k/dev/sram.c | 4 | ||||
-rw-r--r-- | sys/arch/mvme88k/dev/vmel.c | 4 | ||||
-rw-r--r-- | sys/arch/mvme88k/dev/vmes.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/mvme88k/dev/nvram.c b/sys/arch/mvme88k/dev/nvram.c index 03f0c16edf2..70527843a58 100644 --- a/sys/arch/mvme88k/dev/nvram.c +++ b/sys/arch/mvme88k/dev/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.32 2009/03/29 21:53:52 sthen Exp $ */ +/* $OpenBSD: nvram.c,v 1.33 2010/12/26 15:40:59 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -514,7 +514,7 @@ nvrammmap(dev, off, prot) /* allow access only in RAM */ if (off < 0 || off >= round_page(sc->sc_len)) return (-1); - return (atop(sc->sc_base + off)); + return (sc->sc_base + off); } #ifdef MVME188 diff --git a/sys/arch/mvme88k/dev/sram.c b/sys/arch/mvme88k/dev/sram.c index 1a4b752395a..9db441b15bb 100644 --- a/sys/arch/mvme88k/dev/sram.c +++ b/sys/arch/mvme88k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.20 2009/03/29 21:53:52 sthen Exp $ */ +/* $OpenBSD: sram.c,v 1.21 2010/12/26 15:40:59 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -173,5 +173,5 @@ srammmap(dev, off, prot) /* allow access only in RAM */ if (off < 0 || off >= round_page(sc->sc_len)) return (-1); - return (atop(sc->sc_base + off)); + return (sc->sc_base + off); } diff --git a/sys/arch/mvme88k/dev/vmel.c b/sys/arch/mvme88k/dev/vmel.c index 5af6bde21c1..c7138828ceb 100644 --- a/sys/arch/mvme88k/dev/vmel.c +++ b/sys/arch/mvme88k/dev/vmel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmel.c,v 1.18 2010/06/27 12:41:23 miod Exp $ */ +/* $OpenBSD: vmel.c,v 1.19 2010/12/26 15:40:59 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -166,5 +166,5 @@ vmelmmap(dev, off, prot) #endif if (pa == NULL) return (-1); - return (atop(pa)); + return (pa); } diff --git a/sys/arch/mvme88k/dev/vmes.c b/sys/arch/mvme88k/dev/vmes.c index d8f6faa5575..80bbe54b52c 100644 --- a/sys/arch/mvme88k/dev/vmes.c +++ b/sys/arch/mvme88k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.21 2010/06/27 12:41:23 miod Exp $ */ +/* $OpenBSD: vmes.c,v 1.22 2010/12/26 15:40:59 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -171,5 +171,5 @@ vmesmmap(dev, off, prot) #endif if (pa == NULL) return (-1); - return (atop(pa)); + return (pa); } |