Module Name: src
Committed By: phx
Date: Thu Nov 12 12:19:50 UTC 2015
Modified Files:
src/sys/arch/amiga/dev: amidisplaycc.c clock.c view.c
Log Message:
Use the MD_BTOP() macro as replacement for m68k_btop() in all device
drivers which are shared with amigappc.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/dev/amidisplaycc.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amiga/dev/clock.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amiga/dev/view.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/amidisplaycc.c
diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.28 src/sys/arch/amiga/dev/amidisplaycc.c:1.29
--- src/sys/arch/amiga/dev/amidisplaycc.c:1.28 Wed Aug 5 07:02:20 2015
+++ src/sys/arch/amiga/dev/amidisplaycc.c Thu Nov 12 12:19:49 2015
@@ -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 @@ amidisplaycc_mmap(void *dp, void *vs, of
rv = (paddr_t)bm->hardware_address;
rv += off;
- return (rv >> PGSHIFT);
+ return MD_BTOP(rv);
}
Index: src/sys/arch/amiga/dev/clock.c
diff -u src/sys/arch/amiga/dev/clock.c:1.54 src/sys/arch/amiga/dev/clock.c:1.55
--- src/sys/arch/amiga/dev/clock.c:1.54 Sat Oct 27 17:17:28 2012
+++ src/sys/arch/amiga/dev/clock.c Thu Nov 12 12:19:49 2015
@@ -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 @@ clockioctl(dev_t dev, u_long cmd, void *
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
Index: src/sys/arch/amiga/dev/view.c
diff -u src/sys/arch/amiga/dev/view.c:1.32 src/sys/arch/amiga/dev/view.c:1.33
--- src/sys/arch/amiga/dev/view.c:1.32 Thu Aug 20 14:40:16 2015
+++ src/sys/arch/amiga/dev/view.c Thu Nov 12 12:19:49 2015
@@ -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 @@ viewmmap(dev_t dev, off_t off, int prot)
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);
}
