diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-12-28 12:56:08 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-01-04 17:13:46 +0000 |
| commit | 4668bd264cfe64c3e3ddd0f75cb5bf2e5e85f717 (patch) | |
| tree | 049929193b5b50a98c7742b84fc9574235b0ae99 /src/jtag | |
| parent | 54d6330b78f46678e78d1ffb265c65fcc8991e83 (diff) | |
retire ERROR_INVALID_ARGUMENTS and replace with ERROR_COMMAND_SYNTAX_ERROR
Change-Id: I6dee51e1fab1944085391f274a343cdb9014c7a4
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/300
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/adapter.c | 12 | ||||
| -rw-r--r-- | src/jtag/core.c | 4 | ||||
| -rw-r--r-- | src/jtag/drivers/presto.c | 6 | ||||
| -rw-r--r-- | src/jtag/zy1000/zy1000.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c index a0cd5e3d..acd434c4 100644 --- a/src/jtag/adapter.c +++ b/src/jtag/adapter.c @@ -218,7 +218,7 @@ COMMAND_HANDLER(handle_reset_config_command) if (mask & m) { LOG_ERROR("extra reset_config %s spec (%s)", "gating", *CMD_ARGV); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (m) goto next; @@ -238,7 +238,7 @@ COMMAND_HANDLER(handle_reset_config_command) if (mask & m) { LOG_ERROR("extra reset_config %s spec (%s)", "signal", *CMD_ARGV); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (m) goto next; @@ -258,7 +258,7 @@ COMMAND_HANDLER(handle_reset_config_command) if (mask & m) { LOG_ERROR("extra reset_config %s spec (%s)", "combination", *CMD_ARGV); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (m) goto next; @@ -274,7 +274,7 @@ COMMAND_HANDLER(handle_reset_config_command) if (mask & m) { LOG_ERROR("extra reset_config %s spec (%s)", "trst_type", *CMD_ARGV); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (m) goto next; @@ -290,14 +290,14 @@ COMMAND_HANDLER(handle_reset_config_command) if (mask & m) { LOG_ERROR("extra reset_config %s spec (%s)", "srst_type", *CMD_ARGV); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (m) goto next; /* caller provided nonsense; fail */ LOG_ERROR("unknown reset_config flag (%s)", *CMD_ARGV); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; next: /* Remember the bits which were specified (mask) diff --git a/src/jtag/core.c b/src/jtag/core.c index 48eef3e1..a0feed1d 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -279,7 +279,7 @@ int jtag_register_event_callback(jtag_event_handler_t callback, void *priv) if (callback == NULL) { - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (*callbacks_p) @@ -303,7 +303,7 @@ int jtag_unregister_event_callback(jtag_event_handler_t callback, void *priv) if (callback == NULL) { - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } while (*p) diff --git a/src/jtag/drivers/presto.c b/src/jtag/drivers/presto.c index b23d196b..4bee67dc 100644 --- a/src/jtag/drivers/presto.c +++ b/src/jtag/drivers/presto.c @@ -686,7 +686,7 @@ static int presto_adapter_khz(int khz, int *jtag_speed) if (khz < 0) { *jtag_speed = 0; - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (khz >= 3000) *jtag_speed = 0; @@ -700,7 +700,7 @@ static int presto_jtag_speed_div(int speed, int *khz) if ((speed < 0) || (speed > 1000)) { *khz = 0; - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (speed == 0) *khz = 3000; @@ -715,7 +715,7 @@ static int presto_jtag_speed(int speed) if (presto_jtag_speed_div(speed, &khz)) { - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } presto->jtag_speed = speed; diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 25783fa7..22193abd 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -283,7 +283,7 @@ int zy1000_speed(int speed) { LOG_USER("valid ZY1000 jtag_speed=[8190,2]. With divisor is %dkHz / even values between 8190-2, i.e. min %dHz, max %dMHz", ZYLIN_KHZ, (ZYLIN_KHZ * 1000) / 8190, ZYLIN_KHZ / (2 * 1000)); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } int khz; @@ -325,7 +325,7 @@ COMMAND_HANDLER(handle_power_command) LOG_INFO("Target power %s", savePower ? "on" : "off"); break; default: - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } return ERROR_OK; |