diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2014-01-17 15:29:40 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-06 17:39:51 -0600 |
| commit | 6155c62ab8eae064a0160bf8c042953637113d66 (patch) | |
| tree | 51e52b7b20e92ed317fc939b9ebae596f7e80c58 /src/usr/testcore/rtloader/loader.H | |
| parent | 468b248f8998376a38c7cbfe14a8568f3245bea6 (diff) | |
| download | talos-hostboot-6155c62ab8eae064a0160bf8c042953637113d66.tar.gz talos-hostboot-6155c62ab8eae064a0160bf8c042953637113d66.zip | |
HBRT: Add version to interface struct.
Change-Id: Ifd02f285b97f6177e3ff8ed8d62f47fada28ab8b
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8144
Tested-by: Jenkins Server
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/testcore/rtloader/loader.H')
| -rw-r--r-- | src/usr/testcore/rtloader/loader.H | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/usr/testcore/rtloader/loader.H b/src/usr/testcore/rtloader/loader.H index 03e8e5f39..c2935d769 100644 --- a/src/usr/testcore/rtloader/loader.H +++ b/src/usr/testcore/rtloader/loader.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013 */ +/* COPYRIGHT International Business Machines Corp. 2013,2014 */ /* */ /* p1 */ /* */ @@ -101,6 +101,7 @@ class RuntimeLoaderTest : public CxxTest::TestSuite do { hostInterfaces_t* intf = new hostInterfaces_t(); + intf->interfaceVersion = HOSTBOOT_RUNTIME_INTERFACE_VERSION; intf->puts = rt_puts; intf->set_page_execute = rt_setPageExecute; intf->malloc = malloc; @@ -113,7 +114,7 @@ class RuntimeLoaderTest : public CxxTest::TestSuite intf->scom_write = rt_scom_write; intf->lid_load = rt_lid_load; intf->lid_unload = rt_lid_unload; - intf->get_vpd_image_addr = rt_get_vpd; + intf->get_reserved_mem = rt_get_reserved_mem; // Call init. runtimeInterfaces_t* rtInterface = @@ -298,6 +299,14 @@ class RuntimeLoaderTest : public CxxTest::TestSuite return 0; } + //-------------------------------------------------------------------- + static uint64_t rt_get_reserved_mem(const char* i_region) + { + if (0 == strcmp(i_region, "ibm,hbrt-vpd-image")) + return rt_get_vpd(); + else + return 0; + } //-------------------------------------------------------------------- static uint64_t rt_get_vpd() @@ -324,7 +333,7 @@ class RuntimeLoaderTest : public CxxTest::TestSuite assert(vptr != NULL,"rt_get_vpd. Could not map VPD memory"); - // Store the address in a class variable so we only + // Store the address in a class variable so we only // need to load vpd once. cv_vpd_addr = reinterpret_cast<uint64_t>(vptr); } |
