X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=openocd-jtag-boundary-scan.pl;h=726b30d35fd9964fb561129d52ebbbf1fc76a8b6;hb=e92a900a2490410e534c084b3142eb868179f1af;hp=bc02ce3ee1d93463d74f14d65e8b69a3dd5742d7;hpb=299ff93ee0ef8869f56c73bf07c348d71f5ca84d;p=x300-pci diff --git a/openocd-jtag-boundary-scan.pl b/openocd-jtag-boundary-scan.pl index bc02ce3..726b30d 100755 --- a/openocd-jtag-boundary-scan.pl +++ b/openocd-jtag-boundary-scan.pl @@ -5,6 +5,13 @@ use strict; use autodie; use Data::Dump qw(dump); use IO::Socket::INET; +use Storable; + +my $openocd_remote = shift @ARGV || 'picam:4444'; +my $bsdl_file = $ENV{BSDL} || '_3128at100.bsd'; +$bsdl_file = '3064at44.bsd'; # XXX +my $BOUNDARY_LENGTH = 288; +my $entity; my $bit2pin; my $io2bit; @@ -13,8 +20,11 @@ my $pin2io; my $in_pin_map = 0; my $pin_map = ''; +$|=1; # flush stdout + +require 'gpio.pl'; -open(my $bsdl, '<', '_3128at100.bsd'); +open(my $bsdl, '<', $bsdl_file); while(<$bsdl>) { if ( m/PIN_MAP_STRING/ ) { $pin_map .= $_; @@ -26,7 +36,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); @@ -53,40 +70,101 @@ foreach my $map ( split(/\s*,\s*/, $pin_map) ) { } warn "# pin2io = ",dump( $pin2io ); +#store \$pin2io, $bsdl_file . '.pin2io.storable'; +store \$pin2io, $entity . '.pin2io.storable'; + +my $pin_desc; +foreach my $pin_file ( glob "pins/$entity*.tsv" ) { + open(my $fh, '<', $pin_file); + while(<$fh>) { + chomp; + my ($pin,$desc, $bcm) = split(/\t+/,$_,3); + $pin_desc->{$pin} = $desc; + gpio::add_bcm_desc( $bcm => $desc ); + } + close($fh); + warn "# $pin_file ",dump($pin_desc); +} +{ + my $pin_file = 'Altera/epm3064_dac/3064at44.qsf'; + open(my $fh, '<', $pin_file); + while(<$fh>) { + chomp; + my ($set,$pin, $op, $desc) = split(/\s+/,$_,4); + if ( $set =~ m/set_location_assignment/i && $op =~ m/-to/i && $pin =~ s/^PIN_//ig ) { + $pin_desc->{$pin} = $desc; # overwrite pin description + } else { + warn "# ignored $_\n"; + } + } + close($fh); + warn "# $pin_file ",dump($pin_desc); +} + +=for remove my @sort = sort { my $aa = $a; $aa =~ s/\D+//g; my $bb = $b; $bb =~ s/\D+//g; $aa <=> $bb } keys %$io2bit; warn "# sort = ",dump(@sort); +=cut +sub bits { + my $bits = shift; + return $bits; # FIXME disable for now + $bits =~ s/0/ /; + $bits =~ s/^(.)0/$1 /; + $bits =~ s/^1/I/; + $bits =~ s/^(.)1/$1./; + return $bits; +} + +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, "\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 my $pin = ($#$pin2io/4) * $j + $i + 1; # columns 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; + + my $desc = $pin_desc->{$pin} || ''; + my $bits = bits($b); + if ( $b ne $l ) { + my @b = split(//, $bits); + my @l = split(//, bits($l)); + $bits = ''; + foreach ( 0 .. $#b ) { + $bits .= $b[$_] eq $l[$_] ? $b[$_] : "\e[33;7;1m$b[$_]\e[0m"; + } + } + + printf "%-3d %-3d %-5s %3s %-8s | ", $pin, $o, $io, $bits, $desc; } else { - printf "%-3d ... %-5s | ", $pin, $io; + printf "%-3d ... %-5s %3s %-8s | ", $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)) { # printf "hex = %4s binary = %16s\n", $h, hex2bin($h); #} -my $sock = IO::Socket::INET->new('picam:4444'); +my $sock = IO::Socket::INET->new($openocd_remote); sub hex2bin { my $h = shift; @@ -104,11 +182,13 @@ sub bin2hex { #my $cmd; + + 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) { @@ -119,8 +199,10 @@ while (<$sock>) { if ( /^\s*([A-F0-9]+)/ ) { my $hex = $1; my $bin = hex2bin($hex); + diff_bits($BSR, $bin); $BSR = $bin; - print_io $bin; + print_io $bin if $bin ne $last_bits; + gpio::pins(); last; } else { warn "# in ",dump($_); @@ -137,35 +219,66 @@ 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@" . ( $i * 3 ) . ":" . $o[$i] . '>' . $n[$i]; } } - return join('', @o); + my $diff = join('', @o); + print "# diff_bits $diff\n"; } print "[press enter]\n"; my $cmd = ; 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 $pin = $p; + my $io = $pin2io->[$pin]; + my $bit = $io2bit->{$io}->[0]; - my $io = $pin2io->[$pin]; - my $bit = $io2bit->{$io}->[0]; + warn "# pin $pin = $v io=$io bit=$bit\n"; - my $b = substr($BSR,0,$bit+1) - . ( substr($BSR,$bit+1,1) ^ 1 ) - . ( $v & 1 ) - . substr($BSR,$bit+3) - ; + $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) + ; - print diff_bits( $BSR, $b ), $/; + } 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 $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 { + gpio::cmd( $cmd ); 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"; }