Be ISO C89 compliant (still needed for MSVC)

[pciutils.git] / ls-ecaps.c

diff --git a/ls-ecaps.c b/ls-ecaps.c
index 04140741b73cfd3ba3e5b66cd63d6e40fb98bbb9..ed10f72be2628512c44bff961da71b41c9f562a1 100644 (file)
--- a/ls-ecaps.c
+++ b/ls-ecaps.c
@@ -1,7 +1,7 @@
 /*
  *     The PCI Utilities -- Show Extended Capabilities
  *
- *     Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *     Copyright (c) 1997--2010 Martin Mares <mj@ucw.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -222,8 +222,8 @@ cap_vc(struct device *d, int where)
   int arb_table_pos;
   int i, j;
   static const char ref_clocks[][6] = { "100ns" };
-  static const char arb_selects[][7] = { "Fixed", "WRR32", "WRR64", "WRR128" };
-  static const char vc_arb_selects[][8] = { "Fixed", "WRR32", "WRR64", "WRR128", "TWRR128", "WRR256" };
+  static const char arb_selects[8][7] = { "Fixed", "WRR32", "WRR64", "WRR128", "??4", "??5", "??6", "??7" };
+  static const char vc_arb_selects[8][8] = { "Fixed", "WRR32", "WRR64", "WRR128", "TWRR128", "WRR256", "??6", "??7" };
   char buf[8];
 
   printf("Virtual Channel\n");
@@ -239,23 +239,25 @@ cap_vc(struct device *d, int where)
   status = get_conf_word(d, where + PCI_VC_PORT_STATUS);
 
   evc_cnt = BITS(cr1, 0, 3);
-  printf("\t\tCaps:\tLPEVC=%d RefClk=%s PATEntrySize=%d\n",
+  printf("\t\tCaps:\tLPEVC=%d RefClk=%s PATEntryBits=%d\n",
     BITS(cr1, 4, 3),
     TABLE(ref_clocks, BITS(cr1, 8, 2), buf),
-    BITS(cr1, 10, 2));
+    1 << BITS(cr1, 10, 2));
 
-  printf("\t\tArb:\t");
+  printf("\t\tArb:");
   for (i=0; i<8; i++)
     if (arb_selects[i][0] != '?' || cr2 & (1 << i))
-      printf("%s%c ", arb_selects[i], FLAG(cr2, 1 << i));
+      printf("%c%s%c", (i ? ' ' : '\t'), arb_selects[i], FLAG(cr2, 1 << i));
   arb_table_pos = BITS(cr2, 24, 8);
-  printf("TableOffset=%x\n", arb_table_pos);
 
-  printf("\t\tCtrl:\tArbSelect=%s\n", TABLE(arb_selects, BITS(ctrl, 1, 3), buf));
+  printf("\n\t\tCtrl:\tArbSelect=%s\n", TABLE(arb_selects, BITS(ctrl, 1, 3), buf));
   printf("\t\tStatus:\tInProgress%c\n", FLAG(status, 1));
 
   if (arb_table_pos)
-    printf("\t\tPort Arbitration Table <?>\n");
+    {
+      arb_table_pos = where + 16*arb_table_pos;
+      printf("\t\tPort Arbitration Table [%x] <?>\n", arb_table_pos);
+    }
 
   for (i=0; i<=evc_cnt; i++)
     {
@@ -362,6 +364,25 @@ cap_rclink(struct device *d, int where)
     }
 }
 
+static void
+cap_evendor(struct device *d, int where)
+{
+  u32 hdr;
+
+  printf("Vendor Specific Information: ");
+  if (!config_fetch(d, where + PCI_EVNDR_HEADER, 4))
+    {
+      printf("<unreadable>\n");
+      return;
+    }
+
+  hdr = get_conf_long(d, where + PCI_EVNDR_HEADER);
+  printf("ID=%04x Rev=%d Len=%03x <?>\n",
+    BITS(hdr, 0, 16),
+    BITS(hdr, 16, 4),
+    BITS(hdr, 20, 12));
+}
+
 void
 show_ext_caps(struct device *d)
 {
@@ -420,7 +441,7 @@ show_ext_caps(struct device *d)
            printf("Root Bridge Control Block <?>\n");
            break;
          case PCI_EXT_CAP_ID_VNDR:
-           printf("Vendor Specific Information <?>\n");
+           cap_evendor(d, where);
            break;
          case PCI_EXT_CAP_ID_ACS:
            cap_acs(d, where);