summaryrefslogtreecommitdiff
path: root/python/m5/objects
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2005-03-11 19:34:43 -0500
committerAli Saidi <saidi@eecs.umich.edu>2005-03-11 19:34:43 -0500
commite0d52f56e12d5ef4ddbc98b173543a95f75fb68e (patch)
tree8d30fde311ce5b5a090cbe1f42446a32e1c11475 /python/m5/objects
parent05e07428f103ae97f7929e3a4ed9bb7bea1eab9c (diff)
parentc977d2a02b1b3071d52fe43779730ed5290babff (diff)
downloadgem5-e0d52f56e12d5ef4ddbc98b173543a95f75fb68e.tar.xz
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG-- rename : objects/Pci.mpy => python/m5/objects/Pci.mpy extra : convert_revision : 6902e8f9c2a309eb1846094a94b38018587a3761
Diffstat (limited to 'python/m5/objects')
-rw-r--r--python/m5/objects/Pci.mpy4
1 files changed, 1 insertions, 3 deletions
diff --git a/python/m5/objects/Pci.mpy b/python/m5/objects/Pci.mpy
index caa3c52ff..907472727 100644
--- a/python/m5/objects/Pci.mpy
+++ b/python/m5/objects/Pci.mpy
@@ -1,8 +1,7 @@
from Device import FooPioDevice, DmaDevice
-simobj PciConfigData(FooPioDevice):
+simobj PciConfigData(SimObject):
type = 'PciConfigData'
- addr = 0xffffffffffffffffL
VendorID = Param.UInt16("Vendor ID")
DeviceID = Param.UInt16("Device ID")
Command = Param.UInt16(0, "Command")
@@ -49,4 +48,3 @@ simobj PciDevice(DmaDevice):
pci_func = Param.Int("PCI function code")
configdata = Param.PciConfigData(Super, "PCI Config data")
configspace = Param.PciConfigAll(Super, "PCI Configspace")
- addr = 0xffffffffffffffffL