moved mvpd record and keyword definition to mvpd_access_defs.H

Change-Id: I9c63c52dde5b626164eb5fcda8ada48a8976728c
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19987
Tested-by: Jenkins Server
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20158
Reviewed-by: Derk Rembold <rembold@de.ibm.com>

2 files changed, 117 insertions, 84 deletions

diff --git a/import/hwpf/fapi2/include/mvpd_access.H b/import/hwpf/fapi2/include/mvpd_access.H
index 8288d8b8..51d7cedb 100644
--- a/import/hwpf/fapi2/include/mvpd_access.H
+++ b/import/hwpf/fapi2/include/mvpd_access.H
@@ -29,88 +29,10 @@
 #include <stdint.h>
 #include <return_code.H>
 #include <target.H>
+#include <mvpd_access_defs.H>
 
 namespace fapi2
 {
-enum MvpdRecord
-{
-    MVPD_RECORD_CRP0 = 0x00,
-    MVPD_RECORD_CP00 = 0x01,
-    MVPD_RECORD_VINI = 0x02,
-    MVPD_RECORD_LRP0 = 0x03,
-    MVPD_RECORD_LRP1 = 0x04,
-    MVPD_RECORD_LRP2 = 0x05,
-    MVPD_RECORD_LRP3 = 0x06,
-    MVPD_RECORD_LRP4 = 0x07,
-    MVPD_RECORD_LRP5 = 0x08,
-    MVPD_RECORD_LRP6 = 0x09,
-    MVPD_RECORD_LRP7 = 0x0a,
-    MVPD_RECORD_LRP8 = 0x0b,
-    MVPD_RECORD_LRP9 = 0x0c,
-    MVPD_RECORD_LRPA = 0x0d,
-    MVPD_RECORD_LRPB = 0x0e,
-    MVPD_RECORD_LRPC = 0x0f,
-    MVPD_RECORD_LRPD = 0x10,
-    MVPD_RECORD_LRPE = 0x11,
-    MVPD_RECORD_LWP0 = 0x12,
-    MVPD_RECORD_LWP1 = 0x13,
-    MVPD_RECORD_LWP2 = 0x14,
-    MVPD_RECORD_LWP3 = 0x15,
-    MVPD_RECORD_LWP4 = 0x16,
-    MVPD_RECORD_LWP5 = 0x17,
-    MVPD_RECORD_LWP6 = 0x18,
-    MVPD_RECORD_LWP7 = 0x19,
-    MVPD_RECORD_LWP8 = 0x1a,
-    MVPD_RECORD_LWP9 = 0x1b,
-    MVPD_RECORD_LWPA = 0x1c,
-    MVPD_RECORD_LWPB = 0x1d,
-    MVPD_RECORD_LWPC = 0x1e,
-    MVPD_RECORD_LWPD = 0x1f,
-    MVPD_RECORD_LWPE = 0x20,
-    MVPD_RECORD_VWML = 0x21,
-    MVPD_RECORD_MER0 = 0x22,
-};
-
-enum MvpdKeyword
-{
-    MVPD_KEYWORD_VD  = 0x00,
-    MVPD_KEYWORD_ED  = 0x01,
-    MVPD_KEYWORD_TE  = 0x02,
-    MVPD_KEYWORD_DD  = 0x03,
-    MVPD_KEYWORD_PDP = 0x04,
-    MVPD_KEYWORD_ST  = 0x05,
-    MVPD_KEYWORD_DN  = 0x06,
-    MVPD_KEYWORD_PG  = 0x07,
-    MVPD_KEYWORD_PK  = 0x08,
-    MVPD_KEYWORD_PDR = 0x09,
-    MVPD_KEYWORD_PDV = 0x0a,
-    MVPD_KEYWORD_PDH = 0x0b,
-    MVPD_KEYWORD_SB  = 0x0c,
-    MVPD_KEYWORD_DR  = 0x0d,
-    MVPD_KEYWORD_VZ  = 0x0e,
-    MVPD_KEYWORD_CC  = 0x0f,
-    MVPD_KEYWORD_CE  = 0x10,
-    MVPD_KEYWORD_FN  = 0x11,
-    MVPD_KEYWORD_PN  = 0x12,
-    MVPD_KEYWORD_SN  = 0x13,
-    MVPD_KEYWORD_PR  = 0x14,
-    MVPD_KEYWORD_HE  = 0x15,
-    MVPD_KEYWORD_CT  = 0x16,
-    MVPD_KEYWORD_HW  = 0x17,
-    MVPD_KEYWORD_PDM = 0x18,
-    MVPD_KEYWORD_IN  = 0x19,
-    MVPD_KEYWORD_PD2 = 0x1a,
-    MVPD_KEYWORD_PD3 = 0x1b,
-    MVPD_KEYWORD_OC  = 0x1c,
-    MVPD_KEYWORD_FO  = 0x1d,
-    MVPD_KEYWORD_PDI = 0x1e,
-    MVPD_KEYWORD_PDG = 0x1f,
-    MVPD_KEYWORD_MK  = 0x20,
-    MVPD_KEYWORD_PB  = 0x21,
-    MVPD_KEYWORD_CH  = 0x22,
-    MVPD_KEYWORD_IQ  = 0x23,
-};
-
 ///
 /// @brief Get Module VPD field.
 ///
@@ -132,9 +54,9 @@ enum MvpdKeyword
 ///
 ReturnCode getMvpdField(const MvpdRecord i_record,
                         const MvpdKeyword i_keyword,
-                        const Target<TARGET_TYPE_PROC_CHIP> &i_target,
-                        uint8_t * const i_pBuffer,
-                        uint32_t &io_fieldSize);
+                        const Target<TARGET_TYPE_PROC_CHIP>& i_target,
+                        uint8_t* const i_pBuffer,
+                        uint32_t& io_fieldSize);
 
 ///
 /// @brief Set Module VPD field.
