[src/trunk]: src/sys/arch/amiga/dev Use the MD_BTOP() macro as replacement fo...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8277db4c4032
branches:  trunk
changeset: 341578:8277db4c4032
user:      phx <phx%NetBSD.org@localhost>
date:      Thu Nov 12 12:19:49 2015 +0000

description:
Use the MD_BTOP() macro as replacement for m68k_btop() in all device
drivers which are shared with amigappc.

diffstat:

 sys/arch/amiga/dev/amidisplaycc.c |  6 +++---
 sys/arch/amiga/dev/clock.c        |  6 +++---
 sys/arch/amiga/dev/view.c         |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r 31d01909d130 -r 8277db4c4032 sys/arch/amiga/dev/amidisplaycc.c
--- a/sys/arch/amiga/dev/amidisplaycc.c Thu Nov 12 12:17:59 2015 +0000
+++ b/sys/arch/amiga/dev/amidisplaycc.c Thu Nov 12 12:19:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amidisplaycc.c,v 1.28 2015/08/05 07:02:20 mrg Exp $ */
+/*     $NetBSD: amidisplaycc.c,v 1.29 2015/11/12 12:19:49 phx Exp $ */
 
 /*-
  * Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.28 2015/08/05 07:02:20 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.29 2015/11/12 12:19:49 phx Exp $");
 
 /*
  * wscons interface to amiga custom chips. Contains the necessary functions
@@ -1183,7 +1183,7 @@
        rv = (paddr_t)bm->hardware_address;
        rv += off;
 
-       return (rv >> PGSHIFT);
+       return MD_BTOP(rv);
 }
 
 
diff -r 31d01909d130 -r 8277db4c4032 sys/arch/amiga/dev/clock.c
--- a/sys/arch/amiga/dev/clock.c        Thu Nov 12 12:17:59 2015 +0000
+++ b/sys/arch/amiga/dev/clock.c        Thu Nov 12 12:19:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.54 2012/10/27 17:17:28 chs Exp $ */
+/*     $NetBSD: clock.c,v 1.55 2015/11/12 12:19:49 phx Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.54 2012/10/27 17:17:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.55 2015/11/12 12:19:49 phx Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -475,7 +475,7 @@
 void
 clockmap(dev_t dev, int off, int prot)
 {
-       return((off + (INTIOBASE+CLKBASE+CLKSR-1)) >> PGSHIFT);
+       return MD_BTOP(off + (INTIOBASE+CLKBASE+CLKSR-1));
 }
 
 int
diff -r 31d01909d130 -r 8277db4c4032 sys/arch/amiga/dev/view.c
--- a/sys/arch/amiga/dev/view.c Thu Nov 12 12:17:59 2015 +0000
+++ b/sys/arch/amiga/dev/view.c Thu Nov 12 12:19:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: view.c,v 1.32 2015/08/20 14:40:16 christos Exp $ */
+/*     $NetBSD: view.c,v 1.33 2015/11/12 12:19:49 phx Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
  * a interface to graphics. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.32 2015/08/20 14:40:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.33 2015/11/12 12:19:49 phx Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -405,7 +405,7 @@
        bmd_size = bm->bytes_per_row*bm->rows*bm->depth;
 
        if (off >= 0 && off < bmd_size)
-               return(((paddr_t)bmd_start + off) >> PGSHIFT);
+               return MD_BTOP((paddr_t)bmd_start + off);
 
        return(-1);
 }