diff options
Diffstat (limited to 'src/usr/hwpf')
| -rw-r--r-- | src/usr/hwpf/hwp/occ/occ.C | 6 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/occ/runtime/rt_occ.C | 4 | ||||
| -rw-r--r-- | src/usr/hwpf/test/runtime/rt_occtest.H | 9 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/usr/hwpf/hwp/occ/occ.C b/src/usr/hwpf/hwp/occ/occ.C index ea9d97076..e28a51415 100644 --- a/src/usr/hwpf/hwp/occ/occ.C +++ b/src/usr/hwpf/hwp/occ/occ.C @@ -87,14 +87,14 @@ namespace HBOCC errlHndl_t l_errl = NULL; size_t lidSize = 0; do { - UtilLidMgr lidMgr(OCC_LIDID); + UtilLidMgr lidMgr(Util::OCC_LIDID); l_errl = lidMgr.getLidSize(lidSize); if(l_errl) { TRACFCOMP( g_fapiImpTd, ERR_MRK"loadOCCImageToHomer: Error getting lid size. lidId=0x%.8x", - OCC_LIDID); + Util::OCC_LIDID); break; } @@ -103,7 +103,7 @@ namespace HBOCC { TRACFCOMP( g_fapiImpTd, ERR_MRK"loadOCCImageToHomer: Error getting lid.. lidId=0x%.8x", - OCC_LIDID); + Util::OCC_LIDID); break; } diff --git a/src/usr/hwpf/hwp/occ/runtime/rt_occ.C b/src/usr/hwpf/hwp/occ/runtime/rt_occ.C index d76d403d4..07f63e79f 100644 --- a/src/usr/hwpf/hwp/occ/runtime/rt_occ.C +++ b/src/usr/hwpf/hwp/occ/runtime/rt_occ.C @@ -198,7 +198,7 @@ namespace RT_OCC } // Load HOMER image - UtilLidMgr lidmgr(HBOCC::OCC_LIDID); + UtilLidMgr lidmgr(Util::OCC_LIDID); size_t lidSize = 0; err = lidmgr.getLidSize(lidSize); @@ -216,7 +216,7 @@ namespace RT_OCC TRACFCOMP( g_fapiTd, "OCC lid loaded. ID:%x size:%d", - HBOCC::OCC_LIDID, + Util::OCC_LIDID, lidSize); // Setup Host Data area of HOMER diff --git a/src/usr/hwpf/test/runtime/rt_occtest.H b/src/usr/hwpf/test/runtime/rt_occtest.H index 23d671a54..2ddfd5dbe 100644 --- a/src/usr/hwpf/test/runtime/rt_occtest.H +++ b/src/usr/hwpf/test/runtime/rt_occtest.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2014 */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -30,6 +32,7 @@ #include <targeting/common/commontargeting.H> #include <vmmconst.h> #include <sys/mm.h> +#include <util/utillidmgr.H> class OccTest: public CxxTest::TestSuite { @@ -79,9 +82,9 @@ class OccTest: public CxxTest::TestSuite { TS_FAIL("runtimeInterfaces->get_lid_list empty list"); } - else if (list[0] != HBOCC::OCC_LIDID) + else if (list[0] != Util::OCC_LIDID) { - TS_FAIL("runtimeInterface->get_list_list missing OCCLID"); + TS_FAIL("runtimeInterface->get_lid_list missing OCCLID"); } } |
