[src/trunk]: src/sys/arch/arm * XSCALE_PMC_TYPE_I80200 -> PMC_TYPE_I80200

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

details:   https://anonhg.NetBSD.org/src/rev/ac724fd9527d
branches:  trunk
changeset: 534989:ac724fd9527d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Aug 07 21:11:35 2002 +0000

description:
* XSCALE_PMC_TYPE_I80200 -> PMC_TYPE_I80200
* XSCALE_PMC_TYPE_CCNT -> PMC_TYPE_I80200_CCNT
* XSCALE_PMC_TYPE_PMCx -> PMC_TYPE_I80200_PMCx

Per discussion with Allen Briggs.

diffstat:

 sys/arch/arm/include/pmc.h       |   8 ++++----
 sys/arch/arm/xscale/xscale_pmc.c |  10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (58 lines):

diff -r f43ea5502149 -r ac724fd9527d sys/arch/arm/include/pmc.h
--- a/sys/arch/arm/include/pmc.h        Wed Aug 07 20:45:39 2002 +0000
+++ b/sys/arch/arm/include/pmc.h        Wed Aug 07 21:11:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmc.h,v 1.1 2002/08/07 05:14:59 briggs Exp $   */
+/*     $NetBSD: pmc.h,v 1.2 2002/08/07 21:11:36 thorpej Exp $  */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -38,9 +38,9 @@
 #ifndef _ARM_PMC_H_
 #define        _ARM_PMC_H_
 
-#define XSCALE_PMC_TYPE_I80200 0x10000
-#define XSCALE_PMC_TYPE_CCNT   0x10001
-#define XSCALE_PMC_TYPE_PMCx   0x10002
+#define        PMC_TYPE_I80200         0x10000         /* i80200-compatible */
+#define        PMC_TYPE_I80200_CCNT    0x10001         /* cycle counter */
+#define        PMC_TYPE_I80200_PMCx    0x10002         /* performance counter */
 
 #if defined(_KERNEL)
 
diff -r f43ea5502149 -r ac724fd9527d sys/arch/arm/xscale/xscale_pmc.c
--- a/sys/arch/arm/xscale/xscale_pmc.c  Wed Aug 07 20:45:39 2002 +0000
+++ b/sys/arch/arm/xscale/xscale_pmc.c  Wed Aug 07 21:11:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xscale_pmc.c,v 1.1 2002/08/07 05:15:02 briggs Exp $    */
+/*     $NetBSD: xscale_pmc.c,v 1.2 2002/08/07 21:11:35 thorpej Exp $   */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xscale_pmc.c,v 1.1 2002/08/07 05:15:02 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xscale_pmc.c,v 1.2 2002/08/07 21:11:35 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -271,14 +271,14 @@
 
        switch (ctr) {
        case __PMC_CCNT_I:
-               ret = XSCALE_PMC_TYPE_CCNT;
+               ret = PMC_TYPE_I80200_CCNT;
                break;
        case __PMC0_I:
        case __PMC1_I:
-               ret = XSCALE_PMC_TYPE_PMCx;
+               ret = PMC_TYPE_I80200_PMCx;
                break;
        case -1:
-               ret = XSCALE_PMC_TYPE_I80200;
+               ret = PMC_TYPE_I80200;
                break;
        default:
                ret = -1;