From 4603b8c53bfff8582dfb2fa4037217861f3a9c39 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Tue, 3 Jun 2003 06:04:50 +0000 Subject: [PATCH] 2003-06-03 Marcel Telka * src/flash.c (flashmsbin, flashmem): Removed '\r' from translatable messages. * src/readmem.c (readmem): Ditto. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@457 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 5 +++++ jtag/src/flash.c | 12 ++++++++---- jtag/src/readmem.c | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index b1c96f08..14145395 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,8 @@ +2003-06-03 Marcel Telka + + * src/flash.c (flashmsbin, flashmem): Removed '\r' from translatable messages. + * src/readmem.c (readmem): Ditto. + 2003-06-03 Marcel Telka * src/cmd/Makefile.am (libcmd_a_SOURCES): Added peekpoke.c (patch 747447, Matan Ziv-Av). diff --git a/jtag/src/flash.c b/jtag/src/flash.c index 21742731..c2081c7f 100644 --- a/jtag/src/flash.c +++ b/jtag/src/flash.c @@ -165,7 +165,8 @@ flashmsbin( bus_t *bus, FILE *f ) while (l) { uint32_t data; - printf( _("addr: 0x%08X\r"), a ); + printf( _("addr: 0x%08X"), a ); + printf( "\r" ); fflush(stdout); fread( &data, sizeof data, 1, f ); if (flash_program( bus, a, data )) { @@ -204,7 +205,8 @@ flashmsbin( bus_t *bus, FILE *f ) while (l) { uint32_t data, readed; - printf( _("addr: 0x%08X\r"), a ); + printf( _("addr: 0x%08X"), a ); + printf( "\r" ); fflush( stdout ); fread( &data, sizeof data, 1, f ); readed = bus_read( bus, a ); @@ -266,7 +268,8 @@ flashmem( bus_t *bus, FILE *f, uint32_t addr ) bn = fread( b, 1, BSIZE, f ); for (bc = 0; bc < bn; bc += flash_driver->buswidth) { int j; - printf( _("addr: 0x%08X\r"), adr ); + printf( _("addr: 0x%08X"), adr ); + printf( "\r" ); fflush( stdout ); data = 0; @@ -311,7 +314,8 @@ flashmem( bus_t *bus, FILE *f, uint32_t addr ) else data |= buf[j] << (j * 8); - printf( _("addr: 0x%08X\r"), adr ); + printf( _("addr: 0x%08X"), adr ); + printf( "\r" ); fflush( stdout ); readed = bus_read( bus, adr ); if (data != readed) { diff --git a/jtag/src/readmem.c b/jtag/src/readmem.c index 1fb031ae..d1052eb8 100644 --- a/jtag/src/readmem.c +++ b/jtag/src/readmem.c @@ -244,7 +244,8 @@ readmem( bus_t *bus, FILE *f, uint32_t addr, uint32_t len ) } if ((bc >= BSIZE) || (a >= (addr + len)) ) { - printf( _("addr: 0x%08X\r"), a ); + printf( _("addr: 0x%08X"), a ); + printf( "\r" ); fwrite( b, bc, 1, f ); bc = 0; }