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/isa_fake.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/isa_fake.cc')
| -rw-r--r-- | dev/isa_fake.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dev/isa_fake.cc b/dev/isa_fake.cc index fa93fe2d2..e2802eaa9 100644 --- a/dev/isa_fake.cc +++ b/dev/isa_fake.cc @@ -47,13 +47,13 @@ using namespace std; IsaFake::IsaFake(const string &name, Addr a, MemoryController *mmu, - HierParams *hier, Bus *bus, Addr size) + HierParams *hier, Bus *pio_bus, Addr size) : PioDevice(name, NULL), addr(a) { 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, &IsaFake::cacheAccess); pioInterface->addAddrRange(RangeSize(addr, size)); } @@ -113,7 +113,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(IsaFake) SimObjectParam<MemoryController *> mmu; Param<Addr> addr; - SimObjectParam<Bus*> io_bus; + SimObjectParam<Bus*> pio_bus; Param<Tick> pio_latency; SimObjectParam<HierParams *> hier; Param<Addr> size; @@ -124,7 +124,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(IsaFake) 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", 1000), INIT_PARAM_DFLT(hier, "Hierarchy global variables", &defaultHierParams), INIT_PARAM_DFLT(size, "Size of address range", 0x8) @@ -133,7 +133,7 @@ END_INIT_SIM_OBJECT_PARAMS(IsaFake) CREATE_SIM_OBJECT(IsaFake) { - return new IsaFake(getInstanceName(), addr, mmu, hier, io_bus, size); + return new IsaFake(getInstanceName(), addr, mmu, hier, pio_bus, size); } REGISTER_SIM_OBJECT("IsaFake", IsaFake) |