X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhelper%2Fcommand.h;h=94d981654c41eebb7d1c83a9fde917ae502777ab;hb=ef746e27c55c14b7a4f6381c490e5c175e409c0b;hp=557731563675ea8fae2e1729cdc58774ba61a929;hpb=d22270e0ed291d3b08fd03a25181b279ca5e0911;p=fw%2Fopenocd

diff --git a/src/helper/command.h b/src/helper/command.h
index 557731563..94d981654 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -51,16 +51,16 @@ enum command_mode
 	COMMAND_ANY,
 };
 
-struct command_context_s;
+struct command_context;
 
 /// The type signature for command context's output handler.
-typedef int (*command_output_handler_t)(struct command_context_s *context,
+typedef int (*command_output_handler_t)(struct command_context *context,
 				const char* line);
 
-typedef struct command_context_s
+struct command_context
 {
 	enum command_mode mode;
-	struct command_s *commands;
+	struct command *commands;
 	int current_target;
 	/* Execute a command.
 	 *
@@ -78,7 +78,7 @@ typedef struct command_context_s
 	 */
 	command_output_handler_t output_handler;
 	void *output_handler_priv;
-} command_context_t;
+};
 
 
 /**
@@ -87,8 +87,8 @@ typedef struct command_context_s
  * defining all such derivative types using this macro.
  */
 #define __COMMAND_HANDLER(name, extra...) \
-		int name(struct command_context_s *cmd_ctx, \
-				char *cmd, char **args, unsigned argc, ##extra)
+		int name(struct command_context *cmd_ctx, \
+				const char *args[], unsigned argc, ##extra)
 
 /**
  * Use this to macro to call a command helper (or a nested handler).
@@ -104,7 +104,7 @@ typedef struct command_context_s
  * variables in intervening scope(s) by accident.
  */
 #define CALL_COMMAND_HANDLER(name, extra...) \
-		name(cmd_ctx, cmd, args, argc, ##extra)
+		name(cmd_ctx, args, argc, ##extra)
 
 /**
  * Always use this macro to define new command handler functions.
@@ -125,21 +125,21 @@ typedef struct command_context_s
  * Use this macro to access the name of the command being handled,
  * rather than accessing the variable directly.  It may be moved.
  */
-#define CMD_NAME cmd
+#define CMD_NAME args[-1]
 
 
 /// The type signature for commands' handler functions.
 typedef __COMMAND_HANDLER((*command_handler_t));
 
-typedef struct command_s
+struct command
 {
 	char *name;
-	struct command_s *parent;
-	struct command_s *children;
+	struct command *parent;
+	struct command *children;
 	command_handler_t handler;
 	enum command_mode mode;
-	struct command_s *next;
-} command_t;
+	struct command *next;
+};
 
 /**
  * @param c The command to be named.
@@ -149,33 +149,33 @@ typedef struct command_s
  * are separated by single spaces.  The caller must free() the string
  * when done with it.
  */
-char *command_name(struct command_s *c, char delim);
+char *command_name(struct command *c, char delim);
 
-command_t* register_command(command_context_t *context,
-		command_t *parent, char *name, command_handler_t handler,
+struct command* register_command(struct command_context *context,
+		struct command *parent, char *name, command_handler_t handler,
 		enum command_mode mode, char *help);
 
-int unregister_command(command_context_t *context, char *name);
-int unregister_all_commands(command_context_t *context);
+int unregister_command(struct command_context *context, char *name);
+int unregister_all_commands(struct command_context *context);
 
-void command_set_output_handler(command_context_t* context,
+void command_set_output_handler(struct command_context* context,
 		command_output_handler_t output_handler, void *priv);
 
-command_context_t* copy_command_context(command_context_t* context);
+struct command_context* copy_command_context(struct command_context* context);
 
-int command_context_mode(command_context_t *context, enum command_mode mode);
+int command_context_mode(struct command_context *context, enum command_mode mode);
 
-command_context_t* command_init(void);
-int command_done(command_context_t *context);
+struct command_context* command_init(void);
+int command_done(struct command_context *context);
 
-void command_print(command_context_t *context, const char *format, ...)
+void command_print(struct command_context *context, const char *format, ...)
 		__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
-void command_print_sameline(command_context_t *context, const char *format, ...)
+void command_print_sameline(struct command_context *context, const char *format, ...)
 		__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
-int command_run_line(command_context_t *context, char *line);
-int command_run_linef(command_context_t *context, const char *format, ...)
+int command_run_line(struct command_context *context, char *line);
+int command_run_linef(struct command_context *context, const char *format, ...)
 		__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
-void command_output_text(command_context_t *context, const char *data);
+void command_output_text(struct command_context *context, const char *data);
 
 void process_jim_events(void);
 
@@ -190,7 +190,7 @@ extern int fast_and_dangerous;
 
 extern Jim_Interp *interp;
 
-void register_jim(command_context_t *context, const char *name, int (*cmd)(Jim_Interp *interp, int argc, Jim_Obj *const *argv), const char *help);
+void register_jim(struct command_context *context, const char *name, int (*cmd)(Jim_Interp *interp, int argc, Jim_Obj *const *argv), const char *help);
 
 long jim_global_long(const char *variable);