diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-27 16:43:29 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-27 16:43:29 -0400 |
| commit | 52c3991182c06439cc59d2ce59c9f3c6c968e0c2 (patch) | |
| tree | c54d42e067d2bb3255f624e8712b7cd529fec531 /src/python | |
| parent | 95561dc138243b1fda266ed4ef4ffdc64700c353 (diff) | |
| parent | 64b72130463f217bc2ce3e592630406e9f832d16 (diff) | |
| download | gem5-52c3991182c06439cc59d2ce59c9f3c6c968e0c2.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 70221af596bddbfcc40646d03f175ef5e4b75909
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/m5/objects/Ethernet.py | 2 | ||||
| -rw-r--r-- | src/python/m5/objects/Ide.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/python/m5/objects/Ethernet.py b/src/python/m5/objects/Ethernet.py index db7efe004..fb641bf80 100644 --- a/src/python/m5/objects/Ethernet.py +++ b/src/python/m5/objects/Ethernet.py @@ -68,6 +68,8 @@ class EtherDevBase(PciDevice): clock = Param.Clock('0ns', "State machine processor frequency") + config_latency = Param.Latency('20ns', "Config read or write latency") + dma_read_delay = Param.Latency('0us', "fixed delay for dma reads") dma_read_factor = Param.Latency('0us', "multiplier for dma reads") dma_write_delay = Param.Latency('0us', "fixed delay for dma writes") diff --git a/src/python/m5/objects/Ide.py b/src/python/m5/objects/Ide.py index a5fe1b595..a8bd4ac5a 100644 --- a/src/python/m5/objects/Ide.py +++ b/src/python/m5/objects/Ide.py @@ -36,4 +36,6 @@ class IdeController(PciDevice): type = 'IdeController' disks = VectorParam.IdeDisk("IDE disks attached to this controller") + config_latency = Param.Latency('20ns', "Config read or write latency") + configdata =IdeControllerPciData() |