*/
#include <stdio.h>
+#include <string.h>
#include "lspci.h"
{ 'Y','A', F_TEXT, "Asset tag" },
{ 'V', 0 , F_TEXT, "Vendor specific" },
{ 'Y', 0 , F_TEXT, "System specific" },
-/*
- * The following VPD keywords are vendor specific or not part of any
- * current PCI-SIG specification
- */
- { '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" },
-/*
- * End vendor specific VPD keywords
- */
+ /* 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" }
};
{
word read_len;
const struct vpd_item *item;
- byte id1, id2;
+ byte id[2], id1, id2;
if (!read_vpd(d, res_addr + part_pos, buf, 3, &csum))
break;
part_pos += 3;
- id1 = buf[0];
- id2 = buf[1];
+ memcpy(id, buf, 2);
+ id1 = id[0];
+ id2 = id[1];
part_len = buf[2];
if (part_len > res_len - part_pos)
break;
if (!read_vpd(d, res_addr + part_pos, buf, read_len, &csum))
break;
- printf("\t\t\t[%c%c] %s: ", id1, id2, item->name);
+ printf("\t\t\t[");
+ print_vpd_string(id, 2);
+ printf("] %s: ", item->name);
switch (item->format)
{