projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command_t -> struct command
[fw/openocd]
/
src
/
helper
/
command.h
diff --git
a/src/helper/command.h
b/src/helper/command.h
index fbcc0aa0d6db3332585da7e11107a4415212797c..94d981654c41eebb7d1c83a9fde917ae502777ab 100644
(file)
--- a/
src/helper/command.h
+++ b/
src/helper/command.h
@@
-51,16
+51,16
@@
enum command_mode
COMMAND_ANY,
};
COMMAND_ANY,
};
-struct command_context
_s
;
+struct command_context;
/// The type signature for command context's output handler.
/// 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);
const char* line);
-typedef struct command_context_s
+struct command_context
{
enum command_mode mode;
{
enum command_mode mode;
- struct command
_s
*commands;
+ struct command *commands;
int current_target;
/* Execute a command.
*
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_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...) \
* defining all such derivative types using this macro.
*/
#define __COMMAND_HANDLER(name, extra...) \
- int name(struct command_context
_s
*cmd_ctx, \
- const char *
cmd, const 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).
/**
* 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...) \
* 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.
/**
* 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.
*/
* 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));
/// The type signature for commands' handler functions.
typedef __COMMAND_HANDLER((*command_handler_t));
-typedef struct command_s
+struct command
{
char *name;
{
char *name;
- struct command
_s
*parent;
- struct command
_s
*children;
+ struct command *parent;
+ struct command *children;
command_handler_t handler;
enum command_mode mode;
command_handler_t handler;
enum command_mode mode;
- struct command
_s
*next;
-}
command_t
;
+ struct command *next;
+};
/**
* @param c The command to be named.
/**
* @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.
*/
* 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_contex
t *context,
+
struct command
*parent, char *name, command_handler_t handler,
enum command_mode mode, char *help);
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_contex
t *context, char *name);
+int unregister_all_commands(
struct command_contex
t *context);
-void command_set_output_handler(
command_context_
t* context,
+void command_set_output_handler(
struct command_contex
t* context,
command_output_handler_t output_handler, void *priv);
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_contex
t* context);
-int command_context_mode(
command_context_
t *context, enum command_mode mode);
+int command_context_mode(
struct command_contex
t *context, enum command_mode mode);
-
command_context_
t* command_init(void);
-int command_done(
command_context_
t *context);
+
struct command_contex
t* command_init(void);
+int command_done(
struct command_contex
t *context);
-void command_print(
command_context_
t *context, const char *format, ...)
+void command_print(
struct command_contex
t *context, const char *format, ...)
__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
-void command_print_sameline(
command_context_
t *context, const char *format, ...)
+void command_print_sameline(
struct command_contex
t *context, const char *format, ...)
__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
__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_contex
t *context, char *line);
+int command_run_linef(
struct command_contex
t *context, const char *format, ...)
__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
-void command_output_text(
command_context_
t *context, const char *data);
+void command_output_text(
struct command_contex
t *context, const char *data);
void process_jim_events(void);
void process_jim_events(void);
@@
-190,7
+190,7
@@
extern int fast_and_dangerous;
extern Jim_Interp *interp;
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_contex
t *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);
long jim_global_long(const char *variable);