Module Name: src
Committed By: snj
Date: Thu Jul 26 21:07:19 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: pci_subr.c pcireg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #930):
sys/dev/pci/pci_subr.c: revision 1.201
sys/dev/pci/pcireg.h: revision 1.138
Fix typo. s/TPL/TLP/
To generate a diff of this commit:
cvs rdiff -u -r1.183.2.4 -r1.183.2.5 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.130.2.3 -r1.130.2.4 src/sys/dev/pci/pcireg.h
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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.183.2.4 src/sys/dev/pci/pci_subr.c:1.183.2.5
--- src/sys/dev/pci/pci_subr.c:1.183.2.4 Mon Feb 26 00:56:29 2018
+++ src/sys/dev/pci/pci_subr.c Thu Jul 26 21:07:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.183.2.4 2018/02/26 00:56:29 snj Exp $ */
+/* $NetBSD: pci_subr.c,v 1.183.2.5 2018/07/26 21:07:19 snj 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.183.2.4 2018/02/26 00:56:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.5 2018/07/26 21:07:19 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -3846,7 +3846,7 @@ pci_conf_print_dpc_cap(const pcireg_t *r
extcapoff + PCI_DPC_RPPIO_HLOG);
printf(" RP PIO ImpSpec Log Register: start from 0x%03x\n",
extcapoff + PCI_DPC_RPPIO_IMPSLOG);
- printf(" RP PIO TPL Prefix Log Register: start from 0x%03x\n",
+ printf(" RP PIO TLP Prefix Log Register: start from 0x%03x\n",
extcapoff + PCI_DPC_RPPIO_TLPPLOG);
}
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.130.2.3 src/sys/dev/pci/pcireg.h:1.130.2.4
--- src/sys/dev/pci/pcireg.h:1.130.2.3 Mon Feb 26 00:56:29 2018
+++ src/sys/dev/pci/pcireg.h Thu Jul 26 21:07:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.130.2.3 2018/02/26 00:56:29 snj Exp $ */
+/* $NetBSD: pcireg.h,v 1.130.2.4 2018/07/26 21:07:19 snj Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -2029,7 +2029,7 @@ struct pci_rom {
/* Same */
#define PCI_DPC_RPPIO_HLOG 0x20 /* RP PIO Header Log Register */
#define PCI_DPC_RPPIO_IMPSLOG 0x30 /* RP PIO ImpSpec Log Register */
-#define PCI_DPC_RPPIO_TLPPLOG 0x34 /* RP PIO TPL Prefix Log Register */
+#define PCI_DPC_RPPIO_TLPPLOG 0x34 /* RP PIO TLP Prefix Log Register */
/*
* Extended capability ID: 0x001e
