X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ls-vpd.c;h=92627e4f403f81e7bec5f1ad854daa9613dbcf5f;hb=4582426202ad6ac6539305dae2c0b70016f014f4;hp=f50d7a4ef5a9f0500631e361d9a0ae012415539c;hpb=db2a16f414d1766d03c6f3bd8f2042f57e235273;p=pciutils.git

diff --git a/ls-vpd.c b/ls-vpd.c
index f50d7a4..92627e4 100644
--- a/ls-vpd.c
+++ b/ls-vpd.c
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include "lspci.h"
 
@@ -33,7 +34,7 @@ static const struct vpd_item {
 } vpd_items[] = {
   { 'C','P', F_BINARY,	"Extended capability" },
   { 'E','C', F_TEXT,	"Engineering changes" },
-  { 'M','N', F_BINARY,	"Manufacture ID" },
+  { 'M','N', F_TEXT,	"Manufacture ID" },
   { 'P','N', F_TEXT,	"Part number" },
   { 'R','V', F_RESVD,	"Reserved" },
   { 'R','W', F_RDWR,	"Read-write area" },
@@ -41,7 +42,14 @@ static const struct vpd_item {
   { 'Y','A', F_TEXT,	"Asset tag" },
   { 'V', 0 , F_TEXT,	"Vendor specific" },
   { 'Y', 0 , F_TEXT,	"System specific" },
-  {  0,  0 , F_BINARY,	NULL }
+  /* Non-standard extensions */
+  { 'C','C', F_TEXT,	"CCIN" },
+  { 'F','C', F_TEXT,	"Feature code" },
+  { 'F','N', F_TEXT,	"FRU" },
+  { 'N','A', F_TEXT,	"Network address" },
+  { 'R','M', F_TEXT,	"Firmware version" },
+  { 'Z', 0 , F_TEXT,	"Product specific" },
+  {  0,  0 , F_BINARY,	"Unknown" }
 };
 
 static void
@@ -149,27 +157,22 @@ cap_vpd(struct device *d)
 	    {
 	      word read_len;
 	      const struct vpd_item *item;
-	      struct vpd_item unknown_item;
+	      byte id[2], id1, id2;
 
 	      if (!read_vpd(d, res_addr + part_pos, buf, 3, &csum))
 		break;
 	      part_pos += 3;
+	      memcpy(id, buf, 2);
+	      id1 = id[0];
+	      id2 = id[1];
 	      part_len = buf[2];
 	      if (part_len > res_len - part_pos)
 		break;
 
 	      /* Is this item known? */
-	      for (item=vpd_items; item->id1 && item->id1 != buf[0] ||
-				   item->id2 && item->id2 != buf[1]; item++)
+	      for (item=vpd_items; item->id1 && item->id1 != id1 ||
+				   item->id2 && item->id2 != id2; item++)
 		;
-	      if (!item->id1 && !item->id2)
-	        {
-		  unknown_item.id1 = buf[0];
-		  unknown_item.id2 = buf[1];
-		  unknown_item.format = F_BINARY;
-		  unknown_item.name = "Unknown";
-		  item = &unknown_item;
-	        }
 
 	      /* Only read the first byte of the RV field because the
 	       * remaining bytes are not included in the checksum. */
@@ -177,7 +180,9 @@ cap_vpd(struct device *d)
 	      if (!read_vpd(d, res_addr + part_pos, buf, read_len, &csum))
 		break;
 
-	      printf("\t\t\t[%c%c] %s: ", item->id1, item->id2, item->name);
+	      printf("\t\t\t[");
+	      print_vpd_string(id, 2);
+	      printf("] %s: ", item->name);
 
 	      switch (item->format)
 	        {
@@ -202,9 +207,9 @@ cap_vpd(struct device *d)
 	  break;
 
 	default:
-	  printf("\t\tUnknown %s resource type %02x\n",
+	  printf("\t\tUnknown %s resource type %02x, will not decode more.\n",
 		 (tag & 0x80) ? "large" : "small", tag & ~0x80);
-	  break;
+	  return;
 	}
 
       res_addr += res_len;