Made Addr a global type

[gem5.git] / dev / simple_disk.hh

diff --git a/dev/simple_disk.hh b/dev/simple_disk.hh
index 935865ba4839fdc32221d16ed70cf0f05e5adce7..57f81c5a9f7a4a2b04ecfe000913aeb290a0d399 100644 (file)
--- a/dev/simple_disk.hh
+++ b/dev/simple_disk.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,31 +30,33 @@
  * Simple disk interface for the system console
  */
 
-#ifndef __SIMPLE_DISK_HH__
-#define __SIMPLE_DISK_HH__
+#ifndef __DEV_SIMPLE_DISK_HH__
+#define __DEV_SIMPLE_DISK_HH__
 
-#include "mem/functional_mem/physical_memory.hh"
 #include "sim/sim_object.hh"
+#include "arch/isa_traits.hh"
 
 class DiskImage;
+class PhysicalMemory;
 
 /*
  * Trivial interface to a disk image used by the System Console
  */
 class SimpleDisk : public SimObject
 {
-public:
-  typedef uint64_t baddr_t;
+  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 // __SIMPLE_DISK_HH__
+
+#endif // __DEV_SIMPLE_DISK_HH__