Pulled in changes from ekb for the DQ/DQS Attributes.

Change-Id: If69ccd935267078bd37ef3568285d7b534b2a48b
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16990
Tested-by: Jenkins Server
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 118 insertions, 31 deletions

diff --git a/src/include/usr/hwpf/hwp/mvpd_accessors/getDQAttrISDIMM.H b/src/include/usr/hwpf/hwp/mvpd_accessors/getDQAttrISDIMM.H
new file mode 100644
index 000000000..92ac0e59d
--- /dev/null
+++ b/src/include/usr/hwpf/hwp/mvpd_accessors/getDQAttrISDIMM.H
@@ -0,0 +1,58 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/hwpf/hwp/mvpd_accessors/getDQAttrISDIMM.H $   */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+// $ID: getDQAttrISDIMM.H, v 1.1 2014/9/25 04:38:00 eliner Exp $
+/*
+ * @file getDQAttrISDIMM.H
+ *
+ * @brief MBvpd accessor for the ATTR_VPD_ISDIMMTOC4DQ attribute
+ */
+
+#ifndef _HWP_MVPDGETDQATTRISDIMM_
+#define _HWP_MVPDGETDQATTRISDIMM_
+
+typedef fapi::ReturnCode (*getDQAttrISDIMM_FP_t)
+     (const fapi::Target &,
+      uint8_t (&)[4][80]);
+
+extern "C"
+{
+
+/*
+ * @brief MBvpd accessor for the ATTR_VPD_ISDIMMTOC4DQ attribute
+ *
+ * Access the compressed DQ data in the MBvpd record SPDX, keyword Q1-Q9
+ *
+ * @param[in] i_mbTarget    - Reference to mb Target
+ * @param[out] o_val[4][80] - Decoded Q data
+ *
+ * @return fapi::ReturnCode FAPI_RC_SUCCESS if success, else error code
+ */
+
+fapi::ReturnCode getDQAttrISDIMM(
+                const fapi::Target &i_mbTarget,
+                uint8_t (&o_val)[4][80]);
+
+}
+#endif
diff --git a/src/include/usr/hwpf/hwp/mvpd_accessors/getDQSAttrISDIMM.H b/src/include/usr/hwpf/hwp/mvpd_accessors/getDQSAttrISDIMM.H
new file mode 100644
index 000000000..593e669fd
--- /dev/null
+++ b/src/include/usr/hwpf/hwp/mvpd_accessors/getDQSAttrISDIMM.H
@@ -0,0 +1,57 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/hwpf/hwp/mvpd_accessors/getDQSAttrISDIMM.H $  */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+// $ID: getDQSAttrISDIMM.H, v 1.1 2014/9/25 04:38:00 eliner Exp $
+/*
+ * @file getDQSAttrISDIMM.H
+ *
+ * @brief MBvpd accessor for the ATTR_VPD_ISDIMMTOC4DQS attribute
+ */
+
+#ifndef _HWP_MVPDGETDQSATTRISDIMM_
+#define _HWP_MVPDGETDQSATTRISDIMM_
+
+typedef fapi::ReturnCode (*getDQSAttrISDIMM_FP_t)
+     (const fapi::Target &,
+      uint8_t (&)[4][20]);
+
+extern "C"
+{
+/*
+ * @brief MBvpd accessor for the ATTR_VPD_ISDIMMTOC4DQS attribute
+ *
+ * Access the compressed DQS data in the MBvpd record, SPDX, keyword K1-K9
+ *
+ * @param[in] i_mbTarget    - Reference to mb Target
+ * @param[out] o_val[4][20] - Decoded K data
+ *
+ * @return fapi::ReturnCode FAPI_RC_SUCCESS if success, else error code
+ */
+
+fapi::ReturnCode getDQSAttrISDIMM(
+                const fapi::Target &i_mbTarget,
+                uint8_t (&o_val)[4][20]);
+}
+
+#endif
diff --git a/src/include/usr/hwpf/hwp/mvpd_accessors/getISDIMMTOC4DAttrs.H b/src/include/usr/hwpf/hwp/mvpd_accessors/getISDIMMTOC4DAttrs.H
index 422eedb79..83bdd9db0 100644
--- a/src/include/usr/hwpf/hwp/mvpd_accessors/getISDIMMTOC4DAttrs.H
+++ b/src/include/usr/hwpf/hwp/mvpd_accessors/getISDIMMTOC4DAttrs.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -51,35 +51,6 @@ const uint32_t DQ_KEYWORD_SIZE = 96;
 fapi::ReturnCode getDQAttribute(const fapi::Target &i_mbTarget,
            uint32_t i_whichCopy, uint8_t (&o_DQKeyword)[DQ_KEYWORD_SIZE]);
 
-/*
- * @brief MBvpd accessor for the ATTR_VPD_ISDIMMTOC4DQ attribute
- *
- * Access the compressed DQ data in the MBvpd record SPDX, keyword Q1-Q9
- *
- * @param[in] i_mbTarget    - Reference to mb Target
- * @param[out] o_val[4][80] - Decoded Q data
- *
- * @return fapi::ReturnCode FAPI_RC_SUCCESS if success, else error code
- */
-
-fapi::ReturnCode getDQAttrISDIMM(
-                const fapi::Target &i_mbTarget,
-                uint8_t (&o_val)[4][80]);
-
-/*
- * @brief MBvpd accessor for the ATTR_VPD_ISDIMMTOC4DQS attribute
- *
- * Access the compressed DQS data in the MBvpd record, SPDX, keyword K1-K9
- *
- * @param[in] i_mbTarget    - Reference to mb Target
- * @param[out] o_val[4][20] - Decoded K data
- *
- * @return fapi::ReturnCode FAPI_RC_SUCCESS if success, else error code
- */
-
-fapi::ReturnCode getDQSAttrISDIMM(
-                const fapi::Target &i_mbTarget,
-                uint8_t (&o_val)[4][20]);
 }
 #endif
 
diff --git a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
index e08b79629..61f44f9f6 100644
--- a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
+++ b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
@@ -55,7 +55,8 @@
 #include <hwpf/hwp/mvpd_accessors/getMBvpdSensorMap.H>
 #include <hwpf/hwp/mvpd_accessors/getControlCapableData.H>
 #include <hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.H>
-#include <hwpf/hwp/mvpd_accessors/getISDIMMTOC4DAttrs.H>
+#include <hwpf/hwp/mvpd_accessors/getDQAttrISDIMM.H>
+#include <hwpf/hwp/mvpd_accessors/getDQSAttrISDIMM.H>
 #include <hwpf/hwp/mvpd_accessors/getMBvpdAttr.H>
 #include <hwpf/hwp/spd_accessors/getSpdAttrAccessor.H>
 #include <hwpf/hwp/pll_accessors/getPllRingInfoAttr.H>