On Sat, 4 Oct 2008 19:35:57 +0200 Martin Mares wrote: > > I believe the original document used entirely US spellings, and I didn't > > notice this when doing the rewrite. I suspect the right thing to do is > > use US spellings throughout, including patching lspci. Durn it. Also. > > Feel free to send a patch to pciutils, being consistent with the PCI specs > is a good thing. From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Spell "Signaled" like the PCI SIG spells it (not Signalled). Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> --- lib/header.h | 4 ++-- lspci.c | 2 +- tests/cap-pcie-1 | 2 +- tests/cap-pcie-2 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) --- pciutils-3.0.2.orig/lib/header.h +++ pciutils-3.0.2/lib/header.h @@ -187,7 +187,7 @@ #define PCI_CAP_ID_AGP 0x02 /* Accelerated Graphics Port */ #define PCI_CAP_ID_VPD 0x03 /* Vital Product Data */ #define PCI_CAP_ID_SLOTID 0x04 /* Slot Identification */ -#define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ +#define PCI_CAP_ID_MSI 0x05 /* Message Signaled Interrupts */ #define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */ #define PCI_CAP_ID_PCIX 0x07 /* PCI-X */ #define PCI_CAP_ID_HT 0x08 /* HyperTransport */ @@ -287,7 +287,7 @@ #define PCI_SID_ESR_FIC 0x20 /* First In Chassis Flag */ #define PCI_SID_CHASSIS_NR 3 /* Chassis Number */ -/* Message Signalled Interrupts registers */ +/* Message Signaled Interrupts registers */ #define PCI_MSI_FLAGS 2 /* Various flags */ #define PCI_MSI_FLAGS_MASK_BIT 0x100 /* interrupt masking & reporting supported */ --- pciutils-3.0.2.orig/lspci.c +++ pciutils-3.0.2/lspci.c @@ -922,7 +922,7 @@ cap_msi(struct device *d, int where, int u32 t; u16 w; - printf("Message Signalled Interrupts: Mask%c 64bit%c Count=%d/%d Enable%c\n", + printf("Message Signaled Interrupts: Mask%c 64bit%c Count=%d/%d Enable%c\n", FLAG(cap, PCI_MSI_FLAGS_MASK_BIT), FLAG(cap, PCI_MSI_FLAGS_64BIT), 1 << ((cap & PCI_MSI_FLAGS_QSIZE) >> 4), --- pciutils-3.0.2.orig/tests/cap-pcie-1 +++ pciutils-3.0.2/tests/cap-pcie-1 @@ -10,7 +10,7 @@ BridgeCtl: Parity- SERR- NoISA- VGA- MAbort- >Reset- FastB2B- PriDiscTmr- SecDiscTmr- DiscTmrStat- DiscTmrSERREn- Capabilities: [40] Subsystem: Device 8086:0000 - Capabilities: [60] Message Signalled Interrupts: Mask+ 64bit- Queue=0/1 Enable+ + Capabilities: [60] Message Signaled Interrupts: Mask+ 64bit- Queue=0/1 Enable+ Address: fee00000 Data: 40b0 Masking: 00000003 Pending: 00000000 Capabilities: [90] Express (v2) Root Port (Slot-), MSI 00 --- pciutils-3.0.2.orig/tests/cap-pcie-2 +++ pciutils-3.0.2/tests/cap-pcie-2 @@ -11,7 +11,7 @@ Capabilities: [40] Power Management version 3 Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 PME-Enable- DSel=0 DScale=1 PME- - Capabilities: [50] Message Signalled Interrupts: Mask+ 64bit+ Queue=0/0 Enable- + Capabilities: [50] Message Signaled Interrupts: Mask+ 64bit+ Queue=0/0 Enable- Address: 0000000000000000 Data: 0000 Masking: 00000000 Pending: 00000000 Capabilities: [70] MSI-X: Enable+ Mask- TabSize=10 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html