From bed752ec0f90ea84b6947ccbad0aa40664efca18 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Tue, 18 Feb 2003 13:25:53 +0000
Subject: [PATCH] 2003-02-18  Marcel Telka  <marcel@telka.sk>

	* src/flash.c (flashmsbin): Changed flash error message.
	(flashmem): Changed output messages. Enabled verify for 2 x 16, not
		for 1 x 16. Added betted and of file test for verify.


git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@369 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 jtag/ChangeLog   |  6 ++++++
 jtag/src/flash.c | 25 ++++++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 61f6ee7b..a10d7f41 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-18  Marcel Telka  <marcel@telka.sk>
+
+	* src/flash.c (flashmsbin): Changed flash error message.
+	(flashmem): Changed output messages. Enabled verify for 2 x 16, not
+		for 1 x 16. Added betted and of file test for verify.
+
 2003-02-18  Marcel Telka  <marcel@telka.sk>
 
 	* configure.ac (AC_CONFIG_FILES): Added src/bus/Makefile.
diff --git a/jtag/src/flash.c b/jtag/src/flash.c
index 9e5e7aff..a9ff1403 100644
--- a/jtag/src/flash.c
+++ b/jtag/src/flash.c
@@ -181,7 +181,7 @@ flashmsbin( parts *ps, FILE *f )
 			fflush(stdout);
 			fread( &data, sizeof data, 1, f );
 			if (flash_program( ps, a, data )) {
-				printf( "\nflash error 1\n" );
+				printf( "\nflash error\n" );
 				return;
 			}
 			a += 4;
@@ -268,25 +268,24 @@ flashmem( parts *ps, FILE *f, uint32_t addr )
 		char b[BSIZE];
 		int bc = 0, bn = 0;
 		int block_no = adr / (cfi->device_geometry.erase_block_regions[0].erase_block_size * flash_driver->buswidth / 2);
-		printf( "addr: 0x%08X\r", adr );
-		fflush( stdout );
 
 		if (!erased[block_no]) {
 			flash_unlock_block( ps, adr );
-			printf( "block %d unlocked\n", block_no );
+			printf( "\nblock %d unlocked\n", block_no );
 			printf( "erasing block %d: %d\n", block_no, flash_erase_block( ps, adr ) );
 			erased[block_no] = 1;
 		}
 
 		bn = fread( b, 1, BSIZE, f );
-		printf("addr 0x%08X (n is %d)\n", adr, bn);
 		for (bc = 0; bc < bn; bc += flash_driver->buswidth) {
+			printf( "addr: 0x%08X\r", adr );
+			fflush( stdout );
 			if (flash_driver->buswidth == 2)
 				data = htons( *((uint16_t *) &b[bc]) );
 			else
 				data = * ((uint32_t *) &b[bc]);
 			if (flash_program( ps, adr, data )) {
-				printf( "\nflash error 2\n" );
+				printf( "\nflash error\n" );
 				return;
 			}
 			adr += flash_driver->buswidth;
@@ -296,19 +295,27 @@ flashmem( parts *ps, FILE *f, uint32_t addr )
 
 	flash_readarray( ps );
 
-	if (flash_driver->buswidth == 2) {			/* TODO: not available in 1 x 16 bit mode */
+	if (flash_driver->buswidth == 4) {			/* TODO: not available in 1 x 16 bit mode */
 	fseek( f, 0, SEEK_SET );
 	printf( "verify:\n" );
+	fflush( stdout );
 	adr = addr;
 	while (!feof( f )) {
 		uint32_t data;
 		uint32_t readed;
+
+		if (fread( &data, flash_driver->buswidth, 1, f ) != 1) {
+			if (feof(f))
+				break;
+			printf( "Error during file read.\n" );
+			return;
+		}
+
 		printf( "addr: 0x%08X\r", adr );
 		fflush( stdout );
-		fread( &data, flash_driver->buswidth, 1, f );
 		readed = bus_read( ps, adr );
 		if (data != readed) {
-			printf( "\nverify error: 0x%08X vs. 0x%08X at addr %08X\n", readed, data, adr );
+			printf( "\nverify error:\nreaded: 0x%08X\nexpected: 0x%08X\n", readed, data );
 			return;
 		}
 		adr += flash_driver->buswidth;