summaryrefslogtreecommitdiff
path: root/src/dev/simple_disk.cc
diff options
context:
space:
mode:
authorMiles Kaufmann <milesck@eecs.umich.edu>2007-08-30 15:16:59 -0400
committerMiles Kaufmann <milesck@eecs.umich.edu>2007-08-30 15:16:59 -0400
commit54cc0053f0a6822e47a49771976af6daaabc24bb (patch)
tree72e6c7879de698347832e1e1475afbb9c1be2b70 /src/dev/simple_disk.cc
parent9cb49ab9e0ff8917d20fd7dc81be3ce5ecc81bd8 (diff)
downloadgem5-54cc0053f0a6822e47a49771976af6daaabc24bb.tar.xz
params: Deprecate old-style constructors; update most SimObject constructors.
SimObjects not yet updated: - Process and subclasses - BaseCPU and subclasses The SimObject(const std::string &name) constructor was removed. Subclasses that still rely on that behavior must call the parent initializer as : SimObject(makeParams(name)) --HG-- extra : convert_revision : d6faddde76e7c3361ebdbd0a7b372a40941c12ed
Diffstat (limited to 'src/dev/simple_disk.cc')
-rw-r--r--src/dev/simple_disk.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/dev/simple_disk.cc b/src/dev/simple_disk.cc
index 4b6d37286..b8096d213 100644
--- a/src/dev/simple_disk.cc
+++ b/src/dev/simple_disk.cc
@@ -45,13 +45,12 @@
#include "dev/disk_image.hh"
#include "dev/simple_disk.hh"
#include "mem/port.hh"
-#include "params/SimpleDisk.hh"
#include "sim/system.hh"
using namespace std;
-SimpleDisk::SimpleDisk(const string &name, System *sys, DiskImage *img)
- : SimObject(name), system(sys), image(img)
+SimpleDisk::SimpleDisk(const Params *p)
+ : SimObject(p), system(p->system), image(p->disk)
{}
SimpleDisk::~SimpleDisk()
@@ -94,5 +93,5 @@ SimpleDisk::write(Addr addr, baddr_t block, int count)
SimpleDisk *
SimpleDiskParams::create()
{
- return new SimpleDisk(name, system, disk);
+ return new SimpleDisk(this);
}