Added two more capability ID's gathered from various ECN's.

diff --git a/ChangeLog b/ChangeLog
index 891fc8d38257f00a93dce0ed880b3a47fd06958f..899138fbffae0e50aa8e7f9923d6e522de89e8d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,8 @@
        0x40) and renumbered the satellite communication controllers.
 
        * lib/header.h: Include `PCI hot-plug' and `Secure device'
-       capabilities from PCI 3.0 specs.
+       capabilities from PCI 3.0 specs. Also added `SATA HBA' and
+       `Advanced features' caps from various ECN's.
 
        * lspci.c: All known capabilities have at least their name displayed
        now. When we are unable to decode them completely, we signalize it

diff --git a/TODO b/TODO
index 4746a117d137aba1ae7ecbfb4382b356fb3d8657..54892c044667aa67005ad9f313aa66907a53592c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,13 +1,15 @@
 Capabilities with partial decoding:
-- PCIe 2nd set of control/status registers
-- HyperTransport caps
+- PCIe 2nd set of control/status registers (have spec)
+- HyperTransport caps (have spec)
 
 Capabilities with no decoding:
-- VPD
+- VPD (have spec)
 - CompactPCI hot-swap
 - CompactPCI central resource control
 - AGP3
 - Secure device
+- SATA HBA (have spec)
+- Advanced features (have spec)
 - Advanced Error Reporting (ext'd)
 - Virtual Channel (ext'd)
 - Power Budgeting (ext'd)

diff --git a/lib/header.h b/lib/header.h
index e62971e4d0c4ff63d628a278122164aac33f41a6..a53eccceace7a73740e11e7ddc62af16cd58d47f 100644 (file)
--- a/lib/header.h
+++ b/lib/header.h
@@ -200,6 +200,8 @@
 #define  PCI_CAP_ID_SECURE     0x0F    /* Secure device (?) */
 #define  PCI_CAP_ID_EXP                0x10    /* PCI Express */
 #define  PCI_CAP_ID_MSIX       0x11    /* MSI-X */
+#define  PCI_CAP_ID_SATA       0x12    /* Serial-ATA HBA */
+#define  PCI_CAP_ID_AF         0x13    /* Advanced features of PCI devices integrated in PCIe root cplx */
 #define PCI_CAP_LIST_NEXT      1       /* Next capability in the list */
 #define PCI_CAP_FLAGS          2       /* Capability defined flags (16 bits) */
 #define PCI_CAP_SIZEOF         4

diff --git a/lspci.c b/lspci.c
index 035cbbba8f34ef8d45e58d40999ac0ac40725f91..81192ee605ebae252fd39c16d734ec06a2fbb0ea 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -1436,6 +1436,12 @@ show_caps(struct device *d)
            case PCI_CAP_ID_MSIX:
              cap_msix(d, where, cap);
              break;
+           case PCI_CAP_ID_SATA:
+             printf("SATA HBA <?>\n");
+             break;
+           case PCI_CAP_ID_AF:
+             printf("PCIe advanced features <?>\n");
+             break;
            default:
              printf("#%02x [%04x]\n", id, cap);
            }