From 75b7508355e51d14296a9e12938f7468555db6e9 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Tue, 18 Mar 2003 23:29:22 +0000
Subject: [PATCH] 2003-03-18  Marcel Telka  <marcel@telka.sk>

	* src/tap/parport/direct.c (direct_connect): Fixed cable disconnecting loop.


git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@402 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 jtag/ChangeLog                |  4 ++++
 jtag/NEWS                     |  2 ++
 jtag/src/tap/parport/direct.c | 18 ++++++++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 0323db03..b98a0c95 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-18  Marcel Telka  <marcel@telka.sk>
+
+	* src/tap/parport/direct.c (direct_connect): Fixed cable disconnecting loop.
+
 2003-03-18  Marcel Telka  <marcel@telka.sk>
 
 	* src/jtag.c (jtag_parse_line) <script>: Added support for `quit' command in scripts.
diff --git a/jtag/NEWS b/jtag/NEWS
index d98b6b10..f9fc8c7d 100644
--- a/jtag/NEWS
+++ b/jtag/NEWS
@@ -1,5 +1,7 @@
 $Id$
 
+jtag-0.3.1:
+
 	* Added support for Intel PXA255 A0 (thanks to Mike Sprauve).
 	* Added support for running scripts specified as jtag command line parameters.
 	* Added support for comments in scripts. Lines started with `#' are treated as
diff --git a/jtag/src/tap/parport/direct.c b/jtag/src/tap/parport/direct.c
index 0c341f0b..e786ec39 100644
--- a/jtag/src/tap/parport/direct.c
+++ b/jtag/src/tap/parport/direct.c
@@ -106,7 +106,7 @@ direct_connect( const char **par, int parnum )
 {
 	int i;
 	unsigned int port;
-	port_node_t *pn;
+	port_node_t *pn = ports;
 	parport_t *parport;
 	cable_t *cable;
 
@@ -120,15 +120,17 @@ direct_connect( const char **par, int parnum )
 		return NULL;
 	}
 
-	for (pn = ports; pn; pn = pn->next) {
-		unsigned int aport;
+	while (pn)
+		for (pn = ports; pn; pn = pn->next) {
+			unsigned int aport;
 
-		aport = ((direct_params_t*) pn->port->params)->port;
-		if (abs( aport - port ) < 3) {
-			printf( _("Disconnecting %s from parallel port at 0x%x\n"), pn->port->cable->driver->description, aport );
-			pn->port->cable->driver->disconnect( pn->port->cable );
+			aport = ((direct_params_t*) pn->port->params)->port;
+			if (abs( aport - port ) < 3) {
+				printf( _("Disconnecting %s from parallel port at 0x%x\n"), pn->port->cable->driver->description, aport );
+				pn->port->cable->driver->disconnect( pn->port->cable );
+				break;
+			}
 		}
-	}
 
 	if (strcmp( par[1], "none" ) == 0) {
 		printf( _("Changed cable to 'none'\n") );