@@ -151,8 +73,8 @@ ReturnCode getMvpdField(const MvpdRecord i_record,
 ///
 ReturnCode setMvpdField(const MvpdRecord i_record,
                         const MvpdKeyword i_keyword,
-                        const Target<TARGET_TYPE_PROC_CHIP> &i_target,
-                        const uint8_t * const i_pBuffer,
+                        const Target<TARGET_TYPE_PROC_CHIP>& i_target,
+                        const uint8_t* const i_pBuffer,
                         const uint32_t i_fieldSize);
 }
 
diff --git a/import/hwpf/fapi2/include/mvpd_access_defs.H b/import/hwpf/fapi2/include/mvpd_access_defs.H
new file mode 100644
index 00000000..0e0a5ee3
--- /dev/null
+++ b/import/hwpf/fapi2/include/mvpd_access_defs.H
@@ -0,0 +1,111 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: hwpf/fapi2/include/mvpd_access_defs.H $                       */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* EKB Project                                                            */
+/*                                                                        */
+/* COPYRIGHT 2015                                                         */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* 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.                              */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+///
+/// @file mvpd_access_defs.H
+///
+/// @brief Defines the Module VPD Records and Keywords
+///
+
+#ifndef _FAPI2_MVPDACCESS_DEFS_H_
+#define _FAPI2_MVPDACCESS_DEFS_H_
+
+namespace fapi2
+{
+enum MvpdRecord
+{
+    MVPD_RECORD_CRP0 = 0x00,
+    MVPD_RECORD_CP00 = 0x01,
+    MVPD_RECORD_VINI = 0x02,
+    MVPD_RECORD_LRP0 = 0x03,
+    MVPD_RECORD_LRP1 = 0x04,
+    MVPD_RECORD_LRP2 = 0x05,
+    MVPD_RECORD_LRP3 = 0x06,
+    MVPD_RECORD_LRP4 = 0x07,
+    MVPD_RECORD_LRP5 = 0x08,
+    MVPD_RECORD_LRP6 = 0x09,
+    MVPD_RECORD_LRP7 = 0x0a,
+    MVPD_RECORD_LRP8 = 0x0b,
+    MVPD_RECORD_LRP9 = 0x0c,
+    MVPD_RECORD_LRPA = 0x0d,
+    MVPD_RECORD_LRPB = 0x0e,
+    MVPD_RECORD_LRPC = 0x0f,
+    MVPD_RECORD_LRPD = 0x10,
+    MVPD_RECORD_LRPE = 0x11,
+    MVPD_RECORD_LWP0 = 0x12,
+    MVPD_RECORD_LWP1 = 0x13,
+    MVPD_RECORD_LWP2 = 0x14,
+    MVPD_RECORD_LWP3 = 0x15,
+    MVPD_RECORD_LWP4 = 0x16,
+    MVPD_RECORD_LWP5 = 0x17,
+    MVPD_RECORD_LWP6 = 0x18,
+    MVPD_RECORD_LWP7 = 0x19,
+    MVPD_RECORD_LWP8 = 0x1a,
+    MVPD_RECORD_LWP9 = 0x1b,
+    MVPD_RECORD_LWPA = 0x1c,
+    MVPD_RECORD_LWPB = 0x1d,
+    MVPD_RECORD_LWPC = 0x1e,
+    MVPD_RECORD_LWPD = 0x1f,
+    MVPD_RECORD_LWPE = 0x20,
+    MVPD_RECORD_VWML = 0x21,
+    MVPD_RECORD_MER0 = 0x22,
+};
+
+enum MvpdKeyword
+{
+    MVPD_KEYWORD_VD  = 0x00,
+    MVPD_KEYWORD_ED  = 0x01,
+    MVPD_KEYWORD_TE  = 0x02,
+    MVPD_KEYWORD_DD  = 0x03,
+    MVPD_KEYWORD_PDP = 0x04,
+    MVPD_KEYWORD_ST  = 0x05,
+    MVPD_KEYWORD_DN  = 0x06,
+    MVPD_KEYWORD_PG  = 0x07,
+    MVPD_KEYWORD_PK  = 0x08,
+    MVPD_KEYWORD_PDR = 0x09,
+    MVPD_KEYWORD_PDV = 0x0a,
+    MVPD_KEYWORD_PDH = 0x0b,
+    MVPD_KEYWORD_SB  = 0x0c,
+    MVPD_KEYWORD_DR  = 0x0d,
+    MVPD_KEYWORD_VZ  = 0x0e,
+    MVPD_KEYWORD_CC  = 0x0f,
+    MVPD_KEYWORD_CE  = 0x10,
+    MVPD_KEYWORD_FN  = 0x11,
+    MVPD_KEYWORD_PN  = 0x12,
+    MVPD_KEYWORD_SN  = 0x13,
+    MVPD_KEYWORD_PR  = 0x14,
+    MVPD_KEYWORD_HE  = 0x15,
+    MVPD_KEYWORD_CT  = 0x16,
+    MVPD_KEYWORD_HW  = 0x17,
+    MVPD_KEYWORD_PDM = 0x18,
+    MVPD_KEYWORD_IN  = 0x19,
+    MVPD_KEYWORD_PD2 = 0x1a,
+    MVPD_KEYWORD_PD3 = 0x1b,
+    MVPD_KEYWORD_OC  = 0x1c,
+    MVPD_KEYWORD_FO  = 0x1d,
+    MVPD_KEYWORD_PDI = 0x1e,
+    MVPD_KEYWORD_PDG = 0x1f,
+    MVPD_KEYWORD_MK  = 0x20,
+    MVPD_KEYWORD_PB  = 0x21,
+    MVPD_KEYWORD_CH  = 0x22,
+    MVPD_KEYWORD_IQ  = 0x23,
+};
+}
+
+#endif