diff options
author | Andrew Schultz <alschult@umich.edu> | 2004-02-10 00:19:43 -0500 |
---|---|---|
committer | Andrew Schultz <alschult@umich.edu> | 2004-02-10 00:19:43 -0500 |
commit | 81d5ffe7dea641402a5e1b92448646f515f46677 (patch) | |
tree | 9334b2fac9632e8bf6a5879ead536f6bf3f99f17 /dev/pciconfigall.hh | |
parent | eac2d6a66863dcd7d5129ee5112ea49248f9efa8 (diff) | |
download | gem5-81d5ffe7dea641402a5e1b92448646f515f46677.tar.xz |
Changed new linux stuff to work with new FunctionalMemory interface and
some sundry problems with new interface
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/baddev.cc:
dev/baddev.hh:
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_cchip.hh:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
dev/tsunami_uart.cc:
dev/tsunami_uart.hh:
Fixed to use new FunctionalMemory interface
--HG--
extra : convert_revision : bee98e6285d92f28fafacf919ab06eaf333a9b56
Diffstat (limited to 'dev/pciconfigall.hh')
-rw-r--r-- | dev/pciconfigall.hh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/dev/pciconfigall.hh b/dev/pciconfigall.hh index 070643fd9..95a171c53 100644 --- a/dev/pciconfigall.hh +++ b/dev/pciconfigall.hh @@ -38,7 +38,7 @@ #ifndef __PCICONFIGALL_HH__ #define __PCICONFIGALL_HH__ -#include "mem/functional_mem/mmap_device.hh" +#include "mem/functional_mem/functional_memory.hh" #include "dev/tsunami.hh" #include "dev/pcireg.h" @@ -54,9 +54,11 @@ class PciDev; * space and passes the requests on to TsunamiPCIDev devices as * appropriate. */ -class PCIConfigAll : public MmapDevice +class PCIConfigAll : public FunctionalMemory { private: + Addr addr; + static const Addr size = 0xffffff; protected: @@ -77,8 +79,8 @@ class PCIConfigAll : public MmapDevice /** * The default constructor. */ - PCIConfigAll(const std::string &name, Tsunami *t, - Addr addr, Addr mask, MemoryController *mmu); + PCIConfigAll(const std::string &name, Tsunami *t, Addr a, + MemoryController *mmu); virtual Fault read(MemReqPtr &req, uint8_t *data); virtual Fault write(MemReqPtr &req, const uint8_t *data); |