[src/trunk]: src/sys/dev/pci Rename PCIE_XCAP_VER_* macros to avoid confusion.

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

details:   https://anonhg.NetBSD.org/src/rev/71c9968d57c3
branches:  trunk
changeset: 802631:71c9968d57c3
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Sep 24 10:57:03 2014 +0000

description:
Rename PCIE_XCAP_VER_* macros to avoid confusion.

diffstat:

 sys/dev/pci/pcireg.h |  6 +++---
 sys/dev/pci/ppb.c    |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r d1f9c1c1d593 -r 71c9968d57c3 sys/dev/pci/pcireg.h
--- a/sys/dev/pci/pcireg.h      Wed Sep 24 09:49:49 2014 +0000
+++ b/sys/dev/pci/pcireg.h      Wed Sep 24 10:57:03 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcireg.h,v 1.95 2014/06/09 11:08:05 msaitoh Exp $      */
+/*     $NetBSD: pcireg.h,v 1.96 2014/09/24 10:57:03 msaitoh Exp $      */
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -816,8 +816,8 @@
 #define        PCIE_XCAP_MASK          __BITS(31, 16)
 /* Capability Version */
 #define PCIE_XCAP_VER_MASK     __SHIFTIN(__BITS(3, 0), PCIE_XCAP_MASK)
-#define         PCIE_XCAP_VER_1_0      __SHIFTIN(1, PCIE_XCAP_VER_MASK)
-#define         PCIE_XCAP_VER_2_0      __SHIFTIN(2, PCIE_XCAP_VER_MASK)
+#define         PCIE_XCAP_VER_1        __SHIFTIN(1, PCIE_XCAP_VER_MASK)
+#define         PCIE_XCAP_VER_2        __SHIFTIN(2, PCIE_XCAP_VER_MASK)
 #define        PCIE_XCAP_TYPE_MASK     __SHIFTIN(__BITS(7, 4), PCIE_XCAP_MASK)
 #define         PCIE_XCAP_TYPE_PCIE_DEV __SHIFTIN(0x0, PCIE_XCAP_TYPE_MASK)
 #define         PCIE_XCAP_TYPE_PCI_DEV __SHIFTIN(0x1, PCIE_XCAP_TYPE_MASK)
diff -r d1f9c1c1d593 -r 71c9968d57c3 sys/dev/pci/ppb.c
--- a/sys/dev/pci/ppb.c Wed Sep 24 09:49:49 2014 +0000
+++ b/sys/dev/pci/ppb.c Wed Sep 24 10:57:03 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ppb.c,v 1.53 2014/09/24 09:49:49 msaitoh Exp $ */
+/*     $NetBSD: ppb.c,v 1.54 2014/09/24 10:57:03 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1996, 1998 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.53 2014/09/24 09:49:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.54 2014/09/24 10:57:03 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -110,10 +110,10 @@
 
        aprint_normal_dev(self, "PCI Express capability version ");
        switch (reg & PCIE_XCAP_VER_MASK) {
-       case PCIE_XCAP_VER_1_0:
+       case PCIE_XCAP_VER_1:
                aprint_normal("1");
                break;
-       case PCIE_XCAP_VER_2_0:
+       case PCIE_XCAP_VER_2:
                aprint_normal("2");
                break;
        default: