diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 61f03a48..4c1a5d8f 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,11 @@ +2003-03-18 Marcel Telka + + * po/POTFILES.in: Added src/tap/parport/direct.c and src/tap/parport/ppdev.c. + * src/help.c (help) : Added help for `cable ppdev' command. + * src/tap/parport/ppdev.c (ppdev_open): Removed debug messages. + * src/jtag.c (jtag_parse_line) : Added chain_disconnect() call before + new cable connection. + 2003-03-18 Marcel Telka * configure.ac (AC_CHECK_HEADERS): Added test for linux/ppdev.h. diff --git a/jtag/po/POTFILES.in b/jtag/po/POTFILES.in index e5dbd8d6..2c361a9d 100644 --- a/jtag/po/POTFILES.in +++ b/jtag/po/POTFILES.in @@ -3,4 +3,6 @@ src/help.c src/jtag.c src/tap/chain.c +src/tap/parport/direct.c +src/tap/parport/ppdev.c src/tap/tap.c diff --git a/jtag/src/help.c b/jtag/src/help.c index d3ca8ace..1dd89e66 100644 --- a/jtag/src/help.c +++ b/jtag/src/help.c @@ -93,17 +93,19 @@ help( const char *cmd ) printf( _("Usage: %s PORTADDR CABLE\n" + "Usage: %s DEV CABLE\n" "Select JTAG cable connected to parallel port.\n" "\n" "PORTADDR parallel port address (e.g. 0x378)\n" "CABLE cable type\n" + "DEV ppdev device (e.g. /dev/parport0)\n" "\n" "List of supported cables:\n" - "none No cable connected\n"), "cable parallel" + "%-14sNo cable connected\n"), "cable parallel", "cable ppdev", "none" ); for (i = 0; cable_drivers[i]; i++) - printf( "%-14s%s\n", cable_drivers[i]->name, cable_drivers[i]->description ); + printf( "%-14s%s\n", cable_drivers[i]->name, _(cable_drivers[i]->description) ); } else if (strcmp( cmd, "detect" ) == 0) printf( _("Usage: %s\n" diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c index 466bb78d..5e99e416 100644 --- a/jtag/src/jtag.c +++ b/jtag/src/jtag.c @@ -220,6 +220,7 @@ jtag_parse_line( char *line ) return 1; } + chain_disconnect( chain ); chain->cable = parport_drivers[i]->connect( params, numpar ); if (!chain->cable) { printf( _("Error: Cable connection failed!\n") ); diff --git a/jtag/src/tap/parport/ppdev.c b/jtag/src/tap/parport/ppdev.c index 8bd619e0..85b589e5 100644 --- a/jtag/src/tap/parport/ppdev.c +++ b/jtag/src/tap/parport/ppdev.c @@ -167,9 +167,7 @@ ppdev_open( parport_t *parport ) { ppdev_params_t *p = parport->params; - printf( "Opening port: %s\n", p->portname ); p->fd = open( p->portname, O_RDWR ); - printf( "Result: %d\n", p->fd ); if (p->fd < 0) return -1;