diff options
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.*/ |