diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
| commit | 194fb50fbd3f00577ce129762c9a8f13c721e4ad (patch) | |
| tree | fa464892deda45dae86ff3c847cc7ae9aea0db22 /dev/tsunami_io.hh | |
| parent | da7990ab337699ae788809ddaea5ba5c363e0015 (diff) | |
| parent | f6fc18f03d639098b1421fa3412329773b0a6ab1 (diff) | |
| download | gem5-194fb50fbd3f00577ce129762c9a8f13c721e4ad.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : ef75b46b9c1c267c84e6bb2b2234d46c4edcda16
Diffstat (limited to 'dev/tsunami_io.hh')
| -rw-r--r-- | dev/tsunami_io.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/tsunami_io.hh b/dev/tsunami_io.hh index defb850ce..c37f3aa16 100644 --- a/dev/tsunami_io.hh +++ b/dev/tsunami_io.hh @@ -42,7 +42,7 @@ * Tsunami I/O device is a catch all for all the south bridge stuff we care * to implement. */ -class TsunamiIO : public PioDevice +class TsunamiIO : public BasicPioDevice { private: struct tm tm; @@ -318,8 +318,8 @@ class TsunamiIO : public PioDevice */ TsunamiIO(Params *p); - virtual Fault read(Packet &pkt); - virtual Fault write(Packet &pkt); + virtual Tick read(Packet &pkt); + virtual Tick write(Packet &pkt); /** * Post an PIC interrupt to the CPU via the CChip |