aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2020-12-06 19:15:13 +0100
committerMartin Mares <mj@ucw.cz>2020-12-06 19:15:13 +0100
commite6f95ee78be139be5f0b2ab3fbeb630f845f701f (patch)
tree1061321f94e3048921fb5e21de73b213208c1359
parent3afdb452bc82421a18e57913f57d8d4caf50dbcc (diff)
parent8f33a6939994cb2f2cf5d718466d8083c4217702 (diff)
downloadpciutils-e6f95ee78be139be5f0b2ab3fbeb630f845f701f.tar.gz
Merge branch 'pu/typos' of https://github.com/guillemj/pciutils
-rw-r--r--ChangeLog12
-rw-r--r--Makefile2
-rw-r--r--lib/caps.c4
-rw-r--r--lib/header.h6
-rw-r--r--lspci.man2
-rw-r--r--setpci.man2
6 files changed, 14 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 54f7fde..5d1db89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -763,7 +763,7 @@
2007-08-31 Martin Mares <mj@ucw.cz>
- * Makefile, lib/Makefile: `ar' and `ranlib' can be overriden to allow
+ * Makefile, lib/Makefile: `ar' and `ranlib' can be overridden to allow
cross-compilation.
2007-08-27 Martin Mares <mj@ucw.cz>
@@ -1337,7 +1337,7 @@
is not supported by all C libraries.
* Makefile: Always enter the lib directory (remember that we don't have
- full dependecies for the library in the top-level Makefile; hmmm, another
+ full dependencies for the library in the top-level Makefile; hmmm, another
thing to rewrite some day).
* lib/sysfs.c: Added Linux sysfs access method based on the patch
@@ -1860,7 +1860,7 @@ Wed Jul 7 00:55:48 1999 Martin Mares <mj@albireo.ucw.cz>
* lspci.c (show_msi): Added dumping of the MSI capability.
(show_slotid): The same for SlotID capability.
- (show_caps): Seperated capability dumping, because it should
+ (show_caps): Separated capability dumping, because it should
be used for both htype0 and htype1. Even PCI 2.2 doesn't mention
layout of htype2, so I'm a bit unsure about it wrt capabilities
-- they at least have to live somewhere else since address 0x34
@@ -1975,7 +1975,7 @@ Thu Jan 28 20:54:16 1999 Martin Mares <mj@albireo.ucw.cz>
is mainly guesswork based on DEC/Intel 21153 bridge specs
since I don't have the PCI Power Management document).
- * lspci.c: Replaced numerous occurences of (x & flag) ? '+' : '-'
+ * lspci.c: Replaced numerous occurrences of (x & flag) ? '+' : '-'
by FLAG macro.
* lspci.c: Added bridge checks to bus mapping code.
@@ -2007,11 +2007,11 @@ Sun Jan 24 22:10:36 1999 Martin Mares <mj@albireo.ucw.cz>
* lib/header.h: Until kernel adopts new layout of PCI
includes (i.e., separate declaration of header structure,
functions and device IDs), which is not going to happen
- before 2.3, we'll use our own definiton of the header.
+ before 2.3, we'll use our own definition of the header.
* lspci.c (show_verbose): Display `Cap' flag in device status.
- * lspci.c (show_htype0): Display capability lists whereever
+ * lspci.c (show_htype0): Display capability lists wherever
available. The only capability name we recognize now is `AGP'.
Unfortunately, capabilities are stored in device-dependent
portion of the configuration space and are thus available
diff --git a/Makefile b/Makefile
index c06eca7..8ee29b8 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ CC=$(CROSS_COMPILE)gcc
AR=$(CROSS_COMPILE)ar
RANLIB=$(CROSS_COMPILE)ranlib
-# Base name of the library (overriden on NetBSD, which has its own libpci)
+# Base name of the library (overridden on NetBSD, which has its own libpci)
LIBNAME=libpci
-include lib/config.mk
diff --git a/lib/caps.c b/lib/caps.c
index 1fca141..c3b9180 100644
--- a/lib/caps.c
+++ b/lib/caps.c
@@ -117,8 +117,8 @@ pci_find_cap(struct pci_dev *d, unsigned int id, unsigned int type)
* To select one capability if there are more than one with the same id, you
* can provide a pointer to an unsigned int that contains the index which you
* want as cap_number. If you don't care and are fine with the first one you
- * can supply NULL. The cap_number will be replaced by the acutal number
- * of capablities with that id.
+ * can supply NULL. The cap_number will be replaced by the actual number
+ * of capabilities with that id.
*/
struct pci_cap *
pci_find_cap_nr(struct pci_dev *d, unsigned int id, unsigned int type,
diff --git a/lib/header.h b/lib/header.h
index f53ab43..170e5c1 100644
--- a/lib/header.h
+++ b/lib/header.h
@@ -1072,7 +1072,7 @@
#define PCI_CXL_CAP_CACHE 0x0001 /* CXL.cache Protocol Support */
#define PCI_CXL_CAP_IO 0x0002 /* CXL.io Protocol Support */
#define PCI_CXL_CAP_MEM 0x0004 /* CXL.mem Protocol Support */
-#define PCI_CXL_CAP_MEM_HWINIT 0x0008 /* CXL.mem Initalizes with HW/FW Support */
+#define PCI_CXL_CAP_MEM_HWINIT 0x0008 /* CXL.mem Initializes with HW/FW Support */
#define PCI_CXL_CAP_HDM_CNT(x) (((x) & (3 << 4)) >> 4) /* CXL Number of HDM ranges */
#define PCI_CXL_CAP_VIRAL 0x4000 /* CXL Viral Handling Support */
#define PCI_CXL_CTRL 0x0c /* CXL Control Register */
@@ -1217,7 +1217,7 @@
#define PCI_DPC_CAP 4 /* DPC Capability */
#define PCI_DPC_CAP_INT_MSG(x) ((x) & 0x1f) /* DPC Interrupt Message Number */
-#define PCI_DPC_CAP_RP_EXT 0x20 /* DPC Root Port Extentions */
+#define PCI_DPC_CAP_RP_EXT 0x20 /* DPC Root Port Extensions */
#define PCI_DPC_CAP_TLP_BLOCK 0x40 /* DPC Poisoned TLP Egress Blocking */
#define PCI_DPC_CAP_SW_TRIGGER 0x80 /* DPC Software Trigger */
#define PCI_DPC_CAP_RP_LOG(x) (((x) >> 8) & 0xf) /* DPC RP PIO Log Size */
@@ -1235,7 +1235,7 @@
#define PCI_DPC_STS_REASON(x) (((x) >> 1) & 0x3) /* DPC Trigger Reason */
#define PCI_DPC_STS_INT 0x08 /* DPC Interrupt Status */
#define PCI_DPC_STS_RP_BUSY 0x10 /* DPC Root Port Busy */
-#define PCI_DPC_STS_TRIGGER_EXT(x) (((x) >> 5) & 0x3) /* Trigger Reason Extention */
+#define PCI_DPC_STS_TRIGGER_EXT(x) (((x) >> 5) & 0x3) /* Trigger Reason Extension */
#define PCI_DPC_STS_PIO_FEP(x) (((x) >> 8) & 0x1f) /* DPC PIO First Error Pointer */
#define PCI_DPC_SOURCE 10 /* DPC Source ID */
diff --git a/lspci.man b/lspci.man
index 255a13a..05e602e 100644
--- a/lspci.man
+++ b/lspci.man
@@ -188,7 +188,7 @@ available methods and their descriptions.
.TP
.B -O <param>=<value>
The behavior of the library is controlled by several named parameters.
-This option allows to set the value of any of the parameters. Use \fB-O help\fP
+This option allows one to set the value of any of the parameters. Use \fB-O help\fP
for a list of known parameters and their default values.
.TP
.B -H1
diff --git a/setpci.man b/setpci.man
index 665abec..6fee784 100644
--- a/setpci.man
+++ b/setpci.man
@@ -78,7 +78,7 @@ available methods and their descriptions.
.TP
.B -O <param>=<value>
The behavior of the library is controlled by several named parameters.
-This option allows to set the value of any of the parameters. Use \fB-O help\fP
+This option allows one to set the value of any of the parameters. Use \fB-O help\fP
for a list of known parameters and their default values.
.TP
.B -H1