X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstr9xpec.c;h=f7c705e85bce6b07dfd03d86e37e7532df427539;hp=7f6d8bed71f4f2c8190b4398eacf8bc3e7203885;hb=ff25e76bad7e57da4ebd363f1b35d4af04acaa67;hpb=a94748ec6da9bdc6e25a7f73bbea723b8b55fa33

diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index 7f6d8bed71..f7c705e85b 100644
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -242,7 +242,7 @@ FLASH_BANK_COMMAND_HANDLER(str9xpec_flash_bank_command)
 	struct arm7_9_common *arm7_9 = NULL;
 	struct arm_jtag *jtag_info = NULL;
 
-	if (argc < 6)
+	if (CMD_ARGC < 6)
 	{
 		LOG_WARNING("incomplete flash_bank str9x configuration");
 		return ERROR_FLASH_BANK_INVALID;
@@ -734,11 +734,11 @@ COMMAND_HANDLER(str9xpec_handle_part_id_command)
 	uint32_t idcode;
 	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -759,7 +759,7 @@ COMMAND_HANDLER(str9xpec_handle_part_id_command)
 
 	idcode = buf_get_u32(buffer, 0, 32);
 
-	command_print(cmd_ctx, "str9xpec part id: 0x%8.8" PRIx32 "", idcode);
+	command_print(CMD_CTX, "str9xpec part id: 0x%8.8" PRIx32 "", idcode);
 
 	free(buffer);
 
@@ -782,14 +782,14 @@ COMMAND_HANDLER(str9xpec_handle_flash_options_read_command)
 	uint8_t status;
 	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "str9xpec options_read <bank>");
+		command_print(CMD_CTX, "str9xpec options_read <bank>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -802,33 +802,33 @@ COMMAND_HANDLER(str9xpec_handle_flash_options_read_command)
 
 	/* boot bank */
 	if (buf_get_u32(str9xpec_info->options, STR9XPEC_OPT_CSMAPBIT, 1))
-		command_print(cmd_ctx, "CS Map: bank1");
+		command_print(CMD_CTX, "CS Map: bank1");
 	else
-		command_print(cmd_ctx, "CS Map: bank0");
+		command_print(CMD_CTX, "CS Map: bank0");
 
 	/* OTP lock */
 	if (buf_get_u32(str9xpec_info->options, STR9XPEC_OPT_OTPBIT, 1))
-		command_print(cmd_ctx, "OTP Lock: OTP Locked");
+		command_print(CMD_CTX, "OTP Lock: OTP Locked");
 	else
-		command_print(cmd_ctx, "OTP Lock: OTP Unlocked");
+		command_print(CMD_CTX, "OTP Lock: OTP Unlocked");
 
 	/* LVD Threshold */
 	if (buf_get_u32(str9xpec_info->options, STR9XPEC_OPT_LVDTHRESBIT, 1))
-		command_print(cmd_ctx, "LVD Threshold: 2.7v");
+		command_print(CMD_CTX, "LVD Threshold: 2.7v");
 	else
-		command_print(cmd_ctx, "LVD Threshold: 2.4v");
+		command_print(CMD_CTX, "LVD Threshold: 2.4v");
 
 	/* LVD reset warning */
 	if (buf_get_u32(str9xpec_info->options, STR9XPEC_OPT_LVDWARNBIT, 1))
-		command_print(cmd_ctx, "LVD Reset Warning: VDD or VDDQ Inputs");
+		command_print(CMD_CTX, "LVD Reset Warning: VDD or VDDQ Inputs");
 	else
-		command_print(cmd_ctx, "LVD Reset Warning: VDD Input Only");
+		command_print(CMD_CTX, "LVD Reset Warning: VDD Input Only");
 
 	/* LVD reset select */
 	if (buf_get_u32(str9xpec_info->options, STR9XPEC_OPT_LVDSELBIT, 1))
-		command_print(cmd_ctx, "LVD Reset Selection: VDD or VDDQ Inputs");
+		command_print(CMD_CTX, "LVD Reset Selection: VDD or VDDQ Inputs");
 	else
-		command_print(cmd_ctx, "LVD Reset Selection: VDD Input Only");
+		command_print(CMD_CTX, "LVD Reset Selection: VDD Input Only");
 
 	return ERROR_OK;
 }
@@ -898,14 +898,14 @@ COMMAND_HANDLER(str9xpec_handle_flash_options_write_command)
 {
 	uint8_t status;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "str9xpec options_write <bank>");
