summaryrefslogtreecommitdiff
path: root/dev/ide_disk.hh
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2004-05-11 22:42:57 -0400
committerLisa Hsu <hsul@eecs.umich.edu>2004-05-11 22:42:57 -0400
commitc5ec5bf3a746ae5ccbd80e5959807cf35e1d4b93 (patch)
tree384a938c9829ba7c277df4981d12ddc95cacbdf5 /dev/ide_disk.hh
parent16800971d03a1b57339cd9ebdb5cee7711078c51 (diff)
parentcd8db7669aefe1075c9ded5e6cc3203593698880 (diff)
downloadgem5-c5ec5bf3a746ae5ccbd80e5959807cf35e1d4b93.tar.xz
Merge zizzer.eecs.umich.edu:/bk/linux
into shizzle.(none):/home/hsul/work/linux --HG-- extra : convert_revision : 729b97489f990bffd23add762582b73d2eb2137d
Diffstat (limited to 'dev/ide_disk.hh')
-rw-r--r--dev/ide_disk.hh2
1 files changed, 2 insertions, 0 deletions
diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh
index 016f827cc..88a492cbc 100644
--- a/dev/ide_disk.hh
+++ b/dev/ide_disk.hh
@@ -313,6 +313,8 @@ class IdeDisk : public SimObject
(cmdReg.cyl_low << 8) | (cmdReg.sec_num));
}
+ inline Addr pciToDma(Addr &pciAddr);
+
/**
* Serialize this object to the given output stream.
* @param os The stream to serialize to.