diff options
| author | Korey Sewell <ksewell@umich.edu> | 2006-02-16 02:40:04 -0500 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2006-02-16 02:40:04 -0500 |
| commit | e7d16b0aefec6543817762b6e5e389372a11b53c (patch) | |
| tree | 2e90bf447049ece5fb234bfaf44c50515388744e /dev/ide_ctrl.hh | |
| parent | 7c9ea671aff141bc0a3e7acc892794e7e8181cf3 (diff) | |
| parent | 00f451cc02373a22023f1e32ba3823a1d07adb42 (diff) | |
| download | gem5-e7d16b0aefec6543817762b6e5e389372a11b53c.tar.xz | |
Merge zizzer:/bk/multiarch
into zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/m5-multiarch
--HG--
extra : convert_revision : 17b164847aee7e21d15d1a9d99aae43f46906c28
Diffstat (limited to 'dev/ide_ctrl.hh')
| -rw-r--r-- | dev/ide_ctrl.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/ide_ctrl.hh b/dev/ide_ctrl.hh index 0fbaf9207..72523f57c 100644 --- a/dev/ide_ctrl.hh +++ b/dev/ide_ctrl.hh @@ -213,7 +213,7 @@ class IdeController : public PciDev * @param data Return the field read. * @return The fault condition of the access. */ - virtual Fault read(MemReqPtr &req, uint8_t *data); + virtual Fault * read(MemReqPtr &req, uint8_t *data); /** * Write to the mmapped I/O control registers. @@ -221,7 +221,7 @@ class IdeController : public PciDev * @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); /** * Serialize this object to the given output stream. |