+		command_print(CMD_CTX, "str9xpec options_write <bank>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -921,20 +921,20 @@ COMMAND_HANDLER(str9xpec_handle_flash_options_cmap_command)
 {
 	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
-	if (argc < 2)
+	if (CMD_ARGC < 2)
 	{
-		command_print(cmd_ctx, "str9xpec options_cmap <bank> <bank0 | bank1>");
+		command_print(CMD_CTX, "str9xpec options_cmap <bank> <bank0 | bank1>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
-	if (strcmp(args[1], "bank1") == 0)
+	if (strcmp(CMD_ARGV[1], "bank1") == 0)
 	{
 		buf_set_u32(str9xpec_info->options, STR9XPEC_OPT_CSMAPBIT, 1, 1);
 	}
@@ -950,20 +950,20 @@ COMMAND_HANDLER(str9xpec_handle_flash_options_lvdthd_command)
 {
 	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
-	if (argc < 2)
+	if (CMD_ARGC < 2)
 	{
-		command_print(cmd_ctx, "str9xpec options_lvdthd <bank> <2.4v | 2.7v>");
+		command_print(CMD_CTX, "str9xpec options_lvdthd <bank> <2.4v | 2.7v>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
-	if (strcmp(args[1], "2.7v") == 0)
+	if (strcmp(CMD_ARGV[1], "2.7v") == 0)
 	{
 		buf_set_u32(str9xpec_info->options, STR9XPEC_OPT_LVDTHRESBIT, 1, 1);
 	}
@@ -979,20 +979,20 @@ COMMAND_HANDLER(str9xpec_handle_flash_options_lvdsel_command)
 {
 	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
-	if (argc < 2)
+	if (CMD_ARGC < 2)
 	{
-		command_print(cmd_ctx, "str9xpec options_lvdsel <bank> <vdd | vdd_vddq>");
+		command_print(CMD_CTX, "str9xpec options_lvdsel <bank> <vdd | vdd_vddq>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
-	if (strcmp(args[1], "vdd_vddq") == 0)
+	if (strcmp(CMD_ARGV[1], "vdd_vddq") == 0)
 	{
 		buf_set_u32(str9xpec_info->options, STR9XPEC_OPT_LVDSELBIT, 1, 1);
 	}
@@ -1008,20 +1008,20 @@ COMMAND_HANDLER(str9xpec_handle_flash_options_lvdwarn_command)
 {
 	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
-	if (argc < 2)
+	if (CMD_ARGC < 2)
 	{
-		command_print(cmd_ctx, "str9xpec options_lvdwarn <bank> <vdd | vdd_vddq>");
+		command_print(CMD_CTX, "str9xpec options_lvdwarn <bank> <vdd | vdd_vddq>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
-	if (strcmp(args[1], "vdd_vddq") == 0)
+	if (strcmp(CMD_ARGV[1], "vdd_vddq") == 0)
 	{
 		buf_set_u32(str9xpec_info->options, STR9XPEC_OPT_LVDWARNBIT, 1, 1);
 	}
@@ -1037,14 +1037,14 @@ COMMAND_HANDLER(str9xpec_handle_flash_lock_command)
 {
 	uint8_t status;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "str9xpec lock <bank>");
+		command_print(CMD_CTX, "str9xpec lock <bank>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1060,14 +1060,14 @@ COMMAND_HANDLER(str9xpec_handle_flash_unlock_command)
 {
 	uint8_t status;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "str9xpec unlock <bank>");
+		command_print(CMD_CTX, "str9xpec unlock <bank>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1086,14 +1086,14 @@ COMMAND_HANDLER(str9xpec_handle_flash_enable_turbo_command)
 	struct jtag_tap *tap2;
 	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "str9xpec enable_turbo <bank>");
+		command_print(CMD_CTX, "str9xpec enable_turbo <bank>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1106,14 +1106,14 @@ COMMAND_HANDLER(str9xpec_handle_flash_enable_turbo_command)
 	if (tap1 == NULL)
 	{
 		/* things are *WRONG* */
-		command_print(cmd_ctx,"**STR9FLASH** (tap1) invalid chain?");
+		command_print(CMD_CTX,"**STR9FLASH** (tap1) invalid chain?");
 		return ERROR_OK;
 	}
 	tap2 = tap1->next_tap;
 	if (tap2 == NULL)
 	{
 		/* things are *WRONG* */
-		command_print(cmd_ctx,"**STR9FLASH** (tap2) invalid chain?");
+		command_print(CMD_CTX,"**STR9FLASH** (tap2) invalid chain?");
 		return ERROR_OK;
 	}
 
@@ -1133,14 +1133,14 @@ COMMAND_HANDLER(str9xpec_handle_flash_disable_turbo_command)
 	struct jtag_tap *tap;
 	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "str9xpec disable_turbo <bank>");
+		command_print(CMD_CTX, "str9xpec disable_turbo <bank>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;