Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/arm ifdef notyet code.
details: https://anonhg.NetBSD.org/src/rev/394865949f90
branches: trunk
changeset: 791126:394865949f90
user: christos <christos%NetBSD.org@localhost>
date: Wed Nov 06 02:36:36 2013 +0000
description:
ifdef notyet code.
diffstat:
sys/arch/arm/arm/cpufunc.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diffs (53 lines):
diff -r dde01055775f -r 394865949f90 sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c Wed Nov 06 02:35:26 2013 +0000
+++ b/sys/arch/arm/arm/cpufunc.c Wed Nov 06 02:36:36 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.127 2013/10/23 20:28:11 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.128 2013/11/06 02:36:36 christos Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.127 2013/10/23 20:28:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.128 2013/11/06 02:36:36 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -3192,19 +3192,19 @@
void
sa110_setup(char *args)
{
- int cpuctrl, cpuctrlmask;
-
- cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
+ int cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
| CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE
| CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
| CPU_CONTROL_WBUF_ENABLE;
- cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
+#ifdef notyet
+ int cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
| CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE
| CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
| CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE
| CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
| CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE
| CPU_CONTROL_CPCLK;
+#endif
#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
@@ -3226,7 +3226,9 @@
/* Set the control register */
curcpu()->ci_ctrl = cpuctrl;
-/* cpu_control(cpuctrlmask, cpuctrl);*/
+#ifdef notyet
+ cpu_control(cpuctrlmask, cpuctrl);
+#endif
cpu_control(0xffffffff, cpuctrl);
/*
Home |
Main Index |
Thread Index |
Old Index