Module Name: src
Committed By: skrll
Date: Tue Apr 28 15:37:38 UTC 2009
Modified Files:
src/sys/arch/hp700/dev [nick-hppapmap]: cpu.c
src/sys/arch/hp700/hp700 [nick-hppapmap]: machdep.c
src/sys/arch/hp700/include [nick-hppapmap]: cpu.h
Log Message:
Tidy-up turning off the space-identifier hashing and the chip revision
stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.10.86.3 -r1.10.86.4 src/sys/arch/hp700/dev/cpu.c
cvs rdiff -u -r1.48.4.18 -r1.48.4.19 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.28.2.4 -r1.28.2.5 src/sys/arch/hp700/include/cpu.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.10.86.3 src/sys/arch/hp700/dev/cpu.c:1.10.86.4
--- src/sys/arch/hp700/dev/cpu.c:1.10.86.3 Sat Feb 14 15:16:08 2009
+++ src/sys/arch/hp700/dev/cpu.c Tue Apr 28 15:37:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.10.86.3 2009/02/14 15:16:08 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.10.86.4 2009/04/28 15:37:38 skrll Exp $ */
/* $OpenBSD: cpu.c,v 1.28 2004/12/28 05:18:25 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.10.86.3 2009/02/14 15:16:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.10.86.4 2009/04/28 15:37:38 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,7 +95,7 @@
printf(": %s", hppa_cpu_info->hci_chip_name);
if (hppa_cpu_info->hci_chip_nickname != NULL)
printf(" (%s)", hppa_cpu_info->hci_chip_nickname);
- printf(" rev %d", (*hppa_cpu_info->desidhash)());
+ printf(" rev %d", cpu_revision);
/* Print the CPU type, spec, level, category, and speed. */
printf("\n%s: %s, PA-RISC %s", self->dv_xname,
Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.48.4.18 src/sys/arch/hp700/hp700/machdep.c:1.48.4.19
--- src/sys/arch/hp700/hp700/machdep.c:1.48.4.18 Tue Apr 28 13:35:44 2009
+++ src/sys/arch/hp700/hp700/machdep.c Tue Apr 28 15:37:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.48.4.18 2009/04/28 13:35:44 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.48.4.19 2009/04/28 15:37:38 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48.4.18 2009/04/28 13:35:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48.4.19 2009/04/28 15:37:38 skrll Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -202,6 +202,7 @@
const struct hppa_cpu_info *hppa_cpu_info;
enum hppa_cpu_type cpu_type;
int cpu_hvers;
+int cpu_revision;
/*
* exported methods for cpus
@@ -780,17 +781,14 @@
cpu_hpt_init = hppa_cpu_info->hptinit;
cpu_desidhash = hppa_cpu_info->desidhash;
+ cpu_revision = (*cpu_desidhash)();
+
/* force strong ordering for now */
if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B) {
kpsw |= PSW_O;
}
snprintf(cpu_model, sizeof(cpu_model), "HP9000/%s", model);
-#ifdef DEBUG
- printf("%s: %s, %s level %d\n", __func__, cpu_model, hppa_cpu_info->hci_chip_name, (*cpu_desidhash)() + 0xa);
-#endif
-
- printf("HP9000/... level %0x\n", (*cpu_desidhash)() + 0xa);
#define LDILDO(t,f) ((t)[0] = (f)[0], (t)[1] = (f)[1]);
LDILDO(trap_ep_T_TLB_DIRTY , hppa_cpu_info->tlbdh);
Index: src/sys/arch/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.28.2.4 src/sys/arch/hp700/include/cpu.h:1.28.2.5
--- src/sys/arch/hp700/include/cpu.h:1.28.2.4 Sat Feb 14 13:57:13 2009
+++ src/sys/arch/hp700/include/cpu.h Tue Apr 28 15:37:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.28.2.4 2009/02/14 13:57:13 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.28.2.5 2009/04/28 15:37:38 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -109,6 +109,7 @@
#ifdef _KERNEL
extern const struct hppa_cpu_info *hppa_cpu_info;
extern int cpu_hvers;
+extern int cpu_revision;
extern register_t kpsw;
#endif
#endif
