Diff: verification.cpp

Revision:

47:e7d395119a63

Parent:

40:615dc8275648

--- a/verification.cpp	Wed Dec 10 09:42:12 2014 +0000
+++ b/verification.cpp	Tue Jan 06 11:05:29 2015 +0000
@@ -5,23 +5,25 @@
 #include    "serial_utilities.h"
 #include    "writing.h"
 #include    "isp.h"
+#include    "_user_settings.h"
 
 
-int     verify_binary_data( FILE *fp, int *transferred_size_p );
-int     verify_uucoded_data( FILE *fp, int *transferred_size_p );
+
+int     verify_binary_data( FILE *fp, int *transferred_size_p, int file_size );
+int     verify_uucoded_data( FILE *fp, int *transferred_size_p, int file_size );
 void    get_binary_from_uucode_str( char *b, int size );
 
 
-int verify_flash( FILE *fp, target_param *tpp, int *transferred_size_p )
+int verify_flash( FILE *fp, target_param *tpp, int *transferred_size_p, int file_size )
 {
     if ( tpp->write_type == BINARY )
-        return ( verify_binary_data( fp, transferred_size_p ) );
+        return ( verify_binary_data( fp, transferred_size_p, file_size ) );
     else
-        return ( verify_uucoded_data( fp, transferred_size_p ) );
+        return ( verify_uucoded_data( fp, transferred_size_p, file_size ) );
 }
 
 
-int verify_binary_data( FILE *fp, int *read_size_p )
+int verify_binary_data( FILE *fp, int *read_size_p, int file_size )
 {
     char    command_str[ STR_BUFF_SIZE ];
     int     read_size   = 0;
@@ -82,6 +84,10 @@
             break;
 
         read_size   += size;
+
+#ifdef ENABLE_PROGRESS_DISPLAY
+        show_progress( read_size, file_size );
+#endif
     }
 
     free( bf );
@@ -98,7 +104,7 @@
 #define     READ_SIZE   (LINE_BYTES * N_OF_LINES)
 
 
-int verify_uucoded_data( FILE *fp, int *read_size_p )
+int verify_uucoded_data( FILE *fp, int *read_size_p, int file_size )
 {
     char    command_str[ STR_BUFF_SIZE ];
     int     read_size   = 0;
@@ -146,6 +152,10 @@
             break;
 
         read_size   += size;
+
+#ifdef ENABLE_PROGRESS_DISPLAY
+        show_progress( read_size, file_size );
+#endif
     }
 
     free( bf );