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

diff --cc python/m5/objects/Pci.mpy
index caa3c52ff9cc96f1d93760299791a0c67087f24f,0000000000000000000000000000000000000000..90747272799a3860cba5aa815f5f2cc4e47f14b9
mode 100644,000000..100644
--- 1/python/m5/objects/Pci.mpy
--- /dev/null
+++ b/python/m5/objects/Pci.mpy
@@@ -1,52 -1,0 +1,50 @@@
- simobj PciConfigData(FooPioDevice):
 +from Device import FooPioDevice, DmaDevice
 +
-     addr = 0xffffffffffffffffL
++simobj PciConfigData(SimObject):
 +    type = 'PciConfigData'
-     addr = 0xffffffffffffffffL
 +    VendorID = Param.UInt16("Vendor ID")
 +    DeviceID = Param.UInt16("Device ID")
 +    Command = Param.UInt16(0, "Command")
 +    Status = Param.UInt16(0, "Status")
 +    Revision = Param.UInt8(0, "Device")
 +    ProgIF = Param.UInt8(0, "Programming Interface")
 +    SubClassCode = Param.UInt8(0, "Sub-Class Code")
 +    ClassCode = Param.UInt8(0, "Class Code")
 +    CacheLineSize = Param.UInt8(0, "System Cacheline Size")
 +    LatencyTimer = Param.UInt8(0, "PCI Latency Timer")
 +    HeaderType = Param.UInt8(0, "PCI Header Type")
 +    BIST = Param.UInt8(0, "Built In Self Test")
 +
 +    BAR0 = Param.UInt32(0x00, "Base Address Register 0")
 +    BAR1 = Param.UInt32(0x00, "Base Address Register 1")
 +    BAR2 = Param.UInt32(0x00, "Base Address Register 2")
 +    BAR3 = Param.UInt32(0x00, "Base Address Register 3")
 +    BAR4 = Param.UInt32(0x00, "Base Address Register 4")
 +    BAR5 = Param.UInt32(0x00, "Base Address Register 5")
 +    BAR0Size = Param.UInt32(0, "Base Address Register 0 Size")
 +    BAR1Size = Param.UInt32(0, "Base Address Register 1 Size")
 +    BAR2Size = Param.UInt32(0, "Base Address Register 2 Size")
 +    BAR3Size = Param.UInt32(0, "Base Address Register 3 Size")
 +    BAR4Size = Param.UInt32(0, "Base Address Register 4 Size")
 +    BAR5Size = Param.UInt32(0, "Base Address Register 5 Size")
 +
 +    CardbusCIS = Param.UInt32(0x00, "Cardbus Card Information Structure")
 +    SubsystemID = Param.UInt16(0x00, "Subsystem ID")
 +    SubsystemVendorID = Param.UInt16(0x00, "Subsystem Vendor ID")
 +    ExpansionROM = Param.UInt32(0x00, "Expansion ROM Base Address")
 +    InterruptLine = Param.UInt8(0x00, "Interrupt Line")
 +    InterruptPin = Param.UInt8(0x00, "Interrupt Pin")
 +    MaximumLatency = Param.UInt8(0x00, "Maximum Latency")
 +    MinimumGrant = Param.UInt8(0x00, "Minimum Grant")
 +
 +simobj PciConfigAll(FooPioDevice):
 +    type = 'PciConfigAll'
 +
 +simobj PciDevice(DmaDevice):
 +    type = 'PciDevice'
 +    abstract = True
 +    pci_bus = Param.Int("PCI bus")
 +    pci_dev = Param.Int("PCI device number")
 +    pci_func = Param.Int("PCI function code")
 +    configdata = Param.PciConfigData(Super, "PCI Config data")
 +    configspace = Param.PciConfigAll(Super, "PCI Configspace")