diff options
author | Nathan Binkert <binkertn@umich.edu> | 2005-11-20 16:57:53 -0500 |
---|---|---|
committer | Nathan Binkert <binkertn@umich.edu> | 2005-11-20 16:57:53 -0500 |
commit | 12d903a650a91798eae2389e70f7d4471d130919 (patch) | |
tree | 625b9e1a80405e63298e00aa12855231f502ab06 /dev/tsunami_cchip.cc | |
parent | ccae5838fd4ec3b6aa27024beb24e231f6d3c63a (diff) | |
download | gem5-12d903a650a91798eae2389e70f7d4471d130919.tar.xz |
io_bus is split out into pio_bus and dma_bus so that any device
can specify either independently.
python/m5/objects/Device.py:
io_bus is split out into pio_bus and dma_bus so that any device
can specify either independently.
dma_bus defaults to point to whatever pio_bus uses.
--HG--
extra : convert_revision : d35d5374d0bf592f6b5df465c05203577b8b8763
Diffstat (limited to 'dev/tsunami_cchip.cc')
-rw-r--r-- | dev/tsunami_cchip.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dev/tsunami_cchip.cc b/dev/tsunami_cchip.cc index 3e2a712a9..2287a2a3d 100644 --- a/dev/tsunami_cchip.cc +++ b/dev/tsunami_cchip.cc @@ -49,17 +49,17 @@ using namespace std; TsunamiCChip::TsunamiCChip(const string &name, Tsunami *t, Addr a, - MemoryController *mmu, HierParams *hier, Bus* bus, - Tick pio_latency) + MemoryController *mmu, HierParams *hier, + Bus* pio_bus, Tick pio_latency) : PioDevice(name, t), addr(a), tsunami(t) { mmu->add_child(this, RangeSize(addr, size)); - if (bus) { - pioInterface = newPioInterface(name + ".pio", hier, bus, this, + if (pio_bus) { + pioInterface = newPioInterface(name + ".pio", hier, pio_bus, this, &TsunamiCChip::cacheAccess); pioInterface->addAddrRange(RangeSize(addr, size)); - pioLatency = pio_latency * bus->clockRate; + pioLatency = pio_latency * pio_bus->clockRate; } drir = 0; @@ -551,7 +551,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(TsunamiCChip) SimObjectParam<Tsunami *> tsunami; SimObjectParam<MemoryController *> mmu; Param<Addr> addr; - SimObjectParam<Bus*> io_bus; + SimObjectParam<Bus*> pio_bus; Param<Tick> pio_latency; SimObjectParam<HierParams *> hier; @@ -562,7 +562,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(TsunamiCChip) INIT_PARAM(tsunami, "Tsunami"), INIT_PARAM(mmu, "Memory Controller"), INIT_PARAM(addr, "Device Address"), - INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to", NULL), + INIT_PARAM_DFLT(pio_bus, "The IO Bus to attach to", NULL), INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1), INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams) @@ -571,7 +571,7 @@ END_INIT_SIM_OBJECT_PARAMS(TsunamiCChip) CREATE_SIM_OBJECT(TsunamiCChip) { return new TsunamiCChip(getInstanceName(), tsunami, addr, mmu, hier, - io_bus, pio_latency); + pio_bus, pio_latency); } REGISTER_SIM_OBJECT("TsunamiCChip", TsunamiCChip) |