[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-73-gb800eb0

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  b800eb0336a190ed53da90a2b7216a35bfbfdb23 (commit)
       via  1a2c258ed4537ca95b50e1f9e776215d82de2a86 (commit)
      from  c1cb20971ea89e4602bb23ba66180d647880bbef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b800eb0336a190ed53da90a2b7216a35bfbfdb23
Author: David Brownell <dbr...@us...>
Date:   Fri Jan 8 20:16:05 2010 -0800

    *SVF: help/usage updates
    
    Usage messages should use the same EBNF as the User's Guide;
    no angle brackets.  Be more complete too ... some params were
    missing.
    
    Don't use "&function"; its name is its address.
    
    Unrelated: fix typo in one "target.c" usage message.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index dfdecbc..7cb2200 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -1461,10 +1461,10 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 static const struct command_registration svf_command_handlers[] = {
 	{
 		.name = "svf",
-		.handler = &handle_svf_command,
+		.handler = handle_svf_command,
 		.mode = COMMAND_EXEC,
 		.help = "Runs a SVF file.",
-		.usage = "<file>",
+		.usage = "filename ['quiet']",
 	},
 	COMMAND_REGISTRATION_DONE
 };
diff --git a/src/target/target.c b/src/target/target.c
index c29c45e..7994aff 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -4916,7 +4916,7 @@ static const struct command_registration target_exec_command_handlers[] = {
 		.handler = handle_virt2phys_command,
 		.mode = COMMAND_ANY,
 		.help = "translate a virtual address into a physical address",
-		.usage = "virual_address",
+		.usage = "virtual_address",
 	},
 	{
 		.name = "reg",
diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index b1ddea9..539fbdc 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -1053,13 +1053,13 @@ COMMAND_HANDLER(handle_xsvf_command)
 static const struct command_registration xsvf_command_handlers[] = {
 	{
 		.name = "xsvf",
-		.handler = &handle_xsvf_command,
+		.handler = handle_xsvf_command,
 		.mode = COMMAND_EXEC,
 		.help = "Runs a XSVF file.  If 'virt2' is given, xruntest "
 			"counts are interpreted as TCK cycles rather than "
 			"as microseconds.  Without the 'quiet' option, all "
 			"comments, retries, and mismatches will be reported.",
-		.usage = "<file> [virt2] [quiet]",
+		.usage = "(tapname|'plain') filename ['virt2'] ['quiet']",
 	},
 	COMMAND_REGISTRATION_DONE
 };

commit 1a2c258ed4537ca95b50e1f9e776215d82de2a86
Author: David Brownell <dbr...@us...>
Date:   Fri Jan 8 20:12:18 2010 -0800

    MFLASH: help/usage updates
    
    Make "usage" messages use the same EBNF as the User's Guide;
    no angle brackets.  Improve and correct various helptexts.
    
    Don't use "&function"; a function's name is its address.
    Remove a couple instances of pointless whitespace.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 04f5c77..289fe5e 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -762,7 +762,7 @@ COMMAND_HANDLER(mg_write_cmd)
 	return ERROR_OK;
 
 mg_write_cmd_err:
- 	free(buffer);
+	free(buffer);
 	fileio_close(&fileio);
 
 	return ret;
@@ -829,7 +829,7 @@ COMMAND_HANDLER(mg_dump_cmd)
 	return ERROR_OK;
 
 mg_dump_cmd_err:
- 	free(buffer);
+	free(buffer);
 	fileio_close(&fileio);
 
 	return ret;
@@ -1271,30 +1271,33 @@ COMMAND_HANDLER(mg_config_cmd)
 static const struct command_registration mflash_exec_command_handlers[] = {
 	{
 		.name = "probe",
-		.handler = &mg_probe_cmd,
+		.handler = mg_probe_cmd,
 		.mode = COMMAND_EXEC,
 		.help = "Detect bank configuration information",
 	},
 	{
 		.name = "write",
-		.handler = &mg_write_cmd,
+		.handler = mg_write_cmd,
 		.mode = COMMAND_EXEC,
-		.usage = "<num> <file> <address>",
-		.help = "Write a file at the specified address",
+		/* FIXME bank_num is unused */
+		.usage = "bank_num filename address",
+		.help = "Write binary file at the specified address.",
 	},
 	{
 		.name = "dump",
-		.handler = &mg_dump_cmd,
+		.handler = mg_dump_cmd,
 		.mode = COMMAND_EXEC,
-		.usage = "<num> <file> <address> <size>",
-		.help = "Dump to a file from the specified address",
+		/* FIXME bank_num is unused */
+		.usage = "bank_num filename address size",
+		.help = "Write specified number of bytes from a binary file "
+			"to the specified, address.",
 	},
 	{
 		.name = "config",
-		.handler = &mg_config_cmd,
+		.handler = mg_config_cmd,
 		.mode = COMMAND_EXEC,
-		.usage = "<num> <stage>",
-		.help = "Dump to a file from the specified address",
+		.help = "Configure MFLASH options.",
+		.usage = "('boot'|'storage'|'pll' frequency)",
 	},
 	COMMAND_REGISTRATION_DONE
 };
@@ -1367,15 +1370,15 @@ COMMAND_HANDLER(mg_bank_cmd)
 static const struct command_registration mflash_config_command_handlers[] = {
 	{
 		.name = "bank",
-		.handler = &mg_bank_cmd,
+		.handler = mg_bank_cmd,
 		.mode = COMMAND_CONFIG,
 		.help = "configure a mflash device bank",
-		.usage = "<soc> <base> <RST pin> <target #>",
+		.usage = "soc_type base_addr pin_id target",
 	},
 	{
 		.name = "init",
 		.mode = COMMAND_CONFIG,
-		.handler = &handle_mflash_init_command,
+		.handler = handle_mflash_init_command,
 		.help = "initialize mflash devices",
 	},
 	COMMAND_REGISTRATION_DONE

-----------------------------------------------------------------------

Summary of changes:
 src/flash/mflash.c  |   33 ++++++++++++++++++---------------
 src/svf/svf.c       |    4 ++--
 src/target/target.c |    2 +-
 src/xsvf/xsvf.c     |    4 ++--
 4 files changed, 23 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository