summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-09 21:23:38 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-09 21:39:46 -0800
commit841721929a63bb77379b1598d91ed85b85021734 (patch)
treee19107af12a54a6ea645426c61587dd02e608fa3
parent23d88e57748bece953ddf1063017152243abc93a (diff)
downloadopenocd+libswd-841721929a63bb77379b1598d91ed85b85021734.tar.gz
openocd+libswd-841721929a63bb77379b1598d91ed85b85021734.tar.bz2
openocd+libswd-841721929a63bb77379b1598d91ed85b85021734.tar.xz
openocd+libswd-841721929a63bb77379b1598d91ed85b85021734.zip
command.c: make commands static
Removes useless declarations, moving the handler functions to appear before their use in the (much bigger) command registriation function.
-rw-r--r--src/helper/command.c98
1 files changed, 48 insertions, 50 deletions
diff --git a/src/helper/command.c b/src/helper/command.c
index bd317e6b..d29b6ec3 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -47,9 +47,6 @@
int fast_and_dangerous = 0;
Jim_Interp *interp = NULL;
-int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
int run_command(command_context_t *context, command_t *c, char *words[], int num_words);
static void tcl_output(void *privData, const char *file, int line, const char *function, const char *string)
@@ -688,6 +685,54 @@ static int jim_capture(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
return retcode;
}
+/* sleep command sleeps for <n> miliseconds
+ * this is useful in target startup scripts
+ */
+static int handle_sleep_command(struct command_context_s *cmd_ctx,
+ char *cmd, char **args, int argc)
+{
+ bool busy = false;
+ if (argc == 2)
+ {
+ if (strcmp(args[1], "busy") == 0)
+ busy = true;
+ else
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+ else if (argc < 1 || argc > 2)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ unsigned long duration = 0;
+ int retval = parse_ulong(args[0], &duration);
+ if (ERROR_OK != retval)
+ return retval;
+
+ if (!busy)
+ {
+ long long then = timeval_ms();
+ while (timeval_ms() - then < (long long)duration)
+ {
+ target_call_timer_callbacks_now();
+ usleep(1000);
+ }
+ }
+ else
+ busy_sleep(duration);
+
+ return ERROR_OK;
+}
+
+static int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+ if (argc != 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ fast_and_dangerous = strcmp("enable", args[0]) == 0;
+
+ return ERROR_OK;
+}
+
+
command_context_t* command_init()
{
command_context_t* context = malloc(sizeof(command_context_t));
@@ -777,53 +822,6 @@ int command_context_mode(command_context_t *cmd_ctx, enum command_mode mode)
return ERROR_OK;
}
-/* sleep command sleeps for <n> miliseconds
- * this is useful in target startup scripts
- */
-int handle_sleep_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
-{
- bool busy = false;
- if (argc == 2)
- {
- if (strcmp(args[1], "busy") == 0)
- busy = true;
- else
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
- else if (argc < 1 || argc > 2)
- return ERROR_COMMAND_SYNTAX_ERROR;
-
- unsigned long duration = 0;
- int retval = parse_ulong(args[0], &duration);
- if (ERROR_OK != retval)
- return retval;
-
- if (!busy)
- {
- long long then = timeval_ms();
- while (timeval_ms() - then < (long long)duration)
- {
- target_call_timer_callbacks_now();
- usleep(1000);
- }
- }
- else
- busy_sleep(duration);
-
- return ERROR_OK;
-}
-
-int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
- if (argc != 1)
- return ERROR_COMMAND_SYNTAX_ERROR;
-
- fast_and_dangerous = strcmp("enable", args[0]) == 0;
-
- return ERROR_OK;
-}
-
void process_jim_events(void)
{
#if !BUILD_ECOSBOARD