diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2011-06-20 12:21:57 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2011-06-21 17:59:56 -0500 |
| commit | 5611dd07de1fa342f487d49f57259639c2b0529a (patch) | |
| tree | 163d0c0f88ce2238ebe9af5c34940b2e5bcef9da /src/usr/xscom | |
| parent | 91c0fe55a63a9d420e851534354f1058a9189743 (diff) | |
| download | talos-hostboot-5611dd07de1fa342f487d49f57259639c2b0529a.tar.gz talos-hostboot-5611dd07de1fa342f487d49f57259639c2b0529a.zip | |
Migrate device framework to use targeting.
Change-Id: I1ae855406e3061f10505eeccbcb2766a15581189
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/153
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Diffstat (limited to 'src/usr/xscom')
| -rw-r--r-- | src/usr/xscom/test/xscomtest.H | 4 | ||||
| -rw-r--r-- | src/usr/xscom/xscom.C | 6 | ||||
| -rw-r--r-- | src/usr/xscom/xscom.H | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/usr/xscom/test/xscomtest.H b/src/usr/xscom/test/xscomtest.H index 4351487e9..4627344b3 100644 --- a/src/usr/xscom/test/xscomtest.H +++ b/src/usr/xscom/test/xscomtest.H @@ -13,6 +13,8 @@ #include <errl/errltypes.H> #include <devicefw/userif.H> +using namespace TARGETING; + // Address and data to read/write struct testXscomAddrData { @@ -45,7 +47,7 @@ public: //@todo - Replace printk with traces - DeviceFW::TargetHandle_t l_testTarget = 0; //@todo - Fix this + TARGETING::Target* l_testTarget = MASTER_PROCESSOR_CHIP_TARGET_SENTINEL; size_t l_size = sizeof(uint64_t); // Loop thru table diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C index b07eb5747..c69a389c3 100644 --- a/src/usr/xscom/xscom.C +++ b/src/usr/xscom/xscom.C @@ -28,7 +28,7 @@ namespace XSCOM // Register XSCcom access functions to DD framework DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, DeviceFW::XSCOM, - DeviceFW::PROCESSOR, + TARGETING::TYPE_PROC, xscomPerformOp); /** @@ -114,7 +114,7 @@ bool XSComRetry(const HMER i_hmer) * @return errlHndl_t */ errlHndl_t xscomOpSanityCheck(const DeviceFW::OperationType i_opType, - const DeviceFW::TargetHandle_t i_target, + const TARGETING::Target* i_target, const void* i_buffer, const size_t& i_buflen, const va_list i_args) @@ -172,7 +172,7 @@ errlHndl_t xscomOpSanityCheck(const DeviceFW::OperationType i_opType, /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType, - DeviceFW::TargetHandle_t i_target, + TARGETING::Target* i_target, void* io_buffer, size_t& io_buflen, int64_t i_accessType, diff --git a/src/usr/xscom/xscom.H b/src/usr/xscom/xscom.H index 613ab2d01..22af50afe 100644 --- a/src/usr/xscom/xscom.H +++ b/src/usr/xscom/xscom.H @@ -47,7 +47,7 @@ namespace XSCOM * @return errlHndl_t */ errlHndl_t xscomPerformOp(DeviceFW::OperationType i_opType, - DeviceFW::TargetHandle_t i_target, + TARGETING::Target* i_target, void* io_buffer, size_t& io_buflen, int64_t i_accessType, |
