diff options
Diffstat (limited to 'configs/ruby/MOESI_CMP_token.py')
-rw-r--r-- | configs/ruby/MOESI_CMP_token.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index 064d6dd14..f621df767 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -54,7 +54,7 @@ def define_options(parser): parser.add_option("--allow-atomic-migration", action="store_true", help="allow migratory sharing for atomic only accessed blocks") -def create_system(options, system, piobus, dma_devices, ruby_system): +def create_system(options, system, piobus, dma_ports, ruby_system): if buildEnv['PROTOCOL'] != 'MOESI_CMP_token': panic("This script requires the MOESI_CMP_token protocol to be built.") @@ -183,7 +183,7 @@ def create_system(options, system, piobus, dma_devices, ruby_system): cntrl_count += 1 - for i, dma_device in enumerate(dma_devices): + for i, dma_port in enumerate(dma_ports): # # Create the Ruby objects associated with the dma controller # @@ -196,12 +196,8 @@ def create_system(options, system, piobus, dma_devices, ruby_system): ruby_system = ruby_system) exec("system.dma_cntrl%d = dma_cntrl" % i) - if dma_device.type == 'MemTest': - exec("system.dma_cntrl%d.dma_sequencer.slave = dma_device.test" % i) - else: - exec("system.dma_cntrl%d.dma_sequencer.slave = dma_device.dma" % i) + exec("system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i) dma_cntrl_nodes.append(dma_cntrl) - cntrl_count += 1 all_cntrls = l1_cntrl_nodes + \ |