Connect get_lid_list interface function in UtilLidMgr

Change-Id: I415b85fd3bf5b1aa4f9caeca5d689e54bcbb1b86 CQ:SW393002 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42315 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Matt Derksen <mderkse1@us.ibm.com> Reviewed-by: Martin Gloff <mgloff@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
open-power · Jun 23, 2017 · 17f308c · 17f308c
1 parent 3dfe06e
commit 17f308c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/usr/htmgt/runtime/rt_occ.C b/src/usr/htmgt/runtime/rt_occ.C
@@ -150,7 +150,6 @@ namespace HTMGT
         registerOcc()
         {
             runtimeInterfaces_t * rt_intf = getRuntimeInterfaces();
-            rt_intf->get_lid_list = &UtilLidMgr::getLidList;
             rt_intf->process_occ_error  = &process_occ_error;
             rt_intf->process_occ_reset  = &process_occ_reset;
             rt_intf->enable_occ_actuation  = &enable_occ_actuation;

diff --git a/src/usr/util/runtime/utillidmgr_rt.C b/src/usr/util/runtime/utillidmgr_rt.C
@@ -251,9 +251,24 @@ const uint32_t * UtilLidMgr::getLidList(size_t * o_num)
 {
         static uint32_t lidlist[] =
         {
-            Util::OCC_LIDID
-                // add SLW lids if ever needed
+            Util::OCC_LIDID,
+            Util::WOF_LIDID,
+            Util::NIMBUS_HCODE_LIDID
         };
         *o_num = sizeof(lidlist)/sizeof(lidlist[0]);
         return lidlist;
 }
+
+
+//------------------------------------------------------------------------
+
+struct registerLidMgr
+{
+    registerLidMgr()
+    {
+        runtimeInterfaces_t * rt_intf = getRuntimeInterfaces();
+        rt_intf->get_lid_list = &UtilLidMgr::getLidList;
+    }
+};
+
+registerLidMgr g_registerLidMgr;