Module Name: src
Committed By: nonaka
Date: Thu Apr 30 05:20:31 UTC 2009
Modified Files:
src/sys/arch/sh3/dev: adc.c
src/sys/arch/sh3/sh3: cache_sh3.c interrupt.c
Log Message:
Support SH7706
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sh3/dev/adc.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sh3/sh3/cache_sh3.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sh3/sh3/interrupt.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/sh3/dev/adc.c
diff -u src/sys/arch/sh3/dev/adc.c:1.11 src/sys/arch/sh3/dev/adc.c:1.12
--- src/sys/arch/sh3/dev/adc.c:1.11 Sun Apr 5 00:22:27 2009
+++ src/sys/arch/sh3/dev/adc.c Thu Apr 30 05:20:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adc.c,v 1.11 2009/04/05 00:22:27 uwe Exp $ */
+/* $NetBSD: adc.c,v 1.12 2009/04/30 05:20:30 nonaka Exp $ */
/*
* Copyright (c) 2003 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.11 2009/04/05 00:22:27 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.12 2009/04/30 05:20:30 nonaka Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -58,7 +58,8 @@
/* REMINDER: also in 7727 and 7729 */
if ((cpu_product != CPU_PRODUCT_7709)
- && (cpu_product != CPU_PRODUCT_7709A))
+ && (cpu_product != CPU_PRODUCT_7709A)
+ && (cpu_product != CPU_PRODUCT_7706))
return (0);
if (strcmp(cf->cf_name, "adc") != 0)
Index: src/sys/arch/sh3/sh3/cache_sh3.c
diff -u src/sys/arch/sh3/sh3/cache_sh3.c:1.14 src/sys/arch/sh3/sh3/cache_sh3.c:1.15
--- src/sys/arch/sh3/sh3/cache_sh3.c:1.14 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sh3/sh3/cache_sh3.c Thu Apr 30 05:20:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cache_sh3.c,v 1.14 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: cache_sh3.c,v 1.15 2009/04/30 05:20:30 nonaka Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache_sh3.c,v 1.14 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache_sh3.c,v 1.15 2009/04/30 05:20:30 nonaka Exp $");
#include "opt_cache.h"
@@ -77,6 +77,8 @@
cache_size = 8 * 1024;
break;
case CPU_PRODUCT_7709A:
+ /* FALLTHROUGH */
+ case CPU_PRODUCT_7706:
cache_size = 16 * 1024;
break;
}
Index: src/sys/arch/sh3/sh3/interrupt.c
diff -u src/sys/arch/sh3/sh3/interrupt.c:1.27 src/sys/arch/sh3/sh3/interrupt.c:1.28
--- src/sys/arch/sh3/sh3/interrupt.c:1.27 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sh3/sh3/interrupt.c Thu Apr 30 05:20:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.27 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: interrupt.c,v 1.28 2009/04/30 05:20:30 nonaka Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.27 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.28 2009/04/30 05:20:30 nonaka Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -76,6 +76,7 @@
#ifdef SH3
case CPU_PRODUCT_7709:
case CPU_PRODUCT_7709A:
+ case CPU_PRODUCT_7706:
_reg_write_2(SH7709_IPRC, 0);
_reg_write_2(SH7709_IPRD, 0);
_reg_write_2(SH7709_IPRE, 0);
@@ -215,7 +216,7 @@
* int intc_intr_priority(int evtcode, int level)
* Setup interrupt priority register.
* SH7708, SH7708S, SH7708R, SH7750, SH7750S ... evtcode is INTEVT
- * SH7709, SH7709A ... evtcode is INTEVT2
+ * SH7709, SH7709A, SH7706 ... evtcode is INTEVT2
*/
static void
intc_intr_priority(int evtcode, int level)
@@ -391,7 +392,9 @@
{
printf("INTEVT=0x%x", _reg_read_4(SH_(INTEVT)));
- if (cpu_product == CPU_PRODUCT_7709 || cpu_product == CPU_PRODUCT_7709A)
+ if (cpu_product == CPU_PRODUCT_7709 ||
+ cpu_product == CPU_PRODUCT_7709A ||
+ cpu_product == CPU_PRODUCT_7706)
printf(" INTEVT2=0x%x", _reg_read_4(SH7709_INTEVT2));
printf("\n");
