From: Martin Mares <mj@ucw.cz>
Date: Thu, 28 Jan 2010 10:14:40 +0000 (+0100)
Subject: Improved formatting of PCIe port/slot capabilities
X-Git-Tag: v3.1.7~3
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=a242f574431f6624475acdedcb2b4cbeef385766;p=pciutils.git

Improved formatting of PCIe port/slot capabilities

The power limit is now limited to 3 decimal places and it always
includes units (watts), Port# and Slot# are both printed in decimal.
(Previously, the behavior was inconsistent between ports and slots.)
---

diff --git a/ls-caps.c b/ls-caps.c
index 6de3e0c..a4bf713 100644
--- a/ls-caps.c
+++ b/ls-caps.c
@@ -674,7 +674,7 @@ static void cap_express_dev(struct device *d, int where, int type)
 	FLAG(t, PCI_EXP_DEVCAP_RBE),
 	FLAG(t, PCI_EXP_DEVCAP_FLRESET));
   if (type == PCI_EXP_TYPE_UPSTREAM)
-    printf("SlotPowerLimit %fW",
+    printf("SlotPowerLimit %.3fW",
 	power_limit((t & PCI_EXP_DEVCAP_PWR_VAL) >> 18,
 		    (t & PCI_EXP_DEVCAP_PWR_SCL) >> 26));
   printf("\n");
@@ -806,7 +806,7 @@ static void cap_express_slot(struct device *d, int where)
 	FLAG(t, PCI_EXP_SLTCAP_PWRI),
 	FLAG(t, PCI_EXP_SLTCAP_HPC),
 	FLAG(t, PCI_EXP_SLTCAP_HPS));
-  printf("\t\t\tSlot #%3x, PowerLimit %f; Interlock%c NoCompl%c\n",
+  printf("\t\t\tSlot #%d, PowerLimit %.3fW; Interlock%c NoCompl%c\n",
 	t >> 19,
 	power_limit((t & PCI_EXP_SLTCAP_PWR_VAL) >> 7, (t & PCI_EXP_SLTCAP_PWR_SCL) >> 15),
 	FLAG(t, PCI_EXP_SLTCAP_INTERLOCK),