2003-01-30 Marcel Telka <marcel@telka.sk>

* src/tap/cable/byteblaster.c (byteblaster_init): Added support for
		parallel ports with I/O addresses above 0x3FF.
	(byteblaster_done): Ditto.
	* src/tap/cable/dlc5.c (dlc5_init): Ditto.
	(dlc5_done): Ditto.
	* src/tap/cable/ea253.c (ea253_init): Ditto.
	(ea253_done): Ditto.
	* src/tap/cable/ei012.c (ei012_init): Ditto.
	(ei012_done): Ditto.
	* src/tap/cable/wiggler.c (wiggler_init): Ditto.
	(wiggler_done): Ditto.


git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@324 b68d4a1b-bc3d-0410-92ed-d4ac073336b7

jtag/ChangeLog

@@ -1,3 +1,17 @@
+2003-01-30  Marcel Telka  <marcel@telka.sk>
+
+	* src/tap/cable/byteblaster.c (byteblaster_init): Added support for
+		parallel ports with I/O addresses above 0x3FF.
+	(byteblaster_done): Ditto.
+	* src/tap/cable/dlc5.c (dlc5_init): Ditto.
+	(dlc5_done): Ditto.
+	* src/tap/cable/ea253.c (ea253_init): Ditto.
+	(ea253_done): Ditto.
+	* src/tap/cable/ei012.c (ei012_init): Ditto.
+	(ei012_done): Ditto.
+	* src/tap/cable/wiggler.c (wiggler_init): Ditto.
+	(wiggler_done): Ditto.
+
 2003-01-19  Marcel Telka  <marcel@telka.sk>
 
 	* configure.ac: Added AC_GNU_SOURCE.

jtag/NEWS

@@ -2,6 +2,7 @@ $Id$
 
 	* Added new manufacturer: Cypress. (patch 669157, Chris Ellec)
 	* Added new 'frequency' command to limit maximum TCK frequency
+	* Added support for parallel ports with I/O addresses above 0x3FF
 
 jtag-0.2.1 (2003-01-13):
 

jtag/src/tap/cable/byteblaster.c

@@ -59,13 +59,16 @@ byteblaster_init( unsigned int aport )
 {
 	tap_state_init();
 	port = aport;
-	return !ioperm( port, 2, 1 );
+	return !(((port + 2 <= 0x400) && ioperm( port, 2, 1 )) || ((port + 2 > 0x400) && iopl( 3 )));
 }
 
 static void
 byteblaster_done( void )
 {
-	ioperm( port, 2, 0 );
+	if (port + 2 <= 0x400)
+		ioperm( port, 2, 0 );
+	else
+		iopl( 0 );
 
 	tap_state_done();
 }

jtag/src/tap/cable/dlc5.c

@@ -59,13 +59,16 @@ dlc5_init( unsigned int aport )
 {
 	tap_state_init();
 	port = aport;
-	return !ioperm( port, 2, 1 );
+	return !(((port + 2 <= 0x400) && ioperm( port, 2, 1 )) || ((port + 2 > 0x400) && iopl( 3 )));
 }
 
 static void
 dlc5_done( void )
 {
-	ioperm( port, 2, 0 );
+	if (port + 2 <= 0x400)
+		ioperm( port, 2, 0 );
+	else
+		iopl( 0 );
 
 	tap_state_done();
 }

jtag/src/tap/cable/ea253.c

@@ -52,7 +52,7 @@ ea253_init( unsigned int aport )
 {
 	tap_state_init();
 	port = aport;
-	if (ioperm( port, 2, 1 ))
+	if (((port + 2 <= 0x400) && ioperm( port, 2, 1 )) || ((port + 2 > 0x400) && iopl( 3 )))
 		return 0;
 	tap_state_set_trst( (inb( port ) >> TRST) & 1 );
 
@@ -62,7 +62,10 @@ ea253_init( unsigned int aport )
 static void
 ea253_done( void )
 {
-	ioperm( port, 2, 0 );
+	if (port + 2 <= 0x400)
+		ioperm( port, 2, 0 );
+	else
+		iopl( 0 );
 
 	tap_state_done();
 }

jtag/src/tap/cable/ei012.c

@@ -53,7 +53,7 @@ ei012_init( unsigned int aport )
 {
 	tap_state_init();
 	port = aport;
-	if (ioperm( port, 2, 1 ))
+	if (((port + 2 <= 0x400) && ioperm( port, 2, 1 )) || ((port + 2 > 0x400) && iopl( 3 )))
 		return 0;
 	tap_state_set_trst( (inb( port ) >> TRST) & 1 );
 
@@ -63,7 +63,10 @@ ei012_init( unsigned int aport )
 static void
 ei012_done( void )
 {
-	ioperm( port, 2, 0 );
+	if (port + 2 <= 0x400)
+		ioperm( port, 2, 0 );
+	else
+		iopl( 0 );
 
 	tap_state_done();
 }

jtag/src/tap/cable/wiggler.c

@@ -56,7 +56,7 @@ wiggler_init( unsigned int aport )
 {
 	tap_state_init();
 	port = aport;
-	if (ioperm( port, 2, 1 ))
+	if (((port + 2 <= 0x400) && ioperm( port, 2, 1 )) || ((port + 2 > 0x400) && iopl( 3 )))
 		return 0;
 	tap_state_set_trst( (inb( port ) >> TRST) & 1 );
 
@@ -66,7 +66,10 @@ wiggler_init( unsigned int aport )
 static void
 wiggler_done( void )
 {
-	ioperm( port, 2, 0 );
+	if (port + 2 <= 0x400)
+		ioperm( port, 2, 0 );
+	else
+		iopl( 0 );
 
 	tap_state_done();
 }