Refresh with version strings and move two attributes to match ekb

Change-Id: I2e34cbed1f940195e2c4ba00e88a5237939e4e6f
RTC: 72937
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5789
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

6 files changed, 64 insertions, 55 deletions

diff --git a/src/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.C b/src/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.C
index 439f21ce0..fd66af567 100644
--- a/src/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.C
+++ b/src/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.C
@@ -20,6 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+// $Id: dimmBadDqBitmapAccessHwp.C,v 1.3 2013/08/13 20:29:15 mjjones Exp $
 /**
  *  @file dimmBadDqBitmapAccessHwp.C
  *
diff --git a/src/usr/hwpf/hwp/dimmBadDqBitmapFuncs.C b/src/usr/hwpf/hwp/dimmBadDqBitmapFuncs.C
index 67a4f5640..fe93683f8 100644
--- a/src/usr/hwpf/hwp/dimmBadDqBitmapFuncs.C
+++ b/src/usr/hwpf/hwp/dimmBadDqBitmapFuncs.C
@@ -20,6 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+// $Id: dimmBadDqBitmapFuncs.C,v 1.4 2013/08/13 20:32:55 mjjones Exp $
 /**
  *  @file dimmBadDqBitmapFuncs.C
  *
@@ -31,12 +32,17 @@
  * Flag     Defect/Feature  User        Date        Description
  * ------   --------------  ----------  ----------- ----------------------------
  *                          mjjones     02/17/2012  Created.
+ *                          farrugia    07/09/2012  Added dimmBadDqBitmapAccessHwp.H
+ *                                                  since FAPI_HWP_EXEC may need the
+ *                                      typedefs function pointer when
+ *                                                  running with some PLATs (ie Cronus)
  *                          dedahle     06/20/2013  dimmGetBadDqBitmap/
  *                                                  dimmSetBadDqBitmap funcs
  *                                                  get/set ATTR_BAD_DQ_BITMAP
  */
 
 #include <dimmBadDqBitmapFuncs.H>
+#include <dimmBadDqBitmapAccessHwp.H>
 #include <string.h>
 
 extern "C"
diff --git a/src/usr/hwpf/hwp/dimm_attributes.xml b/src/usr/hwpf/hwp/dimm_attributes.xml
index 459d1637b..e066c0e20 100644
--- a/src/usr/hwpf/hwp/dimm_attributes.xml
+++ b/src/usr/hwpf/hwp/dimm_attributes.xml
@@ -21,6 +21,7 @@
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
 <!-- XML file specifying DIMM attributes used by HW Procedures. -->
+<!-- $Id: dimm_attributes.xml,v 1.3 2013/08/13 20:26:21 mjjones Exp $ -->
 <attributes>
 
 <attribute>
@@ -56,4 +57,58 @@
     <platInit/>
 </attribute>
 
+<attribute>
+    <id>ATTR_BAD_DQ_BITMAP</id>
+    <targetType>TARGET_TYPE_DIMM</targetType>
+    <description>
+        Bad DQ bitmap from a Centaur:MBA point of view.
+        The data is a 10 byte bitmap for each of 4 possible ranks.
+        The bad DQ data is stored in DIMM SPD, it is stored in a special format
+        and is translated to a DIMM Connector point of view for IS-DIMMs.
+        All of these details are hidden from the user of this attribute.
+    </description>
+    <valueType>uint8</valueType>
+    <array>4 10</array>
+    <platInit/>
+    <writeable/>
+</attribute>
+
+<attribute>
+    <id>ATTR_VPD_DIMM_SPARE</id>
+    <targetType>TARGET_TYPE_DIMM</targetType>
+    <description>
+        Spare DRAM availability for each rank on the DIMM.
+        There are 8 DQ lines to spare DRAMs.
+        - NO_SPARE: No spare DRAMs
+        - LOW_NIBBLE:  x4 DRAMs in use, one spare DRAM connected to SP_DQ0-3
+        - HIGH_NIBBLE: x4 DRAMs in use, one spare DRAM connected to SP_DQ4-7
+        - FULL_BYTE: Either
+          1/ x4 DRAMs in use, two spare DRAMs connected to SP_DQ0-7
+          2/ x8 DRAMs in use, one spare DRAM connected to SP_DQ0-7
+        For C-DIMMs, this is in a VPD field : Record:VSPD, Keyword:AM
+        For IS-DIMMs, the platform should return 0 indicating
+          no spares for any rank.
+        The top 2 bits are for rank 0 e.g:
+          if (((val AND 0xc0) >> 6) ==
+                ENUM_ATTR_VPD_DIMM_SPARE_LOW_NIBBLE) {...}
+        The next 2 bits are for rank 1 e.g:
+          if (((val AND 0x30) >> 4) ==
+                ENUM_ATTR_VPD_DIMM_SPARE_NO_SPARE) {...}
+        The next 2 bits are for rank 2 e.g:
+          if (((val AND 0x0c) >> 2) ==
+                ENUM_ATTR_VPD_DIMM_SPARE_HIGH_NIBBLE) {...}
+        The bottom 2 bits are for rank 3 e.g:
+          if ((val AND 0x03) ==
+               ENUM_ATTR_VPD_DIMM_SPARE_FULL_BYTE) {...}
+    </description>
+    <valueType>uint8</valueType>
+    <enum>
+        NO_SPARE = 0x00,
+        LOW_NIBBLE = 0x01,
+        HIGH_NIBBLE = 0x02,
+        FULL_BYTE = 0x03
+    </enum>
+    <platInit/>
+</attribute>
+
 </attributes>
