6309900 prtfru output incorrect for PCI-X board on LW8

2 files changed, 219 insertions, 7 deletions

diff --git a/usr/src/lib/libfru/include/libfru.h b/usr/src/lib/libfru/include/libfru.h
index bba6640b9f..2f281b2332 100644
--- a/usr/src/lib/libfru/include/libfru.h
+++ b/usr/src/lib/libfru/include/libfru.h
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2000-2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -72,7 +72,7 @@ typedef enum
 
 /* Fru Display Types */
 typedef enum { FDISP_Binary = 0, FDISP_Octal, FDISP_Hex, FDISP_Decimal,
-	FDISP_String, FDISP_Time, FDISP_UNDEFINED
+	FDISP_String, FDISP_Time, FDISP_MSGID, FDISP_UUID, FDISP_UNDEFINED
 } fru_displaytype_t;
 
 /* Fru Data Types */
diff --git a/usr/src/lib/libfru/libfrureg/frudefs.c b/usr/src/lib/libfru/libfrureg/frudefs.c
index 8deec07c27..4422915c93 100644
--- a/usr/src/lib/libfru/libfrureg/frudefs.c
+++ b/usr/src/lib/libfru/libfrureg/frudefs.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -30,7 +30,7 @@
  * FRUID Tag Registry
  * This file is AUTO-generated DO NOT EDIT
  *
- * Generated on Thu Mar 25 16:40:06 PST 2004 by kmohan.
+ * Generated on Tue Aug 30 15:22:27 PDT 2005 by kmohan.
  * From input file data.frureg
  *
  */
