diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-16 01:25:48 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-16 01:25:48 -0500 |
| commit | b161d2a731ec7d75bdeb896d1b89efcbb125a09f (patch) | |
| tree | a1a92378afb4d05e8c9e2d047c1c9edbcc9e3447 /dev/baddev.hh | |
| parent | 7f17f1f2df7dc7123448ec624a345ee7c0e996b5 (diff) | |
| parent | 10c79efe556697ebbed74c82214b5505b405da5b (diff) | |
| download | gem5-b161d2a731ec7d75bdeb896d1b89efcbb125a09f.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : d8626acb2686e123ad0bb6cf94e85c992657470d
Diffstat (limited to 'dev/baddev.hh')
| -rw-r--r-- | dev/baddev.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/baddev.hh b/dev/baddev.hh index c2a204c05..b7b67e31a 100644 --- a/dev/baddev.hh +++ b/dev/baddev.hh @@ -71,7 +71,7 @@ class BadDevice : public PioDevice * @param data A pointer to write the read data to. * @return The fault condition of the access. */ - virtual Fault read(MemReqPtr &req, uint8_t *data); + virtual Fault * read(MemReqPtr &req, uint8_t *data); /** * On a write event we just panic aand hopefully print a @@ -80,7 +80,7 @@ class BadDevice : public PioDevice * @param data The data to write. * @return The fault condition of the access. */ - virtual Fault write(MemReqPtr &req, const uint8_t *data); + virtual Fault * write(MemReqPtr &req, const uint8_t *data); /** * Return how long this access will take. |