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/baddev.hh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'dev/baddev.hh') diff --git a/dev/baddev.hh b/dev/baddev.hh index 29fc5f44d..ed896d792 100644 --- a/dev/baddev.hh +++ b/dev/baddev.hh @@ -34,7 +34,7 @@ #ifndef __BADDEV_HH__ #define __BADDEV_HH__ -#include "mem/functional_mem/mmap_device.hh" +#include "mem/functional_mem/functional_memory.hh" /** * BadDevice @@ -42,24 +42,23 @@ * the user that the kernel they are running has unsupported * options (i.e. frame buffer) */ -class BadDevice : public MmapDevice +class BadDevice : public FunctionalMemory { private: + Addr addr; + static const Addr size = 0xf; - std::string devname; - protected: + std::string devname; public: /** - * The default constructor. - */ - BadDevice(const std::string &name, Addr addr, Addr mask, - MemoryController *mmu, const std::string &devicename); + * The default constructor. + */ + BadDevice(const std::string &name, Addr a, MemoryController *mmu, + const std::string &devicename); virtual Fault read(MemReqPtr &req, uint8_t *data); virtual Fault write(MemReqPtr &req, const uint8_t *data); - - }; #endif // __BADDEV_HH__ -- cgit v1.2.3