fixes a one-too-many bug while writing a binary image to a flash rom

5 files changed, 81 insertions, 12 deletions

diff --git a/dev-embedded/jtag/ChangeLog b/dev-embedded/jtag/ChangeLog
index 020883c97630..5b6ed5d3e7ed 100644
--- a/dev-embedded/jtag/ChangeLog
+++ b/dev-embedded/jtag/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/jtag
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/ChangeLog,v 1.4 2004/06/24 22:07:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/ChangeLog,v 1.5 2004/07/12 23:05:33 stkn Exp $
+
+*jtag-0.5.1-r1 (13 Jul 2004)
+
+  13 Jul 2004; <stkn@gentoo.org> +files/jtag-0.5.1-no-erase-overshoot.diff,
+  +jtag-0.5.1-r1.ebuild:
+  fixes a bug where jtag would erease one block too many while writing
+  a binary image to a flash rom
 
   27 Mar 2004; Daniel Black <dragonheart@gentoo.org> jtag-0.5.1.ebuild,
   metadata.xml:
diff --git a/dev-embedded/jtag/Manifest b/dev-embedded/jtag/Manifest
index da449a05b074..1101625ce83e 100644
--- a/dev-embedded/jtag/Manifest
+++ b/dev-embedded/jtag/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8026a970d1ed0c553780657a164807bf ChangeLog 642
+MD5 49660c62b5cde100f8a4393b5358e32c ChangeLog 873
 MD5 b2b4bcd5c6b2090587f415d4ab61863e jtag-0.5.1.ebuild 735
 MD5 a28a809849d8cc98176478c8a7313876 metadata.xml 412
+MD5 1112e243780af1e38b0ff0e20d338449 jtag-0.5.1-r1.ebuild 842
 MD5 09b6f20c9fb4fecd8754d06560debd93 files/digest-jtag-0.5.1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA4W3PHTu7gpaalycRAoAWAJ9bS+Jnhi7sjZh0F/hwoMMjSLzh8ACeLq6s
-v4t7HueMkVU4pJ8Lwb+BC/k=
-=r0ey
------END PGP SIGNATURE-----
+MD5 ff63599d1407a461b7016e0df2158d78 files/jtag-0.5.1-no-erase-overshoot.diff 1132
+MD5 09b6f20c9fb4fecd8754d06560debd93 files/digest-jtag-0.5.1-r1 63
diff --git a/dev-embedded/jtag/files/digest-jtag-0.5.1-r1 b/dev-embedded/jtag/files/digest-jtag-0.5.1-r1
new file mode 100644
index 000000000000..b0fd9ba06199
--- /dev/null
+++ b/dev-embedded/jtag/files/digest-jtag-0.5.1-r1
@@ -0,0 +1 @@
+MD5 3171d51fec40e9f338ea2d388544fd66 jtag-0.5.1.tar.bz2 314857
diff --git a/dev-embedded/jtag/files/jtag-0.5.1-no-erase-overshoot.diff b/dev-embedded/jtag/files/jtag-0.5.1-no-erase-overshoot.diff
new file mode 100644
index 000000000000..a79450d2bf58
--- /dev/null
+++ b/dev-embedded/jtag/files/jtag-0.5.1-no-erase-overshoot.diff
@@ -0,0 +1,34 @@
+*** jtag-0.5.1/src/flash.c.orig	Wed Jun 23 14:02:44 2004
+--- jtag-0.5.1/src/flash.c	Wed Jun 23 14:03:39 2004
+***************
+*** 293,306 ****
+  		int bc = 0, bn = 0;
+  		int block_no = find_block( cfi, adr );
+  
+! 		if (!erased[block_no]) {
+  			flash_driver->unlock_block( cfi_array, adr );
+  			printf( _("\nblock %d unlocked\n"), block_no );
+  			printf( _("erasing block %d: %d\n"), block_no, flash_driver->erase_block( cfi_array, adr ) );
+  			erased[block_no] = 1;
+  		}
+  
+- 		bn = fread( b, 1, BSIZE, f );
+  		for (bc = 0; bc < bn; bc += flash_driver->bus_width) {
+  			int j;
+  			printf( _("addr: 0x%08X"), adr );
+--- 293,307 ----
+  		int bc = 0, bn = 0;
+  		int block_no = find_block( cfi, adr );
+  
+! 		bn = fread( b, 1, BSIZE, f );
+! 
+! 		if (bn && !erased[block_no]) {
+  			flash_driver->unlock_block( cfi_array, adr );
+  			printf( _("\nblock %d unlocked\n"), block_no );
+  			printf( _("erasing block %d: %d\n"), block_no, flash_driver->erase_block( cfi_array, adr ) );
+  			erased[block_no] = 1;
+  		}
+  
+  		for (bc = 0; bc < bn; bc += flash_driver->bus_width) {
+  			int j;
+  			printf( _("addr: 0x%08X"), adr );
diff --git a/dev-embedded/jtag/jtag-0.5.1-r1.ebuild b/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..b07c8f2e4396
--- /dev/null
+++ b/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/jtag/jtag-0.5.1-r1.ebuild,v 1.1 2004/07/12 23:05:33 stkn Exp $
+
+inherit eutils
+
+DESCRIPTION="software package for working with JTAG-aware (IEEE 1149.1) hardware devices (parts) and boards through JTAG adapter"
+HOMEPAGE="http://openwince.sourceforge.net/jtag/"
+SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
+
+KEYWORDS="x86 sparc"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="dev-embedded/include
+	sys-apps/gawk
+	sys-apps/grep
+	sys-apps/sed
+	sys-devel/gcc
+	sys-devel/gettext"
+RDEPEND="dev-embedded/include
+	virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-no-erase-overshoot.diff
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "failed to install"
+}