Module Name: src
Committed By: skrll
Date: Sun Feb 26 08:44:12 UTC 2012
Modified Files:
src/sys/arch/hp700/dev: cpu.c
src/sys/arch/hp700/include: pdc.h
Log Message:
Rename a field to match PDC documentation.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hp700/dev/cpu.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp700/include/pdc.h
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/hp700/dev/cpu.c
diff -u src/sys/arch/hp700/dev/cpu.c:1.19 src/sys/arch/hp700/dev/cpu.c:1.20
--- src/sys/arch/hp700/dev/cpu.c:1.19 Tue Feb 1 18:33:24 2011
+++ src/sys/arch/hp700/dev/cpu.c Sun Feb 26 08:44:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.19 2011/02/01 18:33:24 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.20 2012/02/26 08:44:12 skrll Exp $ */
/* $OpenBSD: cpu.c,v 1.29 2009/02/08 18:33:28 miod Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.19 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.20 2012/02/26 08:44:12 skrll Exp $");
#include "opt_multiprocessor.h"
@@ -133,7 +133,7 @@ cpuattach(device_t parent, device_t self
aprint_normal(" MHz clk\n%s: %s", self->dv_xname,
pdc_model.sh? "shadows, ": "");
- if (pdc_cache.dc_conf.cc_sh)
+ if (pdc_cache.dc_conf.cc_fsel)
aprint_normal("%uK cache", pdc_cache.dc_size / 1024);
else
aprint_normal("%uK/%uK D/I caches", pdc_cache.dc_size / 1024,
Index: src/sys/arch/hp700/include/pdc.h
diff -u src/sys/arch/hp700/include/pdc.h:1.20 src/sys/arch/hp700/include/pdc.h:1.21
--- src/sys/arch/hp700/include/pdc.h:1.20 Thu Jan 26 08:11:06 2012
+++ src/sys/arch/hp700/include/pdc.h Sun Feb 26 08:44:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pdc.h,v 1.20 2012/01/26 08:11:06 skrll Exp $ */
+/* $NetBSD: pdc.h,v 1.21 2012/02/26 08:44:12 skrll Exp $ */
/* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */
@@ -384,7 +384,7 @@ struct cache_cf { /* PDC_CACHE (for "str
cc_line : 3, /* max data written by store (16-byte mults) */
cc_resv1: 2, /* (reserved) */
cc_wt : 1, /* D-cache: write-to = 0, write-through = 1 */
- cc_sh : 2, /* separate I and D = 0, shared I and D = 1 */
+ cc_fsel : 2, /* Both (00) / only D/I (01/10) / either (11) F[DI]C */
cc_cst : 3, /* D-cache: incoherent = 0, coherent = 1 */
cc_resv2:11, /* (reserved) */
cc_hvers: 2; /* H-VERSION dependent */
