[src/trunk]: src/sys/arch/macppc/pci more oea_mapiodev()

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

details:   https://anonhg.NetBSD.org/src/rev/faaf82a60b21
branches:  trunk
changeset: 321567:faaf82a60b21
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Mar 22 21:30:34 2018 +0000

description:
more oea_mapiodev()

diffstat:

 sys/arch/macppc/pci/uninorth.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 44080ee80b1e -r faaf82a60b21 sys/arch/macppc/pci/uninorth.c
--- a/sys/arch/macppc/pci/uninorth.c    Thu Mar 22 21:28:58 2018 +0000
+++ b/sys/arch/macppc/pci/uninorth.c    Thu Mar 22 21:30:34 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uninorth.c,v 1.19 2018/03/16 22:15:07 macallan Exp $   */
+/*     $NetBSD: uninorth.c,v 1.20 2018/03/22 21:30:34 macallan Exp $   */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uninorth.c,v 1.19 2018/03/16 22:15:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uninorth.c,v 1.20 2018/03/22 21:30:34 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -36,6 +36,7 @@
 #include <dev/pci/pcivar.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_pci.h>
+#include <powerpc/oea/cpufeat.h>
 
 #include <machine/autoconf.h>
 #include <machine/pio.h>
@@ -161,13 +162,13 @@
        pc->pc_memt = &sc->sc_memt;
 
        if (ver < 3) {
-               pc->pc_addr = mapiodev(reg[0] + 0x800000, 4, false);
-               pc->pc_data = mapiodev(reg[0] + 0xc00000, 8, false);
+               pc->pc_addr = oea_mapiodev(reg[0] + 0x800000, 4);
+               pc->pc_data = oea_mapiodev(reg[0] + 0xc00000, 8);
                pc->pc_conf_read = uninorth_conf_read;
                pc->pc_conf_write = uninorth_conf_write;
        } else {
-               pc->pc_addr = mapiodev(reg[1] + 0x800000, 4, false);
-               pc->pc_data = mapiodev(reg[1] + 0xc00000, 8, false);
+               pc->pc_addr = oea_mapiodev(reg[1] + 0x800000, 4);
+               pc->pc_data = oea_mapiodev(reg[1] + 0xc00000, 8);
                pc->pc_conf_read = uninorth_conf_read_v3;
                pc->pc_conf_write = uninorth_conf_write_v3;
        }