diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-07-24 15:48:40 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-07-24 15:48:40 -0700 |
| commit | 26b1c455e0aed69eda0cc165b5084edb1b557c38 (patch) | |
| tree | 0b7ffa9259c55f9a639a12f09ddef033d78b084b /src/dev/simple_disk.cc | |
| parent | 02c39000bfc6be620382bf89636e3b1bbb2f4cf6 (diff) | |
| parent | abc76f20cb98c90e8dab416dd16dfd4a954013ba (diff) | |
| download | gem5-26b1c455e0aed69eda0cc165b5084edb1b557c38.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : 4a34b3f91c4fc90055596245ae3efec45ea33888
Diffstat (limited to 'src/dev/simple_disk.cc')
| -rw-r--r-- | src/dev/simple_disk.cc | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/dev/simple_disk.cc b/src/dev/simple_disk.cc index e29bfa726..4b6d37286 100644 --- a/src/dev/simple_disk.cc +++ b/src/dev/simple_disk.cc @@ -45,7 +45,7 @@ #include "dev/disk_image.hh" #include "dev/simple_disk.hh" #include "mem/port.hh" -#include "sim/builder.hh" +#include "params/SimpleDisk.hh" #include "sim/system.hh" using namespace std; @@ -91,23 +91,8 @@ SimpleDisk::write(Addr addr, baddr_t block, int count) #endif } -BEGIN_DECLARE_SIM_OBJECT_PARAMS(SimpleDisk) - - SimObjectParam<System *> system; - SimObjectParam<DiskImage *> disk; - -END_DECLARE_SIM_OBJECT_PARAMS(SimpleDisk) - -BEGIN_INIT_SIM_OBJECT_PARAMS(SimpleDisk) - - INIT_PARAM(system, "System pointer"), - INIT_PARAM(disk, "Disk Image") - -END_INIT_SIM_OBJECT_PARAMS(SimpleDisk) - -CREATE_SIM_OBJECT(SimpleDisk) +SimpleDisk * +SimpleDiskParams::create() { - return new SimpleDisk(getInstanceName(), system, disk); + return new SimpleDisk(name, system, disk); } - -REGISTER_SIM_OBJECT("SimpleDisk", SimpleDisk) |