PRD: use new addClockCallout interface in hostboot

Change-Id: I67c3815122810597f891762ad01eef43819bc926
RTC: 91939
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8238
Tested-by: Jenkins Server
Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8336

1 files changed, 15 insertions, 32 deletions

diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C
index c86c929b8..7363c40ae 100755
--- a/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C
@@ -56,41 +56,24 @@ int32_t ClockResolution::Resolve(STEP_CODE_DATA_STRUCT & serviceData)
             PlatServices::getClockId(iv_ptargetClock, oscType);
 
         // Callout this chip if nothing else.
-        // FIXME - RTC: 91939
-        // will re-write this block of code when
-        // we can get osc targets from targeting again.
-        // In the mean time, we don't want to call out the
-        // chip for this.
         if(NULL == l_ptargetClock)
         {
-            //l_ptargetClock = iv_ptargetClock;
-
-            //in hostboot, getClockId() won't work
-            //so use the chip target and clock type
-            #ifdef __HOSTBOOT_MODULE
-            serviceData.service_data->SetCallout(
-                      PRDcallout(iv_ptargetClock,
-                                 iv_targetType == TYPE_PCI ?
-                                  PRDcalloutData::TYPE_PCICLK :
-                                  PRDcalloutData::TYPE_PROCCLK));
-             #endif
-        }
-        else
-        {
-            // callout the clock source
-            // HB does not have the osc target modeled
-            // so we need to use the proc target with
-            // osc clock type to call out
-            #ifndef __HOSTBOOT_MODULE
-            serviceData.service_data->SetCallout(l_ptargetClock);
-            #else
-            serviceData.service_data->SetCallout(
-                      PRDcallout(l_ptargetClock,
-                                 iv_targetType == TYPE_PCI ?
-                                  PRDcalloutData::TYPE_PCICLK :
-                                  PRDcalloutData::TYPE_PROCCLK));
-             #endif
+            l_ptargetClock = iv_ptargetClock;
         }
+
+        // callout the clock source
+        // HB does not have the osc target modeled
+        // so we need to use the proc target with
+        // osc clock type to call out
+        #ifndef __HOSTBOOT_MODULE
+        serviceData.service_data->SetCallout(l_ptargetClock);
+        #else
+        serviceData.service_data->SetCallout(
+                            PRDcallout(l_ptargetClock,
+                            iv_targetType == TYPE_PCI ?
+                                PRDcalloutData::TYPE_PCICLK :
+                                PRDcalloutData::TYPE_PROCCLK));
+        #endif
     }
     // Get all connected chips for non-CLOCK_CARD types.
     else