diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2012-02-13 06:46:43 -0500 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-02-13 06:46:43 -0500 |
commit | abc212461b865a47437a8dbf532b497ea4562137 (patch) | |
tree | 1d0163d952b7ff3b6ee3bcbf5b3fa84d60f4536e /src/dev/copy_engine.cc | |
parent | 63777fb23f043012ba052fc9c5968da7bdd59221 (diff) | |
download | gem5-abc212461b865a47437a8dbf532b497ea4562137.tar.xz |
MEM: Explicit ports and Python binding on CopyEngine
The copy-engine ports were previously created implicitly and bound
based on the dma port peer rather than relying on the normal Python
binding (connectPorts) being called explicitly. This patch makes the
copy engine port similar to all other ports in that they are visibly
in the Python class and bound using the normal explicit calls through
Python.
Diffstat (limited to 'src/dev/copy_engine.cc')
-rw-r--r-- | src/dev/copy_engine.cc | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/src/dev/copy_engine.cc b/src/dev/copy_engine.cc index 33994cfde..a3958127b 100644 --- a/src/dev/copy_engine.cc +++ b/src/dev/copy_engine.cc @@ -1,4 +1,16 @@ /* + * Copyright (c) 2012 ARM Limited + * All rights reserved + * + * The license below extends only to copyright in the software and shall + * not be construed as granting a license to any other intellectual + * property including but not limited to intellectual property relating + * to a hardware implementation of the functionality of the software + * licensed hereunder. You may use the software subject to the license + * terms below provided that you ensure that this notice is replicated + * unmodified and in its entirety in all distributions of the software, + * modified or unmodified, in source code or in binary form. + * * Copyright (c) 2008 The Regents of The University of Michigan * All rights reserved. * @@ -65,7 +77,7 @@ CopyEngine::CopyEngine(const Params *p) CopyEngine::CopyEngineChannel::CopyEngineChannel(CopyEngine *_ce, int cid) - : ce(_ce), channelId(cid), busy(false), underReset(false), + : cePort(NULL), ce(_ce), channelId(cid), busy(false), underReset(false), refreshNext(false), latBeforeBegin(ce->params()->latBeforeBegin), latAfterCompletion(ce->params()->latAfterCompletion), completionDataReg(0), nextState(Idle), drainEvent(NULL), @@ -97,24 +109,24 @@ CopyEngine::CopyEngineChannel::~CopyEngineChannel() delete cePort; } -void -CopyEngine::init() +Port * +CopyEngine::getPort(const std::string &if_name, int idx) { - PciDev::init(); - for (int x = 0; x < chan.size(); x++) - chan[x]->init(); + if (if_name == "dma") { + if (idx < chan.size()) + return chan[idx]->getPort(); + } + return PciDev::getPort(if_name, idx); } -void -CopyEngine::CopyEngineChannel::init() -{ - Port *peer; +Port * +CopyEngine::CopyEngineChannel::getPort() +{ + assert(cePort == NULL); cePort = new DmaPort(ce, ce->sys, ce->params()->min_backoff_delay, - ce->params()->max_backoff_delay); - peer = ce->dmaPort->getPeer()->getOwner()->getPort(""); - peer->setPeer(cePort); - cePort->setPeer(peer); + ce->params()->max_backoff_delay); + return cePort; } void |