diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2014-01-21 17:40:48 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-11 15:30:19 -0600 |
| commit | 18bdf83d7705bd3c519b195ce095e39181214435 (patch) | |
| tree | 5fac3905de3c887a375766446fc3935376516ed8 /src/usr/testcore/rtloader | |
| parent | a8796c565730ff18859ee037ae517afbfabd0d34 (diff) | |
| download | blackbird-hostboot-18bdf83d7705bd3c519b195ce095e39181214435.tar.gz blackbird-hostboot-18bdf83d7705bd3c519b195ce095e39181214435.zip | |
HBRT: Defer indirect scoms to Sapphire.
Change-Id: I252016d0bfe3fea15deba5968d0d8a6ff044cb22
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8213
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')
| -rw-r--r-- | src/usr/testcore/rtloader/loader.H | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/usr/testcore/rtloader/loader.H b/src/usr/testcore/rtloader/loader.H index eacb2b2af..a47a53664 100644 --- a/src/usr/testcore/rtloader/loader.H +++ b/src/usr/testcore/rtloader/loader.H @@ -108,7 +108,6 @@ class RuntimeLoaderTest : public CxxTest::TestSuite intf->malloc = malloc; intf->free = free; intf->realloc = realloc; - intf->sleep = nanosleep; intf->assert = rt_assert; intf->sendErrorLog = rt_logErr; intf->scom_read = rt_scom_read; @@ -179,8 +178,8 @@ class RuntimeLoaderTest : public CxxTest::TestSuite assert(false); } - static int rt_scom_read(uint32_t chipid, - uint32_t addr, + static int rt_scom_read(uint64_t chipid, + uint64_t addr, void* data) { int rc = 0; @@ -207,8 +206,8 @@ class RuntimeLoaderTest : public CxxTest::TestSuite return rc; } - static int rt_scom_write(uint32_t chipid, - uint32_t addr, + static int rt_scom_write(uint64_t chipid, + uint64_t addr, void* data) { int rc = 0; @@ -226,7 +225,7 @@ class RuntimeLoaderTest : public CxxTest::TestSuite return rc; } - typedef std::pair<uint32_t,uint32_t> SCOM_KEY; + typedef std::pair<uint64_t,uint64_t> SCOM_KEY; typedef std::map<SCOM_KEY,uint64_t> SCOM_MAP; static SCOM_MAP cv_scomMap; |
