Remove errors in VPD presence detect for eeprom

RTC:117048
Change-Id: Ie63fb413cb9efb9d1ea450467efa500613939af2
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14494
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 18 insertions, 47 deletions

diff --git a/src/usr/vpd/cvpd.C b/src/usr/vpd/cvpd.C
index 1c4b5fb28..50815f135 100644
--- a/src/usr/vpd/cvpd.C
+++ b/src/usr/vpd/cvpd.C
@@ -37,6 +37,7 @@
 #include <vpd/vpdreasoncodes.H>
 #include <vpd/cvpdenums.H>
 #include <vpd/vpd_if.H>
+#include <i2c/eepromif.H>
 #include <config.h>
 #include "cvpd.H"
 #include "vpd.H"
@@ -191,28 +192,10 @@ namespace CVPD
 //---------------------------------------------------------
 bool VPD::cvpdPresent( TARGETING::Target * i_target )
 {
-#ifdef CONFIG_CVPD_READ_FROM_HW
-    //@todo - Fix this the right way with RTC:117048
-    IpVpdFacade::input_args_t args;
-    args.record = CVPD::VEIR;
-    args.keyword = CVPD::PF ;
-    args.location = VPD::AUTOSELECT;
-    size_t kwlen = 0;
-    errlHndl_t l_errl = Singleton<CvpdFacade>::instance().read(
-                                   i_target,
-                                   NULL,
-                                   kwlen,
-                                   args );
-    if( l_errl )
-    {
-        delete l_errl;
-        return false;
-    }
-    if( kwlen == 0 )
-    {
-        return false;
-    }
-    return true;
+    TRACSSCOMP( g_trac_vpd, ENTER_MRK"cvpdPresent()");
+#if(defined( CONFIG_CVPD_READ_FROM_HW ) && !defined( __HOSTBOOT_RUNTIME) )
+
+    return EEPROM::eepromPresence( i_target );
 
 #else
     return Singleton<CvpdFacade>::instance().hasVpdPresent( i_target,
diff --git a/src/usr/vpd/mvpd.C b/src/usr/vpd/mvpd.C
index 1d794e10e..a1c41be5b 100644
--- a/src/usr/vpd/mvpd.C
+++ b/src/usr/vpd/mvpd.C
@@ -37,6 +37,7 @@
 #include <vpd/vpdreasoncodes.H>
 #include <vpd/mvpdenums.H>
 #include <vpd/vpd_if.H>
+#include <i2c/eepromif.H>
 #include <config.h>
 
 #include "mvpd.H"
@@ -187,29 +188,10 @@ namespace MVPD
 // ---------------------------------------------------------
 bool VPD::mvpdPresent( TARGETING::Target * i_target )
 {
-#ifdef CONFIG_MVPD_READ_FROM_HW
-    //@todo - Fix this the right way with RTC:117048
-    IpVpdFacade::input_args_t args;
-    args.record = MVPD::CP00;
-    args.keyword = MVPD::VD;
-    args.location = VPD::AUTOSELECT;
-    size_t kwlen = 0;
-    errlHndl_t l_errl = Singleton<MvpdFacade>::instance().read(
-                                   i_target,
-                                   NULL,
-                                   kwlen,
-                                   args );
-    if( l_errl )
-    {
-        delete l_errl;
-        return false;
-    }
-    if( kwlen == 0 )
-    {
-        return false;
-    }
-    return true;
+    TRACSSCOMP(g_trac_vpd, ENTER_MRK"mvpdPresent()");
+#if(defined( CONFIG_MVPD_READ_FROM_HW ) && !defined( __HOSTBOOT_RUNTIME) )
 
+    return EEPROM::eepromPresence( i_target );
 #else
     return Singleton<MvpdFacade>::instance().hasVpdPresent( i_target,
                                                             MVPD::CP00,
diff --git a/src/usr/vpd/spd.C b/src/usr/vpd/spd.C
index 18d4ed3ad..0f5c9866b 100644
--- a/src/usr/vpd/spd.C
+++ b/src/usr/vpd/spd.C
@@ -908,12 +908,16 @@ errlHndl_t spdWriteValue ( VPD::vpdKeyword i_keyword,
 // ------------------------------------------------------------------
 bool spdPresent ( TARGETING::Target * i_target )
 {
+
+    TRACSSCOMP( g_trac_spd, ENTER_MRK"spdPresent()" );
+#if(defined( CONFIG_DJVPD_READ_FROM_HW ) && !defined (__HOSTBOOT_RUNTIME ) )
+
+    return EEPROM::eepromPresence( i_target );
+
+#else
     errlHndl_t err = NULL;
     bool pres = false;
 
-    TRACSSCOMP( g_trac_spd,
-                ENTER_MRK"spdPresent()" );
-
     do
     {
         // Read the Basic Memory Type
@@ -938,9 +942,11 @@ bool spdPresent ( TARGETING::Target * i_target )
         {
             pres = true;
         }
+
     } while( 0 );
 
     return pres;
+#endif
 }