summaryrefslogtreecommitdiff
path: root/dev/tsunami_cchip.hh
diff options
context:
space:
mode:
authorAndrew Schultz <alschult@umich.edu>2004-02-10 00:19:43 -0500
committerAndrew Schultz <alschult@umich.edu>2004-02-10 00:19:43 -0500
commit81d5ffe7dea641402a5e1b92448646f515f46677 (patch)
tree9334b2fac9632e8bf6a5879ead536f6bf3f99f17 /dev/tsunami_cchip.hh
parenteac2d6a66863dcd7d5129ee5112ea49248f9efa8 (diff)
downloadgem5-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/tsunami_cchip.hh')
-rw-r--r--dev/tsunami_cchip.hh12
1 files changed, 7 insertions, 5 deletions
diff --git a/dev/tsunami_cchip.hh b/dev/tsunami_cchip.hh
index 16d795afb..8c8ed4d20 100644
--- a/dev/tsunami_cchip.hh
+++ b/dev/tsunami_cchip.hh
@@ -33,15 +33,17 @@
#ifndef __TSUNAMI_CCHIP_HH__
#define __TSUNAMI_CCHIP_HH__
-#include "mem/functional_mem/mmap_device.hh"
+#include "mem/functional_mem/functional_memory.hh"
#include "dev/tsunami.hh"
/*
* Tsunami CChip
*/
-class TsunamiCChip : public MmapDevice
+class TsunamiCChip : public FunctionalMemory
{
- public:
+ private:
+ Addr addr;
+ static const Addr size = 0xfff;
protected:
/**
@@ -71,8 +73,8 @@ class TsunamiCChip : public MmapDevice
uint64_t drir;
public:
- TsunamiCChip(const std::string &name, Tsunami *t,
- Addr addr, Addr mask, MemoryController *mmu);
+ TsunamiCChip(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);