diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
| commit | 0e4a80df1a471671b6ef7003e29124b6835ade42 (patch) | |
| tree | 1d2c44d8c3462dd94c0fbf6e4f149e026c901aa8 /dev/simple_disk.hh | |
| parent | a48c24b61eedf580645ff0294b225d1e69a9444b (diff) | |
| parent | 463aa6d49d49ba9c383f07207df57bad75c58ec9 (diff) | |
| download | gem5-0e4a80df1a471671b6ef7003e29124b6835ade42.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348
Diffstat (limited to 'dev/simple_disk.hh')
| -rw-r--r-- | dev/simple_disk.hh | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/dev/simple_disk.hh b/dev/simple_disk.hh index 6560e15c2..f68d5bfff 100644 --- a/dev/simple_disk.hh +++ b/dev/simple_disk.hh @@ -44,19 +44,21 @@ class PhysicalMemory; */ class SimpleDisk : public SimObject { -public: - typedef uint64_t baddr_t; + protected: + typedef TheISA::Addr Addr; + public: + typedef uint64_t baddr_t; -protected: - PhysicalMemory *physmem; - DiskImage *image; + protected: + PhysicalMemory *physmem; + DiskImage *image; -public: - SimpleDisk(const std::string &name, PhysicalMemory *pmem, DiskImage *img); - ~SimpleDisk(); + public: + SimpleDisk(const std::string &name, PhysicalMemory *pmem, DiskImage *img); + ~SimpleDisk(); - void read(Addr addr, baddr_t block, int count) const; - void write(Addr addr, baddr_t block, int count); + void read(Addr addr, baddr_t block, int count) const; + void write(Addr addr, baddr_t block, int count); }; #endif // __DEV_SIMPLE_DISK_HH__ |