summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-08-28 10:34:15 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2006-08-28 10:34:15 -0700
commit19d51452b1d4809de31702a7132cfba53af9dfd2 (patch)
tree541f45731b8be6750280a2322276dbb66faddcbe /src
parentacfa88f7321241c3053d884843d3f4c56ef2c84f (diff)
downloadgem5-19d51452b1d4809de31702a7132cfba53af9dfd2.tar.xz
Get rid of unused BARAddrs[] in PciConfigData object.
--HG-- extra : convert_revision : a82e05326ca6150c70cb288b28f9f6eee89ad93d
Diffstat (limited to 'src')
-rw-r--r--src/dev/pcidev.cc3
-rw-r--r--src/dev/pcidev.hh4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc
index 1cd018ea2..9e6d5cd37 100644
--- a/src/dev/pcidev.cc
+++ b/src/dev/pcidev.cc
@@ -116,10 +116,11 @@ PciDev::PciDev(Params *p)
if (configData) {
memcpy(config.data, configData->config.data, sizeof(config.data));
memcpy(BARSize, configData->BARSize, sizeof(BARSize));
- memcpy(BARAddrs, configData->BARAddrs, sizeof(BARAddrs));
} else
panic("NULL pointer to configuration data");
+ memset(BARAddrs, 0, sizeof(BARAddrs));
+
plat->registerPciDevice(0, p->deviceNum, p->functionNum,
letoh(configData->config.interruptLine));
}
diff --git a/src/dev/pcidev.hh b/src/dev/pcidev.hh
index ccc875d32..8e4f003b0 100644
--- a/src/dev/pcidev.hh
+++ b/src/dev/pcidev.hh
@@ -62,7 +62,6 @@ class PciConfigData : public SimObject
: SimObject(name)
{
memset(config.data, 0, sizeof(config.data));
- memset(BARAddrs, 0, sizeof(BARAddrs));
memset(BARSize, 0, sizeof(BARSize));
}
@@ -71,9 +70,6 @@ class PciConfigData : public SimObject
/** The size of the BARs */
uint32_t BARSize[6];
-
- /** The addresses of the BARs */
- Addr BARAddrs[6];
};