Add PB and MK keywords to MVPD

HW team needs to access PB and MK keywords form the CP00 record.
Add to mvpd DD and FAPI.

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

6 files changed, 12 insertions, 2 deletions

diff --git a/src/include/usr/hwpf/fapi/fapiMvpdAccess.H b/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
index 2611a4141..7b3cbe901 100644
--- a/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
+++ b/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
@@ -111,6 +111,8 @@ namespace fapi
         MVPD_KEYWORD_FO  = 0x1d,
         MVPD_KEYWORD_PDI = 0x1e,
         MVPD_KEYWORD_PDG = 0x1f,
+        MVPD_KEYWORD_MK  = 0x20,
+        MVPD_KEYWORD_PB  = 0x21,
     };
 }
 
diff --git a/src/include/usr/mvpd/mvpdenums.H b/src/include/usr/mvpd/mvpdenums.H
index b94001a3d..5f2fa4319 100644
--- a/src/include/usr/mvpd/mvpdenums.H
+++ b/src/include/usr/mvpd/mvpdenums.H
@@ -113,6 +113,8 @@ enum mvpdKeyword
     FO          = 0x1d,
     pdI         = 0x1e,
     pdG         = 0x1f,
+    MK          = 0x20,
+    PB          = 0x21,
 
     // Last Keyword
     MVPD_LAST_KEYWORD,
diff --git a/src/usr/hwpf/plat/fapiPlatMvpdAccess.C b/src/usr/hwpf/plat/fapiPlatMvpdAccess.C
index e7faf46ef..e7230dc49 100644
--- a/src/usr/hwpf/plat/fapiPlatMvpdAccess.C
+++ b/src/usr/hwpf/plat/fapiPlatMvpdAccess.C
@@ -128,7 +128,7 @@ fapi::ReturnCode MvpdKeywordXlate(const fapi::MvpdKeyword i_fapiKeyword,
     // Create a lookup table for converting a FAPI MVPD keyword enumerator to a
     // Hostboot MVPD keyword enumerator. This is a simple array and relies on
     // the FAPI record enumerators starting at zero and incrementing.
-    const uint8_t NUM_MVPD_KEYWORDS = 0x20;
+    const uint8_t NUM_MVPD_KEYWORDS = 0x22;
     static const MVPD::mvpdKeyword
         mvpdFapiKeywordToHbKeyword[NUM_MVPD_KEYWORDS] =
     {
@@ -164,6 +164,8 @@ fapi::ReturnCode MvpdKeywordXlate(const fapi::MvpdKeyword i_fapiKeyword,
         MVPD::FO,
         MVPD::pdI,
         MVPD::pdG,
+        MVPD::MK,
+        MVPD::PB,
     };
     
     fapi::ReturnCode l_rc;
diff --git a/src/usr/mvpd/makefile b/src/usr/mvpd/makefile
index 03d6b8355..48bc81824 100644
--- a/src/usr/mvpd/makefile
+++ b/src/usr/mvpd/makefile
@@ -27,6 +27,6 @@ OBJS = mvpd.o
 
 SUBDIRS = test.d
 
-BINARY_FILES = $(IMGDIR)/procmvpd.dat:034614d95e3ffb7d0802d4edbd8fad60dc15b40d
+BINARY_FILES = $(IMGDIR)/procmvpd.dat:fd9fac85d9132c287f81468045c79f1c98409811
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/mvpd/mvpd.H b/src/usr/mvpd/mvpd.H
index f1b1f5563..958135fbd 100755
--- a/src/usr/mvpd/mvpd.H
+++ b/src/usr/mvpd/mvpd.H
@@ -171,6 +171,8 @@ const mvpdKeywordInfo mvpdKeywords[] =
     { FO,  "FO" },
     { pdI, "#I" },
     { pdG, "#G" },
+    { MK,  "MK" },
+    { PB,  "PB" },
     // -------------------------------------------------------------------
     // DO NOT USE!!  This is for test purposes ONLY!
     { MVPD_TEST_KEYWORD, "TEST" },
diff --git a/src/usr/mvpd/test/mvpdtest.H b/src/usr/mvpd/test/mvpdtest.H
index c130cc15f..4befd407c 100755
--- a/src/usr/mvpd/test/mvpdtest.H
+++ b/src/usr/mvpd/test/mvpdtest.H
@@ -80,6 +80,8 @@ mvpdTestData mvpdData[] =
     { CP00, pdH },
 //    { CP00, pdP }, // TODO - no #P in test data, pull for now RTC 51716
     { CP00, SB },
+    { CP00, MK },
+    { CP00, PB },
 /*                   // TODO no LRP0,LRP1,LRP2,LRP3 in test data, pull for now RTC 51716
     { LRP0, VD },
     { LRP0, pdV },