diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-21 14:32:34 -0500 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2017-04-29 20:05:07 +0200 |
| commit | 02d761b4169b7c9549534a37f7f1294e29d34fdb (patch) | |
| tree | c46182b1129be2173b2911fcefce2063411ccbea | |
| parent | 78996f1c88172dd1bf54d05faff3861999ca2aa1 (diff) | |
| download | pciutils-02d761b4169b7c9549534a37f7f1294e29d34fdb.tar.gz | |
lspci: Use #defines for greppability
Use existing #defines when possible so grep/cscope/etc are more useful. No
functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | ls-caps.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -25,7 +25,7 @@ cap_pm(struct device *d, int where, int cap) FLAG(cap, PCI_PM_CAP_DSI), FLAG(cap, PCI_PM_CAP_D1), FLAG(cap, PCI_PM_CAP_D2), - pm_aux_current[(cap >> 6) & 7], + pm_aux_current[(cap & PCI_PM_CAP_AUX_C_MASK) >> 6], FLAG(cap, PCI_PM_CAP_PME_D0), FLAG(cap, PCI_PM_CAP_PME_D1), FLAG(cap, PCI_PM_CAP_PME_D2), @@ -136,17 +136,17 @@ cap_pcix_nobridge(struct device *d, int where) 1 << (9 + ((command & PCI_PCIX_COMMAND_MAX_MEM_READ_BYTE_COUNT) >> 2U)), max_outstanding[(command & PCI_PCIX_COMMAND_MAX_OUTSTANDING_SPLIT_TRANS) >> 4U]); printf("\t\tStatus: Dev=%02x:%02x.%d 64bit%c 133MHz%c SCD%c USC%c DC=%s DMMRBC=%u DMOST=%u DMCRS=%u RSCEM%c 266MHz%c 533MHz%c\n", - ((status >> 8) & 0xff), - ((status >> 3) & 0x1f), + (status & PCI_PCIX_STATUS_BUS) >> 8, + (status & PCI_PCIX_STATUS_DEVICE) >> 3, (status & PCI_PCIX_STATUS_FUNCTION), FLAG(status, PCI_PCIX_STATUS_64BIT), FLAG(status, PCI_PCIX_STATUS_133MHZ), FLAG(status, PCI_PCIX_STATUS_SC_DISCARDED), FLAG(status, PCI_PCIX_STATUS_UNEXPECTED_SC), ((status & PCI_PCIX_STATUS_DEVICE_COMPLEXITY) ? "bridge" : "simple"), - 1 << (9 + ((status >> 21) & 3U)), - max_outstanding[(status >> 23) & 7U], - 1 << (3 + ((status >> 26) & 7U)), + 1 << (9 + ((status & PCI_PCIX_STATUS_DESIGNED_MAX_MEM_READ_BYTE_COUNT) >> 21)), + max_outstanding[(status & PCI_PCIX_STATUS_DESIGNED_MAX_OUTSTANDING_SPLIT_TRANS) >> 23], + 1 << (3 + ((status & PCI_PCIX_STATUS_DESIGNED_MAX_CUMULATIVE_READ_SIZE) >> 26)), FLAG(status, PCI_PCIX_STATUS_RCVD_SC_ERR_MESS), FLAG(status, PCI_PCIX_STATUS_266MHZ), FLAG(status, PCI_PCIX_STATUS_533MHZ)); @@ -175,11 +175,11 @@ cap_pcix_bridge(struct device *d, int where) FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_UNEXPECTED_SC), FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_SC_OVERRUN), FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_SPLIT_REQUEST_DELAYED), - sec_clock_freq[(secstatus >> 6) & 7]); + sec_clock_freq[(secstatus & PCI_PCIX_BRIDGE_SEC_STATUS_CLOCK_FREQ) >> 6]); status = get_conf_long(d, where + PCI_PCIX_BRIDGE_STATUS); printf("\t\tStatus: Dev=%02x:%02x.%d 64bit%c 133MHz%c SCD%c USC%c SCO%c SRD%c\n", - ((status >> 8) & 0xff), - ((status >> 3) & 0x1f), + (status & PCI_PCIX_BRIDGE_STATUS_BUS) >> 8, + (status & PCI_PCIX_BRIDGE_STATUS_DEVICE) >> 3, (status & PCI_PCIX_BRIDGE_STATUS_FUNCTION), FLAG(status, PCI_PCIX_BRIDGE_STATUS_64BIT), FLAG(status, PCI_PCIX_BRIDGE_STATUS_133MHZ), @@ -831,7 +831,7 @@ static void cap_express_slot(struct device *d, int where) FLAG(t, PCI_EXP_SLTCAP_HPC), FLAG(t, PCI_EXP_SLTCAP_HPS)); printf("\t\t\tSlot #%d, PowerLimit %.3fW; Interlock%c NoCompl%c\n", - t >> 19, + (t & PCI_EXP_SLTCAP_PSN) >> 19, power_limit((t & PCI_EXP_SLTCAP_PWR_VAL) >> 7, (t & PCI_EXP_SLTCAP_PWR_SCL) >> 15), FLAG(t, PCI_EXP_SLTCAP_INTERLOCK), FLAG(t, PCI_EXP_SLTCAP_NOCMDCOMP)); |