Remove unneeded/unused TARGETING type attributes.

    TYPE_SCM
    TYPE_DCM
    TYPE_MEMVRM
    TYPE_PROCVRM
    TYPE_PERVASIVE
    TYPE_MEM_PORT
    TYPE_DMI
    TYPE_TP
    TYPE_POWERBUS

This includes the Story 46851 work as well (TP and POWERBUS)

Change-Id: I6a9ca86ba11eb42b65d530320b02a8ed52836a7c
RTC: 38757
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1939
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 68 insertions, 77 deletions

diff --git a/src/include/usr/errl/errludtarget.H b/src/include/usr/errl/errludtarget.H
index c399c1bd3..3db4b89cb 100644
--- a/src/include/usr/errl/errludtarget.H
+++ b/src/include/usr/errl/errludtarget.H
@@ -1,25 +1,25 @@
-//  IBM_PROLOG_BEGIN_TAG
-//  This is an automatically generated prolog.
-//
-//  $Source: src/include/usr/errl/errludtarget.H $
-//
-//  IBM CONFIDENTIAL
-//
-//  COPYRIGHT International Business Machines Corp. 2012
-//
-//  p1
-//
-//  Object Code Only (OCO) source materials
-//  Licensed Internal Code Source Materials
-//  IBM HostBoot Licensed Internal Code
-//
-//  The source code for this program is not published or other-
-//  wise divested of its trade secrets, irrespective of what has
-//  been deposited with the U.S. Copyright Office.
-//
-//  Origin: 30
-//
-//  IBM_PROLOG_END
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/errl/errludtarget.H $                         */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
 #ifndef ERRL_UDTARGET_H
 #define ERRL_UDTARGET_H
 
@@ -158,36 +158,32 @@ public:
 
                 // TYPE
                 switch (*l_ptr) {
+                    // TODO: RTC 50828: make these build-time dynamic based
+                    //  on values in obj/genfiles/attributeenums.H
                     case 0x00: { attrData = "TYPE_NA"; break; }
                     case 0x01: { attrData = "TYPE_SYS"; break; }
                     case 0x02: { attrData = "TYPE_NODE"; break; }
                     case 0x03: { attrData = "TYPE_DIMM"; break; }
-                    case 0x04: { attrData = "TYPE_SCM"; break; }
-                    case 0x05: { attrData = "TYPE_DCM"; break; }
-                    case 0x06: { attrData = "TYPE_MEMBUF"; break; }
-                    case 0x07: { attrData = "TYPE_PROC"; break; }
-                    case 0x08: { attrData = "TYPE_MEMVRM"; break; }
-                    case 0x09: { attrData = "TYPE_PROCVRM"; break; }
-                    case 0x0A: { attrData = "TYPE_EX"; break; }
-                    case 0x0B: { attrData = "TYPE_CORE"; break; }
-                    case 0x0C: { attrData = "TYPE_L2"; break; }
-                    case 0x0D: { attrData = "TYPE_L3"; break; }
-                    case 0x0E: { attrData = "TYPE_L4"; break; }
-                    case 0x0F: { attrData = "TYPE_MCS"; break; }
-                    case 0x10: { attrData = "TYPE_MBS"; break; }
-                    case 0x11: { attrData = "TYPE_MBA"; break; }
-                    case 0x12: { attrData = "TYPE_MEM_PORT"; break; }
-                    case 0x13: { attrData = "TYPE_PERVASIVE"; break; }
-                    case 0x14: { attrData = "TYPE_POWERBUS"; break; }
-                    case 0x15: { attrData = "TYPE_XBUS"; break; }
-                    case 0x16: { attrData = "TYPE_ABUS"; break; }
-                    case 0x17: { attrData = "TYPE_PCI"; break; }
-                    case 0x18: { attrData = "TYPE_TP"; break; }
-                    case 0x19: { attrData = "TYPE_DMI"; break; }
-                    case 0x1A: { attrData = "TYPE_DPSS"; break; }
-                    case 0x1B: { attrData = "TYPE_APSS"; break; }
-                    case 0x1C: { attrData = "TYPE_OCC"; break; }
-                    case 0x1D: { attrData = "TYPE_LAST_IN_RANGE"; break; }
+                    case 0x04: { attrData = "TYPE_MEMBUF"; break; }
+                    case 0x05: { attrData = "TYPE_PROC"; break; }
+                    case 0x06: { attrData = "TYPE_EX"; break; }
+                    case 0x07: { attrData = "TYPE_CORE"; break; }
+                    case 0x08: { attrData = "TYPE_L2"; break; }
+                    case 0x09: { attrData = "TYPE_L3"; break; }
+                    case 0x0A: { attrData = "TYPE_L4"; break; }
+                    case 0x0B: { attrData = "TYPE_MCS"; break; }
+                    case 0x0C: { attrData = "TYPE_MBS"; break; }
+                    case 0x0D: { attrData = "TYPE_MBA"; break; }
+                    case 0x0E: { attrData = "TYPE_XBUS"; break; }
+                    case 0x0F: { attrData = "TYPE_ABUS"; break; }
+                    case 0x10: { attrData = "TYPE_PCI"; break; }
+                    case 0x11: { attrData = "TYPE_DPSS"; break; }
+                    case 0x12: { attrData = "TYPE_APSS"; break; }
+                    case 0x13: { attrData = "TYPE_OCC"; break; }
+                    case 0x14: { attrData = "TYPE_PSI"; break; }
+                    case 0x15: { attrData = "TYPE_FSP"; break; }
+                    case 0x16: { attrData = "TYPE_PNOR"; break; }
+                    case 0x17: { attrData = "TYPE_LAST_IN_RANGE"; break; }
                     default:   { attrData = "UNKNOWN TYPE"; break; }
                 } // switch
                 i_parser.PrintString("ATTR_TYPE", attrData);
