first pass at merging m5 with linux
--HG-- extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e
This commit is contained in:
@@ -313,8 +313,8 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(EtherTap)
|
||||
|
||||
SimObjectParam<EtherInt *> peer;
|
||||
SimObjectParam<EtherDump *> packet_dump;
|
||||
Param<uint16_t> port;
|
||||
Param<uint16_t> bufsz;
|
||||
Param<unsigned> port;
|
||||
Param<unsigned> bufsz;
|
||||
|
||||
END_DECLARE_SIM_OBJECT_PARAMS(EtherTap)
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "dev/io_device.hh"
|
||||
#include "mem/bus/base_interface.hh"
|
||||
#include "mem/bus/dma_interface.hh"
|
||||
#include "sim/builder.hh"
|
||||
|
||||
PioDevice::PioDevice(const std::string &name)
|
||||
: FunctionalMemory(name), pioInterface(NULL)
|
||||
@@ -40,6 +41,8 @@ PioDevice::~PioDevice()
|
||||
delete pioInterface;
|
||||
}
|
||||
|
||||
DEFINE_SIM_OBJECT_CLASS_NAME("PioDevice", PioDevice)
|
||||
|
||||
DmaDevice::DmaDevice(const std::string &name)
|
||||
: PioDevice(name), dmaInterface(NULL)
|
||||
{}
|
||||
@@ -50,3 +53,5 @@ DmaDevice::~DmaDevice()
|
||||
delete dmaInterface;
|
||||
}
|
||||
|
||||
DEFINE_SIM_OBJECT_CLASS_NAME("DmaDevice", DmaDevice)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user