X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=openocd-jtag-boundary-scan.pl;h=aa4ea26a7e9db8af88aeaf8572dce12d24fa65c7;hb=c2e9fe0f58b02d50dc6ef23c32e5187dd78b2fac;hp=b2a279416317fd81df989746616dca959ba1a735;hpb=e1b49faf67de9ba598bf94743e828478fab86eec;p=x300-pci

diff --git a/openocd-jtag-boundary-scan.pl b/openocd-jtag-boundary-scan.pl
index b2a2794..aa4ea26 100755
--- a/openocd-jtag-boundary-scan.pl
+++ b/openocd-jtag-boundary-scan.pl
@@ -8,6 +8,9 @@ use IO::Socket::INET;
 use Storable;
 
 my $openocd_remote = shift @ARGV || 'picam:4444';
+my $bsdl_file = $ENV{BSDL} || '_3128at100.bsd';
+my $BOUNDARY_LENGTH = 288;
+my $entity;
 
 my $bit2pin;
 my $io2bit;
@@ -18,7 +21,7 @@ my $pin_map = '';
 
 $|=1; # flush stdout
 
-open(my $bsdl, '<', '_3128at100.bsd');
+open(my $bsdl, '<', $bsdl_file);
 while(<$bsdl>) {
 	if ( m/PIN_MAP_STRING/ ) {
 		$pin_map .= $_;
@@ -30,7 +33,14 @@ while(<$bsdl>) {
 	} elsif ( m/"(\d+)\s+\(BC_\d+,\s+(\S+),\s+(\S+)/ ) {
 		$bit2pin->{$1} = [ $2, $3 ];
 		push @{ $io2bit->{$2} }, $1;
+	} elsif ( m/attribute\s+BOUNDARY_LENGTH\s+of\s+\S+\s*:\s*entity\s+is\s+(\d+);/ ) {
+		$BOUNDARY_LENGTH = $1;
+		warn "# BSDL $bsdl_file BOUNDARY_LENGTH = $BOUNDARY_LENGTH\n";
+	} elsif ( ! $entity && m/^entity\s(\S+)\s+is/ ) {
+		$entity = $1;
+		warn "# entity = $entity\n";
 	}
+
 }
 close($bsdl);
 
@@ -57,7 +67,8 @@ foreach my $map ( split(/\s*,\s*/, $pin_map) ) {
 }
 
 warn "# pin2io = ",dump( $pin2io );
-store \$pin2io, '/dev/shm/pin2io.storable';
+#store \$pin2io, $bsdl_file . '.pin2io.storable';
+store \$pin2io, $entity . '.pin2io.storable';
 
 my @sort = sort {
 	my $aa = $a; $aa =~ s/\D+//g;
@@ -65,11 +76,13 @@ my @sort = sort {
 	$aa <=> $bb } keys %$io2bit;
 warn "# sort = ",dump(@sort);
 
+my $last_bits = '';
 sub print_io {
 	my $bits = shift;
-	my $i = 0;
-#	foreach my $io ( @sort ) {
-	print "pin off io___ I C O | " x 4, $openocd_remote,"\n";
+	my $o_bits = $bits;
+	$bits = reverse $bits; # make substr work as expected
+
+	print "pin off io___ ICO prv | " x 4, $openocd_remote,"\n";
 	foreach my $i ( 0 .. ($#$pin2io/4)-1 ) {
 		foreach my $j ( 0 .. 3 ) {
 			#my $pin = ($i*4) + $j + 1; # rows
@@ -77,14 +90,17 @@ sub print_io {
 			my $io = $pin2io->[$pin];
 			my $o = $io2bit->{$io}->[0];
 			if ( defined $o ) {
-				printf "%-3d %-3d %-5s %d %d %d | ", $pin, $o, $io, split(//, substr($bits, $o, 3));
+				my $l = $b = substr($bits, $o, 3);
+				$l = substr($last_bits,$o,3) if $last_bits;
+				printf "%-3d %-3d %-5s %3s %3s | ", $pin, $o, $io, $b, $b ne $l ? $l : ''
 			} else {
-				printf "%-3d ... %-5s       | ", $pin, $io;
+				printf "%-3d ... %-5s %3s %3s | ", $pin, $io, '', '';
 			}
 		}
 		print "\n";
 	}
 	print "\n";
+	$last_bits = $o_bits;
 }
 
 #foreach my $h (qw(0 1 2 e f 10 11 12 1e 1f 20 30 40 50 100 200 1000)) {
@@ -113,7 +129,7 @@ my $BSR;
 
 # first sample
 print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
-print $sock "drscan x300.tap 288 0\n";
+print $sock "drscan x300.tap $BOUNDARY_LENGTH 0\n";
 
 while(1) {
 
@@ -126,7 +142,7 @@ while (<$sock>) {
 		my $bin = hex2bin($hex);
 		diff_bits($BSR, $bin);
 		$BSR = $bin;
-		print_io $bin;
+		print_io $bin if $bin ne $last_bits;
 		last;
 	} else {
 		warn "# in ",dump($_);
@@ -143,7 +159,8 @@ sub diff_bits {
 		if ( $o[$i] eq $n[$i] ) {
 			$o[$i]='.';
 		} else {
-			$o[$i].='>'.$n[$i];
+			my $pin = $bit2pin->{ $BOUNDARY_LENGTH - ($i * 3) - 3 }->[0];
+			$o[$i] = " $pin:" . $o[$i] . '>' . $n[$i];
 		}
 	}
 	my $diff = join('', @o);
@@ -153,28 +170,54 @@ sub diff_bits {
 print "[press enter]\n";
 my $cmd = <STDIN>;
 chomp $cmd;
-if ( $cmd =~ /(\d+)=(\d)/ ) {
-	my ( $pin, $v ) = ( $1, $2 );
-	warn "# pin $pin = $v\n";
+if ( $cmd =~ /(p|o)(\d+)=(\d+)/ ) {
+	my ( $what, $p, $v ) = ( $1, $2, $3 );
+
+	my $old_bsr = reverse $BSR;
+	my $b = $old_bsr;
+
+	if ( $what eq 'p' && length($v) == 1 ) {
 
-	my $io = $pin2io->[$pin];
-	my $bit = $io2bit->{$io}->[0];
+		my $pin = $p;
+		warn "# pin $pin = $v\n";
 
-	my $b = substr($BSR,0,$bit+1)
-		. ( substr($BSR,$bit+1,1) ^ 1 )
-		. ( $v & 1 )
-		. substr($BSR,$bit+3)
-		;
+		my $io = $pin2io->[$pin];
+		my $bit = $io2bit->{$io}->[0];
+
+		$b =
+			  substr($old_bsr,0,$bit+1) # leave input as-is
+			. ( $v eq 'Z' ? 1 : 0 )	    # control
+			. ( $v & 1 )                # output
+			. substr($old_bsr,$bit+3)
+			;
+
+
+	} elsif ( $what eq 'o' && $p < $BOUNDARY_LENGTH ) {
+		my $o = $p;
+		#$b = substr($old_bsr,0,$o) . reverse $v . substr($old_bsr,$o+length($v));
+		$b = ( "0" x $o ) . reverse $v . ( "0" x ( length($old_bsr) - $o - length($v) ) );
+warn "XXX",length($old_bsr), " == ",length($b);
+		$old_bsr = "0" x length($old_bsr);
+	} else {
+		print "IGNORED ",dump( $what, $p, $v );
+	}
+
+	$b = reverse $b;
 
 	diff_bits( $BSR, $b ), $/;
 
-	print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
-	print $sock "drscan x300.tap 288 0x", bin2hex($b), "\n";
+#	print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
+	print $sock "drscan x300.tap $BOUNDARY_LENGTH 0x", bin2hex($b), "\n";
 	print $sock "irscan x300.tap 0x00\n"; # EXTEST
-	print $sock "drscan x300.tap 288 0x", bin2hex($b), "\n";
+#	print $sock "drscan x300.tap $BOUNDARY_LENGTH 0x", bin2hex($b), "\n";
+
+} elsif ( $cmd =~ m/\?/ ) {
+	$last_bits = '';
+	print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
+	print $sock "drscan x300.tap $BOUNDARY_LENGTH 0\n";
 } else {
 	print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
-	print $sock "drscan x300.tap 288 0\n";
+	print $sock "drscan x300.tap $BOUNDARY_LENGTH 0\n";
 }