Reverted a few prefix-replaced strings (discovery, readmem, writemem, detectflash, flashmem)

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

urjtag/src/bus/jopcyc.c

@@ -42,7 +42,7 @@
  *
  *   JTAG Tool generates byte addresses when accessing memories. Thus
  *   this driver discards the LSB when the RAM ranges are addressed.
- *   urj_bus_readmem and urj_bus_writemem care for proper address increment based on
+ *   readmem and writemem care for proper address increment based on
  *   the bus width.
  *   On the other hand, this driver reads and writes always one word
  *   (= 2 bytes) from/to the RAMs. It does not use the byte-enables.

urjtag/src/bus/s3c4510x.c

@@ -531,7 +531,7 @@ const urj_bus_driver_t urj_bus_s3c4510_bus = {
 **  Revision 1.3  2003/08/28 07:26:02  telka
 **  2003-08-28  Marcel Telka  <marcel@telka.sk>
 **
-**      * src/urj_bus_readmem.c (urj_bus_readmem): Replaced bus_width macro with new URJ_BUS_AREA.
+**      * src/readmem.c (readmem): Replaced bus_width macro with new URJ_BUS_AREA.
 **      * src/bus/bcm1250.c (bcm1250_bus_width): Function removed.
 **      (bcm1250_bus_area): New function.
 **      * src/bus/ixp425.c (ixp425_bus_width): Function removed.

urjtag/src/bus/zefant-xs3.c

@@ -42,7 +42,7 @@
  *
  *   JTAG Tool generates byte addresses when accessing memories. Thus
  *   this driver discards the LSB when the RAM and flash ranges are
- *   addressed. urj_bus_readmem and urj_bus_writemem care for proper address increment
+ *   addressed. readmem and writemem care for proper address increment
  *   based on the bus width.
  *   On the other hand, this driver reads and writes always one word
  *   (= 2 bytes) from/to the RAMs. It does not use the byte-enables.

urjtag/src/cmd/cmd_detectflash.c

@@ -59,11 +59,11 @@ cmd_detectflash_help (void)
               "Detect flash memory type connected to a part.\n"
               "\n"
               "ADDRESS    Base address for memory region\n"),
-            "urj_flash_detectflash");
+            "detectflash");
 }
 
 urj_cmd_t urj_cmd_detectflash = {
-    "urj_flash_detectflash",
+    "detectflash",
     N_("detect parameters of flash chips attached to a part"),
     cmd_detectflash_help,
     cmd_detectflash_run

urjtag/src/cmd/cmd_discovery.c

@@ -56,13 +56,13 @@ cmd_discovery_help (void)
               " 2. DR (data register) length for all possible instructions\n"
               "\n"
               "Warning: This may be dangerous for some parts (especially if the\n"
-              "part doesn't have TRST signal).\n"), "urj_tap_discovery",
-            "urj_tap_discovery");
+              "part doesn't have TRST signal).\n"), "discovery",
+            "discovery");
 }
 
 urj_cmd_t urj_cmd_discovery = {
-    "urj_tap_discovery",
-    N_("urj_tap_discovery of unknown parts in the JTAG chain"),
+    "discovery",
+    N_("discovery of unknown parts in the JTAG chain"),
     cmd_discovery_help,
     cmd_discovery_run
 };

urjtag/src/cmd/cmd_flashmem.c

@@ -91,8 +91,8 @@ cmd_flashmem_help (void)
               "\n"
               "ADDR could be in decimal or hexadecimal (prefixed with 0x) form.\n"
               "\n"
-              "Supported Flash Memories:\n"), "urj_flashmem",
-            "urj_flashmem msbin", "msbin", "noverify");
+              "Supported Flash Memories:\n"), "flashmem",
+            "flashmem msbin", "msbin", "noverify");
 
     for (i = 0; urj_flash_flash_drivers[i]; i++)
         printf (_("%s\n     %s\n"), _(urj_flash_flash_drivers[i]->name),
@@ -100,7 +100,7 @@ cmd_flashmem_help (void)
 }
 
 urj_cmd_t urj_cmd_flashmem = {
-    "urj_flashmem",
+    "flashmem",
     N_("burn flash memory with data from a file"),
     cmd_flashmem_help,
     cmd_flashmem_run

urjtag/src/cmd/cmd_print.c

@@ -198,7 +198,7 @@ cmd_print_run (urj_chain_t *chain, char *params[])
                 if (URJ_BUS_AREA (urj_bus, a, &area) != URJ_STATUS_OK)
                 {
                     printf (_
-                            ("Error in bus area urj_tap_discovery at 0x%08llX\n"),
+                            ("Error in bus area discovery at 0x%08llX\n"),
                             (long long unsigned int) a);
                     break;
                 }

urjtag/src/cmd/cmd_readmem.c

@@ -74,11 +74,11 @@ 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"),
-            "urj_bus_readmem");
+            "readmem");
 }
 
 urj_cmd_t urj_cmd_readmem = {
-    "urj_bus_readmem",
+    "readmem",
     N_("read content of the memory and write it to file"),
     cmd_readmem_help,
     cmd_readmem_run

urjtag/src/cmd/cmd_writemem.c

@@ -73,11 +73,11 @@ cmd_writemem_help (void)
               "\n"
               "ADDR and LEN could be in decimal or hexadecimal (prefixed with 0x) form.\n"
               "NOTE: This is NOT useful for FLASH programming!\n"),
-            "urj_bus_writemem");
+            "writemem");
 }
 
 urj_cmd_t urj_cmd_writemem = {
-    "urj_bus_writemem",
+    "writemem",
     N_("write content of file to the memory"),
     cmd_writemem_help,
     cmd_writemem_run