From 54cc0053f0a6822e47a49771976af6daaabc24bb Mon Sep 17 00:00:00 2001 From: Miles Kaufmann Date: Thu, 30 Aug 2007 15:16:59 -0400 Subject: 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 --- src/dev/simple_disk.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/dev/simple_disk.cc') 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); } -- cgit v1.2.3