From: Cahit Ugur <c.ugur@gsi.de>
Date: Mon, 26 Oct 2015 16:52:01 +0000 (+0100)
Subject: Merge branch 'master' of jspc28.x-matter.uni-frankfurt.de:daqtools
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=61c65ff18d5d757a84663efd766261d0867d82bc;p=daqtools.git

Merge branch 'master' of jspc28.x-matter.uni-frankfurt.de:daqtools

Conflicts:
	web/htdocs/network/map.pl
---

61c65ff18d5d757a84663efd766261d0867d82bc
diff --cc web/htdocs/network/map.pl
index 33ce309,f224db8..308d724
--- a/web/htdocs/network/map.pl
+++ b/web/htdocs/network/map.pl
@@@ -73,33 -73,34 +73,34 @@@ if($ENV{'QUERY_STRING'} =~ /getmap/) 
  	next unless defined $tree->{$parent}->[$p];
  	my $addr = $tree->{$parent}->[$p]->{addr};
  	my $btype = "";
 -	for($hardware->{$addr}>>24&0xff) {
 -	    when (0x90) {$btype= "TRB3 central";}
 -	    when (0x91) {$btype= "TRB3 periph";}
 -	    when (0x92) {$btype= "CBM-Rich";}
 -	    when (0x93) {$btype= "CBM-Tof";}
 -      when (0x95) {$btype= "TRB3sc";}
 -	    when (0x83) {$btype= "TRB2 RPC";}
 -	    when (0x81) {$btype= "TRB2 TOF";}
 -	    when (0x62) {$btype= "Hub AddOn";}
 -	    when (0x52) {$btype= "CTS";}
 -	    when (0x42) {$btype= "Shower AddOn";}
 -	    when (0x33) {$btype= "RICH ADCM"; }
 -	    when (0x23) {$btype= "MDC OEP"; }
 -	    when (0x12) {$btype= "MDC Hub"; }
 -        }
 +	my $value = $hardware->{$addr}>>24&0xff;
 +	
 +	if ($value==0x90) {$btype= "TRB3 central";}
 +	if ($value==0x91) {$btype= "TRB3 periph";}
 +	if ($value==0x92) {$btype= "CBM-Rich";}
 +	if ($value==0x93) {$btype= "CBM-Tof";}
++	if ($value==0x95) {$btype= "TRB§sc";}
 +	if ($value==0x83) {$btype= "TRB2 RPC";}
 +	if ($value==0x81) {$btype= "TRB2 TOF";}
 +	if ($value==0x62) {$btype= "Hub AddOn";}
 +	if ($value==0x52) {$btype= "CTS";}
 +	if ($value==0x42) {$btype= "Shower AddOn";}
 +	if ($value==0x33) {$btype= "RICH ADCM"; }
 +	if ($value==0x23) {$btype= "MDC OEP"; }
 +	if ($value==0x12) {$btype= "MDC Hub"; }
 +        
  	my $addontype = "";  
  	if(($hardware->{$addr}>>24&0xff) == 0x91) {
 -	    for($hardware->{$addr}>>12 & 0xF) {
 -		when (0) {$addontype= " & ADA v1";}
 -		when (1) {$addontype= " & ADA v2";}
 -		when (2) {$addontype= " & Multitest";}
 -		when (3) {$addontype= " & SFP";}
 -		when (4) {$addontype= " & Padiwa";}
 -		when (5) {$addontype= " & GPIN";}
 -		when (6) {$addontype= " & Nxyter";}
 -		when (7) {$addontype= " & 32PinAddOn";}
 -		when (9) {$addontype= " & ADC AddOn";}
 -	    }
 +	    $value= $hardware->{$addr}>>12 & 0xF; 
 +	    if ($value==0) {$addontype= " & ADA v1";}
 +	    if ($value==1) {$addontype= " & ADA v2";}
 +	    if ($value==2) {$addontype= " & Multitest";}
 +	    if ($value==3) {$addontype= " & SFP";}
 +	    if ($value==4) {$addontype= " & Padiwa";}
 +	    if ($value==5) {$addontype= " & GPIN";}
 +	    if ($value==6) {$addontype= " & Nxyter";}
 +	    if ($value==7) {$addontype= " & 32PinAddOn";}
 +	    if ($value==9) {$addontype= " & ADC AddOn";}
          }      
  	my $feat = "";
  	my $table = $inclHigh->{$addr}>>24&0xFF;
@@@ -198,13 -201,14 +200,13 @@@
  		my $d = trb_register_read($addr,0xcf27);
  		$feat .= sprintf(", %i inputs, %i outputs",($d->{$addr}&0x3F),($d->{$addr}>>8&0xF));
  	    }
 -	    for($inclHigh->{$addr}>>20&0xF) {  
 -		when(0) {$feat .="\nClock: on-board 200 MHz";}
 -		when(1) {$feat .="\nClock: on-board 120 MHz";}
 -		when(2) {$feat .="\nClock: received 200 MHz";}
 -		when(3) {$feat .="\nClock: received 120 MHz";}
 -		when(4) {$feat .="\nClock: external 200 MHz";}
 -		when(5) {$feat .="\nClock: external 120 MHz";}
 -	    }    
 +	    my $value = $inclHigh->{$addr}>>20&0xF; 
 +		if ($value==0) {$feat .="\nClock: on-board 200 MHz";}
- 		if ($value==1) {$feat .="\nClock: on-board 125 MHz";}
++		if ($value==1) {$feat .="\nClock: on-board 120 MHz";}
 +		if ($value==2) {$feat .="\nClock: received 200 MHz";}
- 		if ($value==3) {$feat .="\nClock: received 125 MHz";}
++		if ($value==3) {$feat .="\nClock: received 120 MHz";}
 +		if ($value==4) {$feat .="\nClock: external 200 MHz";}
- 		if ($value==5) {$feat .="\nClock: external 125 MHz";}
++		if ($value==5) {$feat .="\nClock: external 120 MHz";}
  	}
  	
  	# SFP Optical Transceiver Rx Power Readbacks