Merge with head.

[gem5.git] / src / dev / simple_disk.hh

diff --git a/src/dev/simple_disk.hh b/src/dev/simple_disk.hh
index 19967f208ed202c8d8c8088765e96d6a74cc548d..2f3802975e0035821003d036e5866491f2135c9c 100644 (file)
--- a/src/dev/simple_disk.hh
+++ b/src/dev/simple_disk.hh
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
  */
 
 /* @file
@@ -35,6 +37,7 @@
 
 #include "sim/sim_object.hh"
 #include "arch/isa_traits.hh"
+#include "params/SimpleDisk.hh"
 
 class DiskImage;
 class System;
@@ -52,7 +55,8 @@ class SimpleDisk : public SimObject
     DiskImage *image;
 
   public:
-    SimpleDisk(const std::string &name, System *sys, DiskImage *img);
+    typedef SimpleDiskParams Params;
+    SimpleDisk(const Params *p);
     ~SimpleDisk();
 
     void read(Addr addr, baddr_t block, int count) const;