diff --git a/src/usr/hwpf/hwp/dimm_spd_attributes.xml b/src/usr/hwpf/hwp/dimm_spd_attributes.xml
index 38d50c5f6..3e415a218 100644
--- a/src/usr/hwpf/hwp/dimm_spd_attributes.xml
+++ b/src/usr/hwpf/hwp/dimm_spd_attributes.xml
@@ -1299,59 +1299,4 @@ file
 </attribute>
 -->
 
-
-<attribute>
-    <id>ATTR_BAD_DQ_BITMAP</id>
-    <targetType>TARGET_TYPE_DIMM</targetType>
-    <description>
-        Bad DQ bitmap from a Centaur:MBA point of view.
-        The data is a 10 byte bitmap for each of 4 possible ranks.
-        The bad DQ data is stored in DIMM SPD, it is stored in a special format
-        and is translated to a DIMM Connector point of view for IS-DIMMs.
-        All of these details are hidden from the user of this attribute.
-    </description>
-    <valueType>uint8</valueType>
-    <array>4 10</array>
-    <platInit/>
-    <writeable/>
-</attribute>
-
-<attribute>
-    <id>ATTR_VPD_DIMM_SPARE</id>
-    <targetType>TARGET_TYPE_DIMM</targetType>
-    <description>
-        Spare DRAM availability for each rank on the DIMM.
-        There are 8 DQ lines to spare DRAMs.
-        - NO_SPARE: No spare DRAMs
-        - LOW_NIBBLE:  x4 DRAMs in use, one spare DRAM connected to SP_DQ0-3
-        - HIGH_NIBBLE: x4 DRAMs in use, one spare DRAM connected to SP_DQ4-7
-        - FULL_BYTE: Either
-          1/ x4 DRAMs in use, two spare DRAMs connected to SP_DQ0-7
-          2/ x8 DRAMs in use, one spare DRAM connected to SP_DQ0-7
-        For C-DIMMs, this is in a VPD field : Record:VSPD, Keyword:AM
-        For IS-DIMMs, the platform should return 0 indicating
-          no spares for any rank.
-        The top 2 bits are for rank 0 e.g:
-          if (((val AND 0xc0) >> 6) ==
-                ENUM_ATTR_VPD_DIMM_SPARE_LOW_NIBBLE) {...}
-        The next 2 bits are for rank 1 e.g:
-          if (((val AND 0x30) >> 4) ==
-                ENUM_ATTR_VPD_DIMM_SPARE_NO_SPARE) {...}
-        The next 2 bits are for rank 2 e.g:
-          if (((val AND 0x0c) >> 2) ==
-                ENUM_ATTR_VPD_DIMM_SPARE_HIGH_NIBBLE) {...}
-        The bottom 2 bits are for rank 3 e.g:
-          if ((val AND 0x03) ==
-               ENUM_ATTR_VPD_DIMM_SPARE_FULL_BYTE) {...}
-    </description>
-    <valueType>uint8</valueType>
-    <enum>
-        NO_SPARE = 0x00,
-        LOW_NIBBLE = 0x01,
-        HIGH_NIBBLE = 0x02,
-        FULL_BYTE = 0x03
-    </enum>
-    <platInit/>
-</attribute>
-
 </attributes>
diff --git a/src/usr/hwpf/hwp/fapiTestHwpDq.C b/src/usr/hwpf/hwp/fapiTestHwpDq.C
index 6fadbe27d..e3bf1b97e 100644
--- a/src/usr/hwpf/hwp/fapiTestHwpDq.C
+++ b/src/usr/hwpf/hwp/fapiTestHwpDq.C
@@ -20,6 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+// $Id: fapiTestHwpDq.C,v 1.3 2013/08/13 20:37:24 mjjones Exp $
 /**
  *  @file fapiTestHwpDq.C
  *
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C
index 665a9e76c..14f3f3187 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.C
@@ -20,6 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+// $Id: getMBvpdSpareDramData.C,v 1.1 2013/08/13 20:35:13 mjjones Exp $
 #include  <stdint.h>
 
 //  fapi support