[src/trunk]: src/sys/arch Use hppa_cpu_ispa20_p

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3787b7e8b53a
branches:  trunk
changeset: 753671:3787b7e8b53a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Apr 06 08:09:46 2010 +0000

description:
Use hppa_cpu_ispa20_p

diffstat:

 sys/arch/hp700/hp700/machdep.c    |  9 ++++-----
 sys/arch/hppa/hppa/hppa_machdep.c |  6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (68 lines):

diff -r 26cb0101bf70 -r 3787b7e8b53a sys/arch/hp700/hp700/machdep.c
--- a/sys/arch/hp700/hp700/machdep.c    Tue Apr 06 07:58:31 2010 +0000
+++ b/sys/arch/hp700/hp700/machdep.c    Tue Apr 06 08:09:46 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.81 2010/03/20 23:31:27 chs Exp $ */
+/*     $NetBSD: machdep.c,v 1.82 2010/04/06 08:09:46 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.81 2010/03/20 23:31:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2010/04/06 08:09:46 skrll Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -787,7 +787,7 @@
        cpu_revision = (*cpu_desidhash)();
 
        /* force strong ordering for now */
-       if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B)
+       if (hppa_cpu_ispa20_p())
                kpsw |= PSW_O;
 
        snprintf(cpu_model, sizeof(cpu_model), "HP9000/%s", model);
@@ -1694,7 +1694,7 @@
        if (pimerror < 0) {
                printf(" - WARNING: could not transfer PIM info (%d)", pimerror);
        } else {
-               if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B)
+               if (hppa_cpu_ispa20_p())
                        hppa_pim64_dump(check_type);
                else
                        hppa_pim_dump(check_type);
@@ -1969,4 +1969,3 @@
 {
 }
 #endif /* MODULAR */
-
diff -r 26cb0101bf70 -r 3787b7e8b53a sys/arch/hppa/hppa/hppa_machdep.c
--- a/sys/arch/hppa/hppa/hppa_machdep.c Tue Apr 06 07:58:31 2010 +0000
+++ b/sys/arch/hppa/hppa/hppa_machdep.c Tue Apr 06 08:09:46 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hppa_machdep.c,v 1.21 2010/04/03 07:46:02 skrll Exp $  */
+/*     $NetBSD: hppa_machdep.c,v 1.22 2010/04/06 08:09:47 skrll Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.21 2010/04/03 07:46:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.22 2010/04/06 08:09:47 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -252,7 +252,7 @@
 #endif
 
                tf->tf_ipsw     = gr[0] |
-                   (hppa_cpu_info->hci_features & HPPA_FTRS_W32B ? PSW_O : 0);
+                   (hppa_cpu_ispa20_p() ? PSW_O : 0);
                tf->tf_r1       = gr[1];
                tf->tf_rp       = gr[2];
                tf->tf_r3       = gr[3];