43d42
< #include "sim/builder.hh"
47c46
< MmDisk::MmDisk(Params *p)
---
> MmDisk::MmDisk(const Params *p)
176,199c175,176
<
<
<
< BEGIN_DECLARE_SIM_OBJECT_PARAMS(MmDisk)
< Param<Addr> pio_addr;
< Param<Tick> pio_latency;
< Param<Addr> pio_size;
< SimObjectParam<Platform *> platform;
< SimObjectParam<System *> system;
< SimObjectParam<DiskImage *> image;
< END_DECLARE_SIM_OBJECT_PARAMS(MmDisk)
<
< BEGIN_INIT_SIM_OBJECT_PARAMS(MmDisk)
<
< INIT_PARAM(pio_addr, "Device Address"),
< INIT_PARAM(pio_latency, "Programmed IO latency"),
< INIT_PARAM(pio_size, "Size of address range"),
< INIT_PARAM(platform, "platform"),
< INIT_PARAM(system, "system object"),
< INIT_PARAM(image, "disk image")
<
< END_INIT_SIM_OBJECT_PARAMS(MmDisk)
<
< CREATE_SIM_OBJECT(MmDisk)
---
> MmDisk *
> MmDiskParams::create()
201,208c178
< MmDisk::Params *p = new MmDisk::Params;
< p->name = getInstanceName();
< p->pio_addr = pio_addr;
< p->pio_delay = pio_latency;
< p->platform = platform;
< p->system = system;
< p->image = image;
< return new MmDisk(p);
---
> return new MmDisk(this);
210,211d179
<
< REGISTER_SIM_OBJECT("MmDisk", MmDisk)