diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2004-06-10 13:30:58 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2004-06-10 13:30:58 -0400 |
commit | 02f69b94c540a6b116c1a71a97f16facd21a5c44 (patch) | |
tree | 7141d773d09c16f15b6785d5f6420129f7279c5f /dev/tsunami_io.hh | |
parent | a20f44979afd2a77d8b699534a4029d1e35464de (diff) | |
download | gem5-02f69b94c540a6b116c1a71a97f16facd21a5c44.tar.xz |
Fixes for detailed boot, made cttz and ctlz instructions more compact,
and started cleaning up config files.
arch/alpha/isa_desc:
Made implementation of cttz and ctlz more compact
base/remote_gdb.cc:
Added comment about PALcode debugger accesses
dev/baddev.cc:
dev/baddev.hh:
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/pciconfigall.cc:
dev/pciconfigall.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:
Cleaned up includes and changed device from FunctionalMemory to
PioDevice for detailed boot
dev/ns_gige.cc:
The ethernet dev uses two BARs, and the first bars size was being set
incorrectly.
dev/tsunamireg.h:
I don't know why we were using the superpage as the PCI memory addr.
Changed and works correctly with detailed boot.
--HG--
extra : convert_revision : b535e76612cb90b544305dc1aa8c5e0e774564bd
Diffstat (limited to 'dev/tsunami_io.hh')
-rw-r--r-- | dev/tsunami_io.hh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dev/tsunami_io.hh b/dev/tsunami_io.hh index d091689ec..c8c5fd412 100644 --- a/dev/tsunami_io.hh +++ b/dev/tsunami_io.hh @@ -33,7 +33,8 @@ #ifndef __TSUNAMI_DMA_HH__ #define __TSUNAMI_DMA_HH__ -#include "mem/functional_mem/functional_memory.hh" +#include "dev/io_device.hh" +#include "base/range.hh" #include "dev/tsunami.hh" /** How often the RTC interrupts */ @@ -43,7 +44,7 @@ static const int RTC_RATE = 1024; * Tsunami I/O device is a catch all for all the south bridge stuff we care * to implement. */ -class TsunamiIO : public FunctionalMemory +class TsunamiIO : public PioDevice { private: /** The base address of this device */ @@ -134,6 +135,7 @@ class TsunamiIO : public FunctionalMemory * @return a description */ virtual const char *description(); + }; /** uip UpdateInProgess says that the rtc is updating, but we just fake it @@ -208,7 +210,7 @@ class TsunamiIO : public FunctionalMemory * @param mmu pointer to the memory controller that sends us events. */ TsunamiIO(const std::string &name, Tsunami *t, time_t init_time, - Addr a, MemoryController *mmu); + Addr a, MemoryController *mmu, HierParams *hier, Bus *bus); /** * Create the tm struct from seconds since 1970 @@ -256,6 +258,9 @@ class TsunamiIO : public FunctionalMemory * @param section The section name of this object */ virtual void unserialize(Checkpoint *cp, const std::string §ion); + + + Tick cacheAccess(MemReqPtr &req); }; #endif // __TSUNAMI_IO_HH__ |