--- 3m-810.pl	2009/04/06 11:21:15	27
+++ 3m-810.pl	2009/04/06 12:36:22	28
@@ -193,6 +193,29 @@
 	warn "## update_visible_tags(",dump( @tags ),") = ",dump( $visible_tags )," removed: ",dump( $last_visible_tags ), " data: ",dump( $tags_data ) if $debug;
 }
 
+my $tag_data_block;
+
+sub read_tag_data {
+	my ($start_block,$rest) = @_;
+	die "no rest?" unless $rest;
+	warn "## DATA [$start_block] ", dump( $rest ) if $debug;
+	my $tag = uc(unpack('H16',substr( $rest, 0, 8 )));
+	my $blocks = ord(substr($rest,8,1));
+	$rest = substr($rest,9); # leave just data blocks
+	foreach my $nr ( 0 .. $blocks - 1 ) {
+		my $block = substr( $rest, $nr * 6, 6 );
+		warn "## block ",as_hex( $block ) if $debug;
+		my $ord   = unpack('v',substr( $block, 0, 2 ));
+		my $expected_ord = $nr + $start_block;
+		die "got block $ord, expected block $expected_ord from ",dump( $block ) if $ord != $expected_ord;
+		my $data  = substr( $block, 2 );
+		die "data payload should be 4 bytes" if length($data) != 4;
+		warn sprintf "## tag %9s %02d %s |%-4s|\n", $tag, $ord, as_hex( $data ), $data;
+		$tag_data_block->{$tag}->[ $ord ] = $data;
+	}
+	$tags_data->{ $tag } = join('', @{ $tag_data_block->{$tag} });
+	print "DATA $tag ",dump( $tags_data ), "\n";
+}
 
 sub read_tag {
 	my ( $tag ) = @_;
@@ -202,41 +225,21 @@
 	print "read_tag $tag\n";
 
 	cmd(
-		"D6 00  0D  02      $tag   00   03     1CC4", 'read $tag offset: 0 blocks: 3',
+		"D6 00  0D  02      $tag   00   03     1CC4", "read $tag offset: 0 blocks: 3",
 		"D6 00  0F  FE  00 00  05 01   $tag    941A", sub {
 			print "FIXME: tag $tag ready?\n";
 		},
 		"D6 00  1F  02 00", sub { # $tag  03   00 00   04 11 00 01   01 00   31 32 33 34   02 00   35 36 37 38    531F\n";
-			my $rest = shift || die "no rest?";
-			warn "## DATA ", dump( $rest ) if $debug;
-			my $tag = uc(unpack('H16',substr( $rest, 0, 8 )));
-			my $blocks = ord(substr($rest,8,1));
-			$rest = substr($rest,9); # leave just data blocks
-			my @data;
-			foreach my $nr ( 0 .. $blocks - 1 ) {
-				my $block = substr( $rest, $nr * 6, 6 );
-				warn "## block ",as_hex( $block ) if $debug;
-				my $ord   = unpack('v',substr( $block, 0, 2 ));
-				die "got block $ord, expected block $nr from ",dump( $block ) if $ord != $nr;
-				my $data  = substr( $block, 2 );
-				die "data payload should be 4 bytes" if length($data) != 4;
-				warn sprintf "## tag %08s %02d %s |%-4s|\n", $tag, $ord, as_hex( $data ), $data;
-				$data[ $ord ] = $data;
-			}
-			$tags_data->{ $tag } = join('', @data);
-			print "DATA $tag ",dump( $tags_data ), "\n";
-		}
+			read_tag_data( 0, @_ );
+		},
 	);
 
-	#        D6 00  1F  02 00   $tag   03   00 00   04 11 00 01   01 00   30 30 30 30   02 00   30 30 30 30    E5F4
-if (0) {
-	cmd(    "D6 00  0D  02      $tag   03   04     3970", 'read offset: 3 blocks: 4' );
-
-	#        D6 00  25  02 00   $tag   04                         03 00   30 30 00 00   04 00   00 00 00 00   
-	#                           $tag                              05 00   00 00 00 00   06 00   00 00 00 00    B9BA
-	warn "?? D6 00  25  02 00   $tag   04                         03 00   39 30 31 32   04 00   ....\n";
-}
-	warn "?? D6 00  0F  FE  00 00  05 01   $tag  941A ##### ready?\n";
+	cmd(
+		"D6 00  0D  02      $tag   03   04     3970", "read $tag offset: 3 blocks: 4",
+		"D6 00  25  02 00", sub { # $tag   04                         03 00   30 30 00 00   04 00   00 00 00 00   
+			read_tag_data( 3, @_ );
+		}
+	);
 
 }
 
@@ -291,6 +294,7 @@
 	my $data = '';
 	while ( length( $data ) < $len ) {
 		my ( $c, $b ) = $port->read(1);
+		die "no bytes on port: $!" unless defined $b;
 		#warn "## got $c bytes: ", as_hex($b), "\n";
 		$data .= $b;
 	}