]> jspc29.x-matter.uni-frankfurt.de Git - jtag_mvd.git/commitdiff
some more changes to ui.pl
authorJan Michel <j.michel@gsi.de>
Fri, 12 Jul 2013 14:22:46 +0000 (16:22 +0200)
committerJan Michel <j.michel@gsi.de>
Fri, 12 Jul 2013 14:22:46 +0000 (16:22 +0200)
soft/toolbox/jtag_atomic/ui.pl

index 5352d45dc71f890801e56b02d57f6d06ecbc8580..87d4ea0232b873a1b646351ed2623379c16050fd 100755 (executable)
@@ -226,6 +226,7 @@ $chainsini = $ENV{'JTAGCONFIGPATH'}."/".$chainsini if exists($ENV{'JTAGCONFIGPAT
 #  foreach my $chain (reverse sort keys %allchains) {
     my $chain = $opt_chain;
     my %chain_settings=%{$allchains{$chain}};
+    my $chainnr = $chain_settings{'chainnr'};
     my $chain_fpga_addr = any2dec($chain_settings{'FPGAtrbnetAddr'});
     my $cmd_reg_addr = any2dec($chain_settings{'CMDreg_trbnetAddr'});
     my $data_reg_addr = any2dec($chain_settings{'DATAreg_trbnetAddr'});
@@ -263,22 +264,18 @@ $chainsini = $ENV{'JTAGCONFIGPATH'}."/".$chainsini if exists($ENV{'JTAGCONFIGPAT
       $subr =  generate_h_set_inout($chain, $chain_fpga_addr, $conf_signals_addr);
     }
     elsif(("h_".$opt_operation) eq 'h_maps_reset_before_on' ) {
-      my $chainnr = $chain_settings{'chainnr'};
       my $conf_resetbeforeinit_addr = any2dec($chain_settings{'CONFresetbeforeinit_trbnetAddr'});
       $subr =  generate_h_maps_reset(1,$chain, $chainnr, $chain_fpga_addr, $conf_resetbeforeinit_addr);
     }
     elsif(("h_".$opt_operation) eq 'h_maps_reset_before_off' ) {
-      my $chainnr = $chain_settings{'chainnr'};
       my $conf_resetbeforeinit_addr = any2dec($chain_settings{'CONFresetbeforeinit_trbnetAddr'});
       $subr =  generate_h_maps_reset(0,$chain, $chainnr, $chain_fpga_addr, $conf_resetbeforeinit_addr);
     } 
     elsif(("h_".$opt_operation) eq 'h_maps_reset_after_on' ) {
-      my $chainnr = $chain_settings{'chainnr'};
       my $conf_resetafterfirstwrite_addr = any2dec($chain_settings{'CONFresetafterfirstwrite_trbnetAddr'});
       $subr =  generate_h_maps_reset(1,$chain, $chainnr, $chain_fpga_addr, $conf_resetafterfirstwrite_addr);
     }
     elsif(("h_".$opt_operation) eq 'h_maps_reset_after_off' ) {
-      my $chainnr = $chain_settings{'chainnr'};
       my $conf_resetafterfirstwrite_addr = any2dec($chain_settings{'CONFresetafterfirstwrite_trbnetAddr'});
       $subr =  generate_h_maps_reset(0,$chain, $chainnr, $chain_fpga_addr, $conf_resetafterfirstwrite_addr);
     }