diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2004-05-11 01:15:18 -0400 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2004-05-11 01:15:18 -0400 |
| commit | a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a (patch) | |
| tree | 06662aecdd919aa0bafb0562fc646465dda5a901 /dev | |
| parent | 3c7071a6be21fc0c87753758fc09ff28890edc99 (diff) | |
| parent | 2cc4fd87eb643c81d37954cbf4a226e78ebd34bc (diff) | |
| download | gem5-a5f90eba3bd2d96c6733a6ac9e8d03a9297fae6a.tar.xz | |
first pass at merging m5 with linux
--HG--
extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ethertap.cc | 4 | ||||
| -rw-r--r-- | dev/io_device.cc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/dev/ethertap.cc b/dev/ethertap.cc index 960d21d73..db1b3660f 100644 --- a/dev/ethertap.cc +++ b/dev/ethertap.cc @@ -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) diff --git a/dev/io_device.cc b/dev/io_device.cc index 4f53ba48d..910b889d8 100644 --- a/dev/io_device.cc +++ b/dev/io_device.cc @@ -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) + |