Module Name: src
Committed By: msaitoh
Date: Wed Sep 24 10:57:03 UTC 2014
Modified Files:
src/sys/dev/pci: pcireg.h ppb.c
Log Message:
Rename PCIE_XCAP_VER_* macros to avoid confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/pcireg.h
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/ppb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.95 src/sys/dev/pci/pcireg.h:1.96
--- src/sys/dev/pci/pcireg.h:1.95 Mon Jun 9 11:08:05 2014
+++ src/sys/dev/pci/pcireg.h Wed Sep 24 10:57:03 2014
@@ -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 @@ typedef u_int8_t pci_revision_t;
#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)
Index: src/sys/dev/pci/ppb.c
diff -u src/sys/dev/pci/ppb.c:1.53 src/sys/dev/pci/ppb.c:1.54
--- src/sys/dev/pci/ppb.c:1.53 Wed Sep 24 09:49:49 2014
+++ src/sys/dev/pci/ppb.c Wed Sep 24 10:57:03 2014
@@ -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 @@ ppb_fix_pcie(device_t self)
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:
