diff options
-rw-r--r-- | src/dev/pcidev.cc | 3 | ||||
-rw-r--r-- | src/dev/pcidev.hh | 4 |
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]; }; |