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 d156b6a02b49dadcdee1bb32462d129949bf4bbb..9d568e6cce2f83634f9dd1f4ad2bc3566bccbe7e 100644
(file)
--- a/
dev/pcidev.cc
+++ b/
dev/pcidev.cc
@@
-39,19
+39,20
@@
#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 "dev/pcidev.hh"
#include "dev/pciconfigall.hh"
-#include "mem/functional_mem/memory_control.hh"
+#include "mem/bus/bus.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;
PciDev::PciDev(Params *p)
#include "dev/tsunamireg.h"
using namespace std;
PciDev::PciDev(Params *p)
- : DmaDevice(p->name), _params(p), plat(p->plat), configData(p->configData)
+ : DmaDevice(p->name, p->plat), _params(p), plat(p->plat),
+ configData(p->configData)
{
// copy the config data from the PciConfigData object
if (configData) {
{
// copy the config data from the PciConfigData object
if (configData) {