CVS commit: src/sys/arch/macppc/macppc

[Michael Lorenz]

Module Name:    src
Committed By:   macallan
Date:           Thu Mar 22 21:28:59 UTC 2018

Modified Files:
        src/sys/arch/macppc/macppc: cpu.c interrupts.c

Log Message:
sprinkle oea_mapiodev()


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/macppc/macppc/cpu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/macppc/interrupts.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/macppc/macppc/cpu.c
diff -u src/sys/arch/macppc/macppc/cpu.c:1.61 src/sys/arch/macppc/macppc/cpu.c:1.62
--- src/sys/arch/macppc/macppc/cpu.c:1.61	Thu Mar 22 15:23:43 2018
+++ src/sys/arch/macppc/macppc/cpu.c	Thu Mar 22 21:28:58 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.61 2018/03/22 15:23:43 macallan Exp $	*/
+/*	$NetBSD: cpu.c,v 1.62 2018/03/22 21:28:58 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2001 Tsubai Masanari.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.61 2018/03/22 15:23:43 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.62 2018/03/22 21:28:58 macallan Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
@@ -209,7 +209,7 @@ md_setup_trampoline(volatile struct cpu_
 {
 #ifdef OPENPIC
 	if (openpic_base) {
-		uint32_t kl_base = (uint32_t)mapiodev(0x80000000, 0x1000, 0);
+		uint32_t kl_base = oea_mapiodev(0x80000000, 0x1000);
 		uint32_t gpio = kl_base + 0x5c;	/* XXX */
 		u_int node, off;
 		char cpupath[32];

Index: src/sys/arch/macppc/macppc/interrupts.c
diff -u src/sys/arch/macppc/macppc/interrupts.c:1.5 src/sys/arch/macppc/macppc/interrupts.c:1.6
--- src/sys/arch/macppc/macppc/interrupts.c:1.5	Thu Apr 18 16:42:46 2013
+++ src/sys/arch/macppc/macppc/interrupts.c	Thu Mar 22 21:28:58 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupts.c,v 1.5 2013/04/18 16:42:46 macallan Exp $ */
+/*	$NetBSD: interrupts.c,v 1.6 2018/03/22 21:28:58 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupts.c,v 1.5 2013/04/18 16:42:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupts.c,v 1.6 2018/03/22 21:28:58 macallan Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: interrupts.c
 #include <powerpc/pic/picvar.h>
 #include <powerpc/pic/ipivar.h>
 #include <dev/ofw/openfirm.h>
+#include <powerpc/oea/cpufeat.h>
 
 #include "opt_interrupt.h"
 #include "pic_openpic.h"
@@ -100,7 +101,7 @@ init_openpic(int pass_through)
 	aprint_debug("pic-base: %08x\n", pic_base);
 
 	aprint_normal("found openpic PIC at %08x\n", pic_base);
-	setup_openpic((void *)pic_base, pass_through);
+	setup_openpic(oea_mapiodev(pic_base, 0x40000), pass_through);
 
 	return TRUE;
 }