[src/trunk]: src/sys/dev/pci - Official shortname of LN Requester is LNR, so ...

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

details:   https://anonhg.NetBSD.org/src/rev/25ff66d30396
branches:  trunk
changeset: 825408:25ff66d30396
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jul 13 08:41:19 2017 +0000

description:
- Official shortname of LN Requester is LNR, so change PCI_EXTCAP_LN_REQ
  to PCI_EXTCAP_LNR
- Use macro.

diffstat:

 sys/dev/pci/pci_subr.c |  10 +++++-----
 sys/dev/pci/pcireg.h   |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 75429c08c6f3 -r 25ff66d30396 sys/dev/pci/pci_subr.c
--- a/sys/dev/pci/pci_subr.c    Thu Jul 13 08:26:29 2017 +0000
+++ b/sys/dev/pci/pci_subr.c    Thu Jul 13 08:41:19 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_subr.c,v 1.189 2017/06/15 15:38:18 flxd Exp $      */
+/*     $NetBSD: pci_subr.c,v 1.190 2017/07/13 08:41:19 msaitoh Exp $   */
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.189 2017/06/15 15:38:18 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.190 2017/07/13 08:41:19 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -2087,7 +2087,7 @@
                break;
        }
        printf("      OBFF Supported: ");
-       switch ((reg & PCIE_DCAP2_OBFF) >> 18) {
+       switch (__SHIFTOUT(reg, PCIE_DCAP2_OBFF)) {
        case 0x0:
                printf("Not supported\n");
                break;
@@ -2139,7 +2139,7 @@
        onoff("Emergency Power Reduction Request", reg,
            PCIE_DCSR2_EMGPWRRED_REQ);
        printf("      OBFF: ");
-       switch ((reg & PCIE_DCSR2_OBFF_EN) >> 13) {
+       switch (__SHIFTOUT(reg, PCIE_DCSR2_OBFF_EN)) {
        case 0x0:
                printf("Disabled\n");
                break;
@@ -3939,7 +3939,7 @@
          NULL },
        { PCI_EXTCAP_PASID,     "Process Address Space ID",
          pci_conf_print_pasid_cap },
-       { PCI_EXTCAP_LN_REQ,    "LN Requester",
+       { PCI_EXTCAP_LNR,       "LN Requester",
          pci_conf_print_lnr_cap },
        { PCI_EXTCAP_DPC,       "Downstream Port Containment",
          pci_conf_print_dpc_cap },
diff -r 75429c08c6f3 -r 25ff66d30396 sys/dev/pci/pcireg.h
--- a/sys/dev/pci/pcireg.h      Thu Jul 13 08:26:29 2017 +0000
+++ b/sys/dev/pci/pcireg.h      Thu Jul 13 08:41:19 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcireg.h,v 1.131 2017/06/15 06:51:18 msaitoh Exp $     */
+/*     $NetBSD: pcireg.h,v 1.132 2017/07/13 08:41:19 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -1433,7 +1433,7 @@
 #define        PCI_EXTCAP_SEC_PCIE     0x0019  /* Secondary PCI Express */
 #define        PCI_EXTCAP_PMUX         0x001a  /* Protocol Multiplexing */
 #define        PCI_EXTCAP_PASID        0x001b  /* Process Address Space ID */
-#define        PCI_EXTCAP_LN_REQ       0x001c  /* LN Requester */
+#define        PCI_EXTCAP_LNR          0x001c  /* LN Requester */
 #define        PCI_EXTCAP_DPC          0x001d  /* Downstream Port Containment */
 #define        PCI_EXTCAP_L1PM         0x001e  /* L1 PM Substates */
 #define        PCI_EXTCAP_PTM          0x001f  /* Precision Time Management */