From 4668bd264cfe64c3e3ddd0f75cb5bf2e5e85f717 Mon Sep 17 00:00:00 2001 From: Øyvind Harboe Date: Wed, 28 Dec 2011 12:56:08 +0100 Subject: retire ERROR_INVALID_ARGUMENTS and replace with ERROR_COMMAND_SYNTAX_ERROR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6dee51e1fab1944085391f274a343cdb9014c7a4 Signed-off-by: Øyvind Harboe Reviewed-on: http://openocd.zylin.com/300 Tested-by: jenkins Reviewed-by: Øyvind Harboe Reviewed-by: Spencer Oliver --- src/flash/mflash.c | 4 ++-- src/flash/nand/core.c | 4 ++-- src/flash/nand/tcl.c | 8 ++++---- src/flash/nor/stellaris.c | 2 +- src/flash/nor/tcl.c | 2 +- src/flash/nor/tms470.c | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/flash') diff --git a/src/flash/mflash.c b/src/flash/mflash.c index ba344222..8fca4aa3 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -141,7 +141,7 @@ static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio) gpio_con = S3C2440_GPJCON; } else { LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } ret = target_read_u32(target, gpio_con, &data); @@ -173,7 +173,7 @@ static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val gpio_dat = S3C2440_GPJDAT; } else { LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } ret = target_read_u32(target, gpio_dat, &data); diff --git a/src/flash/nand/core.c b/src/flash/nand/core.c index d9bb7dea..777b2fdc 100644 --- a/src/flash/nand/core.c +++ b/src/flash/nand/core.c @@ -221,7 +221,7 @@ COMMAND_HELPER(nand_command_get_device, unsigned name_index, *nand = get_nand_device_by_num(num); if (!*nand) { command_print(CMD_CTX, "NAND flash device '%s' not found", str); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } return ERROR_OK; } @@ -542,7 +542,7 @@ int nand_erase(struct nand_device *nand, int first_block, int last_block) return ERROR_NAND_DEVICE_NOT_PROBED; if ((first_block < 0) || (last_block >= nand->num_blocks)) - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; /* make sure we know if a block is bad before erasing it */ for (i = first_block; i <= last_block; i++) diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c index e4bfb4d1..5fba1bcc 100644 --- a/src/flash/nand/tcl.c +++ b/src/flash/nand/tcl.c @@ -177,12 +177,12 @@ COMMAND_HANDLER(handle_nand_erase_command) COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], offset); if ((offset % p->erase_size) != 0 || offset >= size) - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length); if ((length == 0) || (length % p->erase_size) != 0 || (length + offset) > size) - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; offset /= p->erase_size; length /= p->erase_size; @@ -226,12 +226,12 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command) COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], offset); if (offset % p->erase_size) - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; offset /= p->erase_size; COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length); if (length % p->erase_size) - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; length -= 1; length /= p->erase_size; diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index 6fa9fe25..7351aed9 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -897,7 +897,7 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la { LOG_ERROR("Hardware doesn't support page-level unprotect. " "Try the 'recover' command."); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (stellaris_info->did1 == 0) diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c index 92b85be7..4ba5f47c 100644 --- a/src/flash/nor/tcl.c +++ b/src/flash/nor/tcl.c @@ -848,7 +848,7 @@ COMMAND_HANDLER(handle_flash_bank_command) COMMAND_HANDLER(handle_flash_banks_command) { if (CMD_ARGC != 0) - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; unsigned n = 0; for (struct flash_bank *p = flash_bank_list(); p; p = p->next, n++) diff --git a/src/flash/nor/tms470.c b/src/flash/nor/tms470.c index 359d3aa7..bf708be2 100644 --- a/src/flash/nor/tms470.c +++ b/src/flash/nor/tms470.c @@ -314,7 +314,7 @@ COMMAND_HANDLER(tms470_handle_flash_keyset_command) if (CMD_ARGC > 4) { command_print(CMD_CTX, "tms470 flash_keyset "); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } else if (CMD_ARGC == 4) { @@ -328,7 +328,7 @@ COMMAND_HANDLER(tms470_handle_flash_keyset_command) { command_print(CMD_CTX, "could not process flash key %s", CMD_ARGV[i]); LOG_ERROR("could not process flash key %s", CMD_ARGV[i]); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } } @@ -337,7 +337,7 @@ COMMAND_HANDLER(tms470_handle_flash_keyset_command) else if (CMD_ARGC != 0) { command_print(CMD_CTX, "tms470 flash_keyset "); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } if (keysSet) @@ -378,7 +378,7 @@ COMMAND_HANDLER(tms470_handle_osc_megahertz_command) if (CMD_ARGC > 1) { command_print(CMD_CTX, "tms470 osc_megahertz "); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } else if (CMD_ARGC == 1) { @@ -390,7 +390,7 @@ COMMAND_HANDLER(tms470_handle_osc_megahertz_command) LOG_ERROR("osc_megahertz must be positive and non-zero!"); command_print(CMD_CTX, "osc_megahertz must be positive and non-zero!"); oscMHz = 12; - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } command_print(CMD_CTX, "osc_megahertz=%d", oscMHz); @@ -407,7 +407,7 @@ COMMAND_HANDLER(tms470_handle_plldis_command) if (CMD_ARGC > 1) { command_print(CMD_CTX, "tms470 plldis <0 | 1>"); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } else if (CMD_ARGC == 1) { -- cgit v1.2.3-18-g5258