@@ -605,6 +605,8 @@ fru_enum_t FRU_Type[] = {
 	{ 0x205, "CPU Board V3" },
 	{ 0x206, "LW8_CPU_Board" },
 	{ 0x207, "LW8 CPU Board V3" },
+	{ 0x208, "DDR CPU Board" },
+	{ 0x209, "LW8 DDR CPU Board" },
 	{ 0x301, "L2 Board" },
 	{ 0x302, "Logic Analyzer Board" },
 	{ 0x303, "SP L2 Board" },
@@ -628,6 +630,9 @@ fru_enum_t FRU_Type[] = {
 	{ 0x505, "WCI SP CPCI IO Board SPonly IO WIB" },
 	{ 0x506, "LW8_PCI_Board" },
 	{ 0x507, "PCIX IO Board" },
+	{ 0x508, "XMIT PCIX Board" },
+	{ 0x509, "LW8_PCIX_Board" },
+	{ 0x50a, "LW8_PCI+_Board" },
 	{ 0x601, "A123 Power Supply" },
 	{ 0x602, "A138 Power Supply" },
 	{ 0x603, "A145 Power Supply" },
@@ -638,6 +643,8 @@ fru_enum_t FRU_Type[] = {
 	{ 0x608, "D142_Module" },
 	{ 0x609, "A184 Power Supply" },
 	{ 0x60a, "A185 Power Supply" },
+	{ 0x60b, "A212 Power Supply" },
+	{ 0x60c, "A213 Power Supply" },
 	{ 0x701, "SP Centerplane" },
 	{ 0x702, "DC Centerplane w/ID Board" },
 	{ 0x703, "ME Centerplane w/ID Board" },
@@ -684,7 +691,8 @@ fru_enum_t FRU_Type[] = {
 	{ 0xe02, "LW8_Baseplane" },
 	{ 0xe03, "LW8_Indicator_BD" },
 	{ 0xe04, "LW8_Media_Bay" },
-	{ 0xe05, "2900_Indicator_BD" }
+	{ 0xe05, "2900_Indicator_BD" },
+	{ 0xe06, "1290_Indicator_BD" }
 };
 
 fru_enum_t CPU_Type[] = {
@@ -821,6 +829,15 @@ fru_enum_t Device_Type[] = {
 	{ 0x102, "Littleneck Motherboard" },
 	{ 0x103, "Cherrystone Centerplane" },
 	{ 0x104, "A42 Motherboard" },
+	{ 0x105, "Ontario Niagara CPU Board" },
+	{ 0x106, "Erie Systemboard" },
+	{ 0x107, "Ontario Niagara 8 Core 1.0 GHz CPU Board" },
+	{ 0x108, "Ontario Niagara 8 Core 1.2 GHz CPU Board" },
+	{ 0x109, "Ontario Niagara 6 Core 1.0 GHz CPU Board" },
+	{ 0x10a, "Ontario Niagara 4 Core 1.0 GHz CPU Board" },
+	{ 0x10b, "Erie 4 Core 1.0 GHz Systemboard" },
+	{ 0x10c, "Erie 6 Core 1.0 GHz Systemboard" },
+	{ 0x10d, "Erie 8 Core 1.0 GHz Systemboard" },
 	{ 0x200, "CPU Module" },
 	{ 0x201, "Daktari CPU Module" },
 	{ 0x202, "A42 1.064 GHZ CPU Memory Module" },
@@ -828,22 +845,29 @@ fru_enum_t Device_Type[] = {
 	{ 0x204, "SeSi CMP Module" },
 	{ 0x300, "IO Board" },
 	{ 0x301, "Daktari IO Board" },
+	{ 0x302, "Ontario IO Board" },
 	{ 0x303, "Cherrystone Riser" },
+	{ 0x304, "Ontario Front IO Board" },
+	{ 0x305, "G2 Front IO Board" },
+	{ 0x306, "Ontario IO-E Board" },
 	{ 0x400, "RSC Card" },
 	{ 0x401, "Daktari RSC Card" },
 	{ 0x402, "ALOM Card" },
 	{ 0x403, "ALOM Plus Card" },
+	{ 0x404, "Ontario Service Processor" },
 	{ 0x500, "Disk Backplane" },
 	{ 0x501, "Daktari Disk Backplane" },
 	{ 0x502, "Littleneck Disk Backplane" },
 	{ 0x503, "Cherrystone Disk Backplane" },
 	{ 0x504, "A42 SCSI Disk Backplane" },
 	{ 0x505, "N42 SCSI Disk Backplane" },
+	{ 0x506, "Ontario SAS Disk Backplane" },
 	{ 0x600, "PDB Board" },
 	{ 0x601, "Daktari PDB Board" },
 	{ 0x602, "Littleneck PDB Board" },
 	{ 0x603, "Cherrystone PDB	Board" },
 	{ 0x604, "N42 PDB Board" },
+	{ 0x605, "Ontario Power Distribution Board" },
 	{ 0x700, "Power Supply" },
 	{ 0x701, "Daktari Power Supply" },
 	{ 0x702, "Littleneck Power Supply" },
@@ -1064,6 +1088,26 @@ fru_enum_t SPD_Err_Detect[] = {
 	{ 0x2, "ECC" }
 };
 
+fru_enum_t Platform_Type[] = {
+	{ 0x1, "SunFire12K" },
+	{ 0x2, "SunFire15K" },
+	{ 0x3, "SunFireE20K" },
+	{ 0x4, "SunFireE25K" },
+	{ 0x5, "Sun Fire 6800" },
+	{ 0x6, "Sun Fire E4900" },
+	{ 0x7, "Sun Fire E6900" },
+	{ 0x8, "Sun Fire 4800" },
+	{ 0x9, "Sun Fire 4810" },
+	{ 0xa, "Sun Fire 3800" },
+	{ 0xb, "Sun Fire V1280" },
+	{ 0xc, "Netra 1280" }
+};
+
+fru_enum_t Message_Type[] = {
+	{ 0x1, "Commodity FMA event data" },
+	{ 0x2, "Free form text" }
+};
+
 
 fru_enum_t ManR[] = {
 	{ 0, "UNIX_Timestamp32" },
@@ -1993,6 +2037,24 @@ fru_enum_t FRU_Props_Private2R[] = {
 	{ 2, "Properties" }
 };
 
+fru_enum_t Status_Proxy3R[] = {
+	{ 0, "UNIX_Timestamp32" },
+	{ 1, "Version" },
+	{ 2, "StatusMap2" }
+};
+
+fru_enum_t DDR1PinSteerR[] = {
+	{ 0, "UNIX_Timestamp32" },
+	{ 1, "DataBits" }
+};
+
+fru_enum_t Event_DataR[] = {
+	{ 0, "Initiator" },
+	{ 1, "Message_Type" },
+	{ 2, "Diagcode" },
+	{ 3, "UUID" }
+};
+
 
 fru_regdef_t Element_Defs[] = {
 	{FRU_REVNO,
@@ -2971,6 +3033,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"DDR1PinSteerR",
+		FRU_C,
+		9,
+		8,
+		8,
+		FDTYPE_Record,
+		FDISP_UNDEFINED,
+		FRU_Yes,
+		FRU_Yes,
+		2,
+		DDR1PinSteerR,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"DIMM_Capacity",
 		FRU_C,
 		8,
@@ -3301,6 +3378,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"DataBits",
+		FRU_X,
+		0,
+		4,
+		4,
+		FDTYPE_ByteArray,
+		FDISP_Hex,
+		FRU_Yes,
+		FRU_Yes,
+		0,
+		NULL,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"Date_Code",
 		FRU_X,
 		0,
@@ -3340,7 +3432,7 @@ fru_regdef_t Element_Defs[] = {
 		FDISP_String,
 		FRU_No,
 		FRU_No,
-		43,
+		59,
 		Device_Type,
 		0,
 		FRU_NOT_ITERATED,
@@ -3361,6 +3453,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"Diagcode",
+		FRU_X,
+		0,
+		16,
+		16,
+		FDTYPE_ByteArray,
+		FDISP_MSGID,
+		FRU_Yes,
+		FRU_Yes,
+		0,
+		NULL,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"Disk_Presence",
 		FRU_X,
 		0,
@@ -3766,6 +3873,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"Event_DataR",
+		FRU_E,
+		2,
+		34,
+		34,
+		FDTYPE_Record,
+		FDISP_UNDEFINED,
+		FRU_Yes,
+		FRU_Yes,
+		4,
+		Event_DataR,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"ExcalCPUR",
 		FRU_E,
 		1,
@@ -4195,7 +4317,7 @@ fru_regdef_t Element_Defs[] = {
 		FDISP_String,
 		FRU_No,
 		FRU_No,
-		90,
+		98,
 		FRU_Type,
 		0,
 		FRU_NOT_ITERATED,
@@ -5041,6 +5163,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"Message_Type",
+		FRU_X,
+		0,
+		1,
+		1,
+		FDTYPE_Enumeration,
+		FDISP_String,
+		FRU_Yes,
+		FRU_Yes,
+		2,
+		Message_Type,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"Microcode_Version",
 		FRU_C,
 		3,
@@ -5161,6 +5298,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"No_CPU_Fans",
+		FRU_B,
+		3,
+		1,
+		8,
+		FDTYPE_Binary,
+		FDISP_Binary,
+		FRU_No,
+		FRU_Yes,
+		0,
+		NULL,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"Num_CPU_Module_Slots",
 		FRU_X,
 		0,
@@ -5341,6 +5493,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"PlatformId",
+		FRU_A,
+		3,
+		2,
+		2,
+		FDTYPE_Enumeration,
+		FDISP_String,
+		FRU_Yes,
+		FRU_Yes,
+		12,
+		Platform_Type,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"PlatformR",
 		FRU_C,
 		2,
@@ -9571,6 +9738,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"StatusMap2",
+		FRU_X,
+		0,
+		2,
+		2,
+		FDTYPE_ByteArray,
+		FDISP_Hex,
+		FRU_Yes,
+		FRU_Yes,
+		0,
+		NULL,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"StatusMap31",
 		FRU_X,
 		0,
@@ -9646,6 +9828,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"Status_Proxy3R",
+		FRU_A,
+		2,
+		7,
+		7,
+		FDTYPE_Record,
+		FDISP_UNDEFINED,
+		FRU_Yes,
+		FRU_Yes,
+		3,
+		Status_Proxy3R,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"StickClock",
 		FRU_X,
 		0,
@@ -10186,6 +10383,21 @@ fru_regdef_t Element_Defs[] = {
 		FRU_NOT_ITERATED,
 		""},
 	{FRU_REVNO,
+		"UUID",
+		FRU_X,
+		0,
+		16,
+		16,
+		FDTYPE_ByteArray,
+		FDISP_UUID,
+		FRU_Yes,
+		FRU_Yes,
+		0,
+		NULL,
+		0,
+		FRU_NOT_ITERATED,
+		""},
+	{FRU_REVNO,
 		"UsageR",
 		FRU_E,
 		1,