Module Name: src
Committed By: rin
Date: Tue Mar 2 07:21:01 UTC 2021
Modified Files:
src/sys/arch/evbppc/obs405: obs200_autoconf.c obs266_autoconf.c
obs600_autoconf.c
Log Message:
Use genppc_cpu_configure() instead of calling spl0() directly
(and optionally printing out imask).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/obs405/obs200_autoconf.c \
src/sys/arch/evbppc/obs405/obs266_autoconf.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/obs405/obs600_autoconf.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/evbppc/obs405/obs200_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.7 src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.8
--- src/sys/arch/evbppc/obs405/obs200_autoconf.c:1.7 Mon Dec 12 11:23:57 2011
+++ src/sys/arch/evbppc/obs405/obs200_autoconf.c Tue Mar 2 07:21:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs200_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $ */
+/* $NetBSD: obs200_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -63,10 +63,7 @@ cpu_configure(void)
if (config_rootfound("plb", NULL) == NULL)
panic("configure: mainbus not configured");
- printf("biomask %x netmask %x ttymask %x\n",
- imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
-
- (void)spl0();
+ genppc_cpu_configure();
}
void device_register(device_t dev, void *aux)
Index: src/sys/arch/evbppc/obs405/obs266_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.7 src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.8
--- src/sys/arch/evbppc/obs405/obs266_autoconf.c:1.7 Mon Dec 12 11:23:57 2011
+++ src/sys/arch/evbppc/obs405/obs266_autoconf.c Tue Mar 2 07:21:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs266_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $ */
+/* $NetBSD: obs266_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.7 2011/12/12 11:23:57 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_autoconf.c,v 1.8 2021/03/02 07:21:01 rin Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -62,7 +62,7 @@ cpu_configure(void)
if (config_rootfound("plb", NULL) == NULL)
panic("configure: mainbus not configured");
- (void)spl0();
+ genppc_cpu_configure();
}
void
Index: src/sys/arch/evbppc/obs405/obs600_autoconf.c
diff -u src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.8 src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.9
--- src/sys/arch/evbppc/obs405/obs600_autoconf.c:1.8 Mon Feb 18 06:27:10 2019
+++ src/sys/arch/evbppc/obs405/obs600_autoconf.c Tue Mar 2 07:21:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_autoconf.c,v 1.8 2019/02/18 06:27:10 msaitoh Exp $ */
+/* $NetBSD: obs600_autoconf.c,v 1.9 2021/03/02 07:21:01 rin Exp $ */
/*
* Copyright 2004 Shigeyuki Fukushima.
@@ -33,7 +33,7 @@
* DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.8 2019/02/18 06:27:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_autoconf.c,v 1.9 2021/03/02 07:21:01 rin Exp $");
#include "dwctwo.h"
@@ -111,10 +111,7 @@ cpu_configure(void)
pic_finish_setup();
- printf("biomask %x netmask %x ttymask %x\n",
- imask[IPL_BIO], imask[IPL_NET], imask[IPL_TTY]);
-
- (void)spl0();
+ genppc_cpu_configure();
}
void
