Diff: verification.cpp

Revision:

27:2b5c1eb39bb5

Parent:

26:a63e73885b21

Child:

28:689c3880e0e4

--- a/verification.cpp	Fri Sep 13 12:56:23 2013 +0000
+++ b/verification.cpp	Thu Sep 19 01:08:20 2013 +0000
@@ -14,11 +14,9 @@
 int verify_flash( FILE *fp, target_param *tpp )
 {
     if ( tpp->write_type == BINARY )
-        verify_binary_data( fp );
+        return ( verify_binary_data( fp ) );
     else
-        verify_uucoded_data( fp );
-
-    return ( 0 );   //  this is temporallry return code
+        return ( verify_uucoded_data( fp ) );
 }
 
 
@@ -65,7 +63,8 @@
 
         sprintf( command_str, "R %ld %ld\r\n", read_size, size );
 //        try_and_check( command_str, "0", MODE_SILENT );
-        try_and_check( command_str, "0", 0 );
+        if ( try_and_check( command_str, "0", 0 ) )
+            return ( ERROR_AT_READ_COMMAND );
 
         get_binary( br, 1 );
         get_binary( br, size );
@@ -94,7 +93,7 @@
     free( bf );
     free( br );
 
-    return ( read_size );
+    return ( error_flag ? ERROR_DATA_DOES_NOT_MATCH : NO_ERROR );
 }
 
 
@@ -129,7 +128,8 @@
         }
 
         sprintf( command_str, "R %ld %ld\r\n", read_size, size );
-        try_and_check( command_str, "0", 0 );
+        if ( try_and_check( command_str, "0", 0 ) )
+            return ( ERROR_AT_READ_COMMAND );
 
         get_binary_from_uucode_str( br, size );
 
@@ -156,7 +156,7 @@
     free( bf );
     free( br );
 
-    return ( read_size );
+    return ( error_flag ? ERROR_DATA_DOES_NOT_MATCH : NO_ERROR );
 }