From bc9a445bf7d076c1ff5a950e1ae04dae8169f2f8 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Mon, 18 Aug 2003 08:51:00 +0000 Subject: [PATCH] 2003-08-18 Marcel Telka * src/detect.c (detect_parts): Marked one forgotten string for translation. * src/cmd/bit.c (cmd_bit_run): Fixed control bit setup. * src/cmd/eraseflash.c (cmd_eraseflash_run): Changed formatting. (cmd_eraseflash_help): Updated help text. * src/cmd/flashmem.c (cmd_flashmem_help): Ditto. * src/cmd/readmem.c (cmd_readmem_help): Ditto. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@516 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 9 +++++++++ jtag/src/cmd/bit.c | 1 + jtag/src/cmd/eraseflash.c | 12 ++++++------ jtag/src/cmd/flashmem.c | 4 +--- jtag/src/cmd/readmem.c | 4 +--- jtag/src/detect.c | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 655b6b17..2cf3e3ae 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,12 @@ +2003-08-18 Marcel Telka + + * src/detect.c (detect_parts): Marked one forgotten string for translation. + * src/cmd/bit.c (cmd_bit_run): Fixed control bit setup. + * src/cmd/eraseflash.c (cmd_eraseflash_run): Changed formatting. + (cmd_eraseflash_help): Updated help text. + * src/cmd/flashmem.c (cmd_flashmem_help): Ditto. + * src/cmd/readmem.c (cmd_readmem_help): Ditto. + 2003-08-14 Marcel Telka * include/jtag.h (flasherase): New function prototype (patch 772267, Thomas Fröhlich). diff --git a/jtag/src/cmd/bit.c b/jtag/src/cmd/bit.c index f833ee2e..1d81201b 100644 --- a/jtag/src/cmd/bit.c +++ b/jtag/src/cmd/bit.c @@ -126,6 +126,7 @@ cmd_bit_run( char *params[] ) printf( _("invalid control bit number\n") ); return 1; } + part->bsbits[bit]->control = control; /* control value */ if (strlen( params[6] ) != 1) diff --git a/jtag/src/cmd/eraseflash.c b/jtag/src/cmd/eraseflash.c index c0256cee..5f6d97da 100644 --- a/jtag/src/cmd/eraseflash.c +++ b/jtag/src/cmd/eraseflash.c @@ -52,7 +52,8 @@ cmd_eraseflash_run( char *params[] ) if (cmd_get_number( params[2], &number )) return -1; flasherase( bus, adr, number ); - return 1; + + return 1; } static void @@ -62,16 +63,15 @@ cmd_eraseflash_help( void ) printf( _( "Usage: %s ADDR BLOCKS\n" + "Erase flash memory from ADDR.\n" "\n" "ADDR target addres for erasing block\n" "BLOCKS number of blocks to erase\n" "\n" - "ADDR could be in decimal or hexadecimal (prefixed with 0x) form.\n" - "BLOCKS musst be in decimal form; count from 1\n" + "ADDR and BLOCKS could be in decimal or hexadecimal (prefixed with 0x) form.\n" "\n" - "'%s' works only with part 0. Part 0 must support bus operations.\n" - "Supported Flash Memories\n" - ), "eraseflash", "eraseflash"); + "Supported Flash Memories:\n" + ), "eraseflash" ); for (i = 0; flash_drivers[i]; i++) printf( _("%s\n %s\n"), _(flash_drivers[i]->name), _(flash_drivers[i]->description) ); diff --git a/jtag/src/cmd/flashmem.c b/jtag/src/cmd/flashmem.c index 13d85c6d..0cf011de 100644 --- a/jtag/src/cmd/flashmem.c +++ b/jtag/src/cmd/flashmem.c @@ -82,10 +82,8 @@ cmd_flashmem_help( void ) "\n" "ADDR could be in decimal or hexadecimal (prefixed with 0x) form.\n" "\n" - "`%s' command works only with part 0. Part 0 must support bus operations.\n" - "\n" "Supported Flash Memories:\n" - ), "flashmem", "flashmem msbin", "msbin", "flashmem" ); + ), "flashmem", "flashmem msbin", "msbin" ); for (i = 0; flash_drivers[i]; i++) printf( _("%s\n %s\n"), _(flash_drivers[i]->name), _(flash_drivers[i]->description) ); diff --git a/jtag/src/cmd/readmem.c b/jtag/src/cmd/readmem.c index d8d20960..95ad6c59 100644 --- a/jtag/src/cmd/readmem.c +++ b/jtag/src/cmd/readmem.c @@ -72,9 +72,7 @@ cmd_readmem_help( void ) "FILENAME name of the output file\n" "\n" "ADDR and LEN could be in decimal or hexadecimal (prefixed with 0x) form.\n" - "\n" - "`%s' command works only with part 0. Part 0 must support bus operations.\n" - ), "readmem", "readmem" ); + ), "readmem" ); } cmd_t cmd_readmem = { diff --git a/jtag/src/detect.c b/jtag/src/detect.c index 920eaafb..2bb6c5bf 100644 --- a/jtag/src/detect.c +++ b/jtag/src/detect.c @@ -297,7 +297,7 @@ detect_parts( chain_t *chain, char *db_path ) } register_free( key ); - printf( " Part: %s\n", idr.fullname ); + printf( _(" Part: %s\n"), idr.fullname ); if (strlen( idr.fullname ) > MAXLEN_PART) printf( _("Warning: Part too long\n") ); strncpy( partname, idr.fullname, MAXLEN_PART );