diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-25 10:45:23 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-25 10:45:23 -0400 |
| commit | beed20d7bc31512cc36304bd64876fe4af014641 (patch) | |
| tree | 30e564d58b58641d09bef5eccaae37aa49dc133e /src/mem/bus.hh | |
| parent | 4c92708b48d51bfb6592ff48925f5a7a0157da5b (diff) | |
| download | gem5-beed20d7bc31512cc36304bd64876fe4af014641.tar.xz | |
MEM: Use base class Master/SlavePort pointers in the bus
This patch makes some rather trivial simplifications to the bus in
that it changes the use of BusMasterPort and BusSlavePort pointers to
simply use MasterPort and SlavePort (iterators are also updated
accordingly).
This change is a step towards a future patch that introduces a
separation of the interface and the structural port itself.
Diffstat (limited to 'src/mem/bus.hh')
| -rw-r--r-- | src/mem/bus.hh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mem/bus.hh b/src/mem/bus.hh index 2c05b6025..bf64203bf 100644 --- a/src/mem/bus.hh +++ b/src/mem/bus.hh @@ -218,8 +218,7 @@ class Bus : public MemObject AddrRangeList defaultRange; - typedef std::vector<BusSlavePort*>::iterator SnoopIter; - std::vector<BusSlavePort*> snoopPorts; + std::vector<SlavePort*> snoopPorts; /** * Store the outstanding requests so we can determine which ones @@ -428,8 +427,11 @@ class Bus : public MemObject std::set<Port::PortId> inRecvRangeChange; /** The master and slave ports of the bus */ - std::vector<BusSlavePort*> slavePorts; - std::vector<BusMasterPort*> masterPorts; + std::vector<SlavePort*> slavePorts; + std::vector<MasterPort*> masterPorts; + + typedef std::vector<SlavePort*>::iterator SlavePortIter; + typedef std::vector<SlavePort*>::const_iterator SlavePortConstIter; /** An array of pointers to ports that retry should be called on because the * original send failed for whatever reason.*/ |