diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
commit | 194fb50fbd3f00577ce129762c9a8f13c721e4ad (patch) | |
tree | fa464892deda45dae86ff3c847cc7ae9aea0db22 /python/m5/objects/Pci.py | |
parent | da7990ab337699ae788809ddaea5ba5c363e0015 (diff) | |
parent | f6fc18f03d639098b1421fa3412329773b0a6ab1 (diff) | |
download | gem5-194fb50fbd3f00577ce129762c9a8f13c721e4ad.tar.xz |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : ef75b46b9c1c267c84e6bb2b2234d46c4edcda16
Diffstat (limited to 'python/m5/objects/Pci.py')
-rw-r--r-- | python/m5/objects/Pci.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/python/m5/objects/Pci.py b/python/m5/objects/Pci.py index 4124d0b92..f2ccce09f 100644 --- a/python/m5/objects/Pci.py +++ b/python/m5/objects/Pci.py @@ -1,5 +1,6 @@ from m5 import * -from Device import FooPioDevice, DmaDevice +from Device import BasicPioDevice +#, DmaDevice class PciConfigData(SimObject): type = 'PciConfigData' @@ -38,18 +39,18 @@ class PciConfigData(SimObject): MaximumLatency = Param.UInt8(0x00, "Maximum Latency") MinimumGrant = Param.UInt8(0x00, "Minimum Grant") -class PciConfigAll(FooPioDevice): +class PciConfigAll(BasicPioDevice): type = 'PciConfigAll' -class PciDevice(DmaDevice): - type = 'PciDevice' - abstract = True - addr = 0xffffffffL - pci_bus = Param.Int("PCI bus") - pci_dev = Param.Int("PCI device number") - pci_func = Param.Int("PCI function code") - configdata = Param.PciConfigData(Parent.any, "PCI Config data") - configspace = Param.PciConfigAll(Parent.any, "PCI Configspace") - -class PciFake(PciDevice): - type = 'PciFake' +#class PciDevice(DmaDevice): +# type = 'PciDevice' +# abstract = True +# addr = 0xffffffffL +# pci_bus = Param.Int("PCI bus") +# pci_dev = Param.Int("PCI device number") +# pci_func = Param.Int("PCI function code") +# configdata = Param.PciConfigData(Parent.any, "PCI Config data") +# configspace = Param.PciConfigAll(Parent.any, "PCI Configspace") +# +#class PciFake(PciDevice): +# type = 'PciFake' |