@@ -196,8 +192,10 @@ public:
 
                 // MODEL
                 switch (*l_ptr) {
+                    // TODO: RTC 50828: make these build-time dynamic based
+                    //  on values in obj/genfiles/attributeenums.H
                     case 0x00: { attrData = "MODEL_NA"; break; }
-                    case 0x10: { attrData = "MODEL_SALERNO"; break; }
+                    case 0x10: { attrData = "MODEL_RESERVED"; break; }
                     case 0x11: { attrData = "MODEL_VENICE"; break; }
                     case 0x12: { attrData = "MODEL_MURANO"; break; }
                     case 0x30: { attrData = "MODEL_CENTAUR"; break; }
@@ -239,37 +237,30 @@ public:
                     l_ptr += pathSize * sizeof(uint8_t);
                     for (uint32_t j=0;j<pathSize;j += 2) {
                         switch (lElementInstance[j]) {
+                            // TODO: RTC 50828: make these build-time dynamic based
+                            //  on values in obj/genfiles/attributeenums.H
                             case 0x01: pathString = "/Sys"; break;
                             case 0x02: pathString = "/Node"; break;
                             case 0x03: pathString = "/DIMM"; break;
-                            case 0x04: pathString = "/SCM"; break;
-                            case 0x05: pathString = "/DCM"; break;
-                            case 0x06: pathString = "/Membuf"; break;
-                            case 0x07: pathString = "/Proc"; break;
-                            case 0x08: pathString = "/MemVRM"; break;
-                            case 0x09: pathString = "/ProcVRM"; break;
-                            case 0x0A: pathString = "/EX"; break;
-                            case 0x0B: pathString = "/Core"; break;
-                            case 0x0C: pathString = "/L2"; break;
-                            case 0x0D: pathString = "/L3"; break;
-                            case 0x0E: pathString = "/L4"; break;
-                            case 0x0F: pathString = "/MCS"; break;
-                            case 0x10: pathString = "/MBS"; break;
-                            case 0x11: pathString = "/MBA"; break;
-                            case 0x12: pathString = "/MemPort"; break;
-                            case 0x13: pathString = "/Pervasive"; break;
-                            case 0x14: pathString = "/Powerbus"; break;
-                            case 0x15: pathString = "/XBUS"; break;
-                            case 0x16: pathString = "/ABUS"; break;
-                            case 0x17: pathString = "/PCI"; break;
-                            case 0x18: pathString = "/TP"; break;
-                            case 0x19: pathString = "/DMI"; break;
-                            case 0x1A: pathString = "/DPSS"; break;
-                            case 0x1B: pathString = "/APSS"; break;
-                            case 0x1C: pathString = "/OCC"; break;
-                            //case TYPE_FSI_LINK: pathString = "/FSI-link"; break;
-                            //case TYPE_CFAM: pathString = "/CFAM"; break;
-                            //case TYPE_ENGINE: pathString = "/Engine"; break;
+                            case 0x04: pathString = "/Membuf"; break;
+                            case 0x05: pathString = "/Proc"; break;
+                            case 0x06: pathString = "/EX"; break;
+                            case 0x07: pathString = "/Core"; break;
+                            case 0x08: pathString = "/L2"; break;
+                            case 0x09: pathString = "/L3"; break;
+                            case 0x0A: pathString = "/L4"; break;
+                            case 0x0B: pathString = "/MCS"; break;
+                            case 0x0C: pathString = "/MBS"; break;
+                            case 0x0D: pathString = "/MBA"; break;
+                            case 0x0E: pathString = "/XBUS"; break;
+                            case 0x0F: pathString = "/ABUS"; break;
+                            case 0x10: pathString = "/PCI"; break;
+                            case 0x11: pathString = "/DPSS"; break;
+                            case 0x12: pathString = "/APSS"; break;
+                            case 0x13: pathString = "/OCC"; break;
+                            case 0x14: pathString = "/PSI"; break;
+                            case 0x15: pathString = "/FSP"; break;
+                            case 0x16: pathString = "/PNOR"; break;
                             default: pathString = "/Unknown"; break;
                         } // switch
                         // copy next part in, overwritting previous terminator