From 5b6df55a1e5e4c0f531bc336691bc7c9a6a0df87 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Tue, 10 Nov 2009 22:23:07 -0800 Subject: use CALL_COMMAND_HANDLER instead of direct calls By using CALL_COMMAND_HANDLER, parameters can be reordered, added, or even removed in inherited signatures, without requiring revisiting all of the various call sites. --- src/target/arm11.c | 7 ++++--- src/target/etm.c | 2 +- src/target/target.c | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/target') diff --git a/src/target/arm11.c b/src/target/arm11.c index 949c9475..5b11f8e0 100644 --- a/src/target/arm11.c +++ b/src/target/arm11.c @@ -2029,7 +2029,8 @@ static COMMAND_HELPER(arm11_handle_bool, bool *var, char *name) #define BOOL_WRAPPER(name, print_name) \ COMMAND_HANDLER(arm11_handle_bool_##name) \ { \ - return arm11_handle_bool(cmd_ctx, cmd, args, argc, &arm11_config_##name, print_name); \ + return CALL_COMMAND_HANDLER(arm11_handle_bool, \ + &arm11_config_##name, print_name); \ } BOOL_WRAPPER(memwrite_burst, "memory write burst mode") @@ -2186,12 +2187,12 @@ static COMMAND_HELPER(arm11_handle_etm_read_write, bool read) COMMAND_HANDLER(arm11_handle_etmr) { - return arm11_handle_etm_read_write(cmd_ctx, cmd, args, argc, true); + return CALL_COMMAND_HANDLER(arm11_handle_etm_read_write, true); } COMMAND_HANDLER(arm11_handle_etmw) { - return arm11_handle_etm_read_write(cmd_ctx, cmd, args, argc, false); + return CALL_COMMAND_HANDLER(arm11_handle_etm_read_write, false); } #define ARM11_HANDLER(x) .x = arm11_##x diff --git a/src/target/etm.c b/src/target/etm.c index df029042..a4ff6c5f 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -1271,7 +1271,7 @@ COMMAND_HANDLER(handle_etm_tracemode_command) case 0: break; case 4: - handle_etm_tracemode_command_update(cmd_ctx, cmd, args, argc, &tracemode); + CALL_COMMAND_HANDLER(handle_etm_tracemode_command_update, &tracemode); break; default: command_print(cmd_ctx, "usage: configure trace mode " diff --git a/src/target/target.c b/src/target/target.c index 26c20cf3..21c0526f 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2121,7 +2121,7 @@ COMMAND_HANDLER(handle_halt_command) return ERROR_OK; } - return handle_wait_halt_command(cmd_ctx, cmd, args, argc); + return CALL_COMMAND_HANDLER(handle_wait_halt_command); } COMMAND_HANDLER(handle_soft_reset_halt_command) @@ -2410,7 +2410,7 @@ COMMAND_HANDLER(handle_load_image_command) int i; image_t image; - int retval = parse_load_image_command_args(cmd_ctx, cmd, args, argc, + int retval = CALL_COMMAND_HANDLER(parse_load_image_command_args, &image, &min_address, &max_address); if (ERROR_OK != retval) return retval; @@ -2701,12 +2701,12 @@ done: COMMAND_HANDLER(handle_verify_image_command) { - return handle_verify_image_command_internal(cmd_ctx, cmd, args, argc, 1); + return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 1); } COMMAND_HANDLER(handle_test_image_command) { - return handle_verify_image_command_internal(cmd_ctx, cmd, args, argc, 0); + return CALL_COMMAND_HANDLER(handle_verify_image_command_internal, 0); } static int handle_bp_command_list(struct command_context_s *cmd_ctx) @@ -4547,7 +4547,7 @@ COMMAND_HANDLER(handle_fast_load_image_command) image_t image; - int retval = parse_load_image_command_args(cmd_ctx, cmd, args, argc, + int retval = CALL_COMMAND_HANDLER(parse_load_image_command_args, &image, &min_address, &max_address); if (ERROR_OK != retval) return retval; -- cgit v1.2.3