From 81d5ffe7dea641402a5e1b92448646f515f46677 Mon Sep 17 00:00:00 2001 From: Andrew Schultz Date: Tue, 10 Feb 2004 00:19:43 -0500 Subject: 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 --- dev/tsunami_pchip.hh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'dev/tsunami_pchip.hh') diff --git a/dev/tsunami_pchip.hh b/dev/tsunami_pchip.hh index b00866e03..99530ddc0 100644 --- a/dev/tsunami_pchip.hh +++ b/dev/tsunami_pchip.hh @@ -33,15 +33,17 @@ #ifndef __TSUNAMI_PCHIP_HH__ #define __TSUNAMI_PCHIP_HH__ -#include "mem/functional_mem/mmap_device.hh" +#include "mem/functional_mem/functional_memory.hh" #include "dev/tsunami.hh" /* * Tsunami PChip */ -class TsunamiPChip : public MmapDevice +class TsunamiPChip : public FunctionalMemory { - public: + private: + Addr addr; + static const Addr size = 0xfff; protected: Tsunami *tsunami; @@ -61,8 +63,8 @@ class TsunamiPChip : public MmapDevice public: - TsunamiPChip(const std::string &name, Tsunami *t, - Addr addr, Addr mask, MemoryController *mmu); + TsunamiPChip(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); -- cgit v1.2.3