diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-07-19 17:24:45 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-07-19 17:24:45 -0400 |
| commit | 6175f712b3216f3e5387b07d9c41c1931c09acd9 (patch) | |
| tree | 610a888b2de5d25c166f65819d8ad3058d13723c /src | |
| parent | 87d485945879bfbfcb798e70d564b02e77fbc250 (diff) | |
| parent | a50c5cc999dbd875b57ac89ff9f15be8cb59809b (diff) | |
| download | gem5-6175f712b3216f3e5387b07d9c41c1931c09acd9.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : c5dbee4ba46fae1edba732f4bd05ef984a46d088
Diffstat (limited to 'src')
| -rw-r--r-- | src/python/m5/objects/Device.py | 2 | ||||
| -rw-r--r-- | src/python/m5/objects/Pci.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/python/m5/objects/Device.py b/src/python/m5/objects/Device.py index 222f750da..f72c8e73f 100644 --- a/src/python/m5/objects/Device.py +++ b/src/python/m5/objects/Device.py @@ -12,7 +12,7 @@ class BasicPioDevice(PioDevice): type = 'BasicPioDevice' abstract = True pio_addr = Param.Addr("Device Address") - pio_latency = Param.Tick(1, "Programmed IO latency in simticks") + pio_latency = Param.Latency('1ns', "Programmed IO latency in simticks") class DmaDevice(PioDevice): type = 'DmaDevice' diff --git a/src/python/m5/objects/Pci.py b/src/python/m5/objects/Pci.py index 29014bb37..cc0d1cf4a 100644 --- a/src/python/m5/objects/Pci.py +++ b/src/python/m5/objects/Pci.py @@ -52,7 +52,7 @@ class PciDevice(DmaDevice): pci_bus = Param.Int("PCI bus") pci_dev = Param.Int("PCI device number") pci_func = Param.Int("PCI function code") - pio_latency = Param.Tick(1, "Programmed IO latency in simticks") + pio_latency = Param.Latency('1ns', "Programmed IO latency in simticks") configdata = Param.PciConfigData(Parent.any, "PCI Config data") class PciFake(PciDevice): |