summaryrefslogtreecommitdiff
path: root/common/command.c
diff options
context:
space:
mode:
authorKim Phillips <[email protected]>2013-02-04 11:16:26 -0600
committerKim Phillips <[email protected]>2013-02-04 11:16:26 -0600
commit9a32084ea0cf55d22384f083002ee9932e074f31 (patch)
tree726a2ee288654832876f3e81ff5f1d356e784e13 /common/command.c
parent8f171a56b58e2e89d0e5e995f074f774c2d64bc3 (diff)
parent2d795c9621de274cb0cb8cf4af5941293f89c3be (diff)
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'common/command.c')
-rw-r--r--common/command.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/command.c b/common/command.c
index 50c84292c16..305a236facc 100644
--- a/common/command.c
+++ b/common/command.c
@@ -513,7 +513,7 @@ static int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
enum command_ret_t cmd_process(int flag, int argc, char * const argv[],
- int *repeatable)
+ int *repeatable, ulong *ticks)
{
enum command_ret_t rc = CMD_RET_SUCCESS;
cmd_tbl_t *cmdtp;
@@ -543,7 +543,11 @@ enum command_ret_t cmd_process(int flag, int argc, char * const argv[],
/* If OK so far, then do the command */
if (!rc) {
+ if (ticks)
+ *ticks = get_timer(0);
rc = cmd_call(cmdtp, flag, argc, argv);
+ if (ticks)
+ *ticks = get_timer(*ticks);
*repeatable &= cmdtp->repeatable;
}
if (rc == CMD_RET_USAGE)