projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge zizzer:/bk/m5 into vm1.reinhardt.house:/z/stever/bk/m5
[gem5.git]
/
dev
/
pcidev.cc
diff --git
a/dev/pcidev.cc
b/dev/pcidev.cc
index c45afadd4c8e64de02574a889fd1acbabdaa438a..9d568e6cce2f83634f9dd1f4ad2bc3566bccbe7e 100644
(file)
--- a/
dev/pcidev.cc
+++ b/
dev/pcidev.cc
@@
-39,14
+39,13
@@
#include "base/misc.hh"
#include "base/str.hh" // for to_number
#include "base/trace.hh"
#include "base/misc.hh"
#include "base/str.hh" // for to_number
#include "base/trace.hh"
-#include "dev/pciareg.h"
#include "dev/pcidev.hh"
#include "dev/pciconfigall.hh"
#include "mem/bus/bus.hh"
#include "dev/pcidev.hh"
#include "dev/pciconfigall.hh"
#include "mem/bus/bus.hh"
-#include "mem/functional
_mem
/memory_control.hh"
+#include "mem/functional/memory_control.hh"
#include "sim/builder.hh"
#include "sim/param.hh"
#include "sim/builder.hh"
#include "sim/param.hh"
-#include "sim/
universe
.hh"
+#include "sim/
root
.hh"
#include "dev/tsunamireg.h"
using namespace std;
#include "dev/tsunamireg.h"
using namespace std;
@@
-285,11
+284,6
@@
PciDev::unserialize(Checkpoint *cp, const std::string §ion)
BEGIN_DECLARE_SIM_OBJECT_PARAMS(PciConfigData)
BEGIN_DECLARE_SIM_OBJECT_PARAMS(PciConfigData)
- SimObjectParam<MemoryController *> mmu;
- Param<Addr> addr;
- SimObjectParam<Bus*> io_bus;
- Param<Tick> pio_latency;
-
Param<uint16_t> VendorID;
Param<uint16_t> DeviceID;
Param<uint16_t> Command;
Param<uint16_t> VendorID;
Param<uint16_t> DeviceID;
Param<uint16_t> Command;
@@
-327,11
+321,6
@@
END_DECLARE_SIM_OBJECT_PARAMS(PciConfigData)
BEGIN_INIT_SIM_OBJECT_PARAMS(PciConfigData)
BEGIN_INIT_SIM_OBJECT_PARAMS(PciConfigData)
- INIT_PARAM(mmu, "Memory Controller"),
- INIT_PARAM(addr, "Device Address"),
- INIT_PARAM_DFLT(io_bus, "The IO Bus to attach to", NULL),
- INIT_PARAM_DFLT(pio_latency, "Programmed IO latency in bus cycles", 1),
-
INIT_PARAM(VendorID, "Vendor ID"),
INIT_PARAM(DeviceID, "Device ID"),
INIT_PARAM_DFLT(Command, "Command Register", 0x00),
INIT_PARAM(VendorID, "Vendor ID"),
INIT_PARAM(DeviceID, "Device ID"),
INIT_PARAM_DFLT(Command, "Command Register", 0x00),