openocd-devel — Discuss development of OpenOCD

[openocd:tickets] Re: #439 OpenOCD failed with code (-1073741819)

[Jindrich F. <fu...@us...>]

Hi, I can answer 2nd part. I posted it to this thread as I have same exit code and similar symptoms (vendor packed version etc). 


---

**[tickets:#439] OpenOCD failed with code (-1073741819)**

**Status:** new
**Milestone:** 0.10.0
**Labels:** OpenOCD 
**Created:** Fri Oct 11, 2024 02:23 PM UTC by Alex
**Last Updated:** Fri Jul 25, 2025 06:21 PM UTC
**Owner:** nobody
**Attachments:**

- [image_2024_10_11T13_44_15_984Z.png](https://sourceforge.net/p/openocd/tickets/439/attachment/image_2024_10_11T13_44_15_984Z.png) (44.5 kB; image/png)


Trying to use Microchip SoftConsole 2022 on PolarFire SoC Icicle Kit to debug example application, but OpenOCD failing with message:  **OpenOCD failed with code (-1073741819).** We tried to Google but nothing comes up.  Could you tell us what that error code means?
It is a new DELL laptop running Windows 11. We use SoftConsole on other 4 PCs and no problems. The interesting part that OpenOCD detects two Embedded FlashPro6 as shown on attached image and we did not see that before.
Thank you


---

Sent from sourceforge.net because ope...@li... is subscribed to https://sourceforge.net/p/openocd/tickets/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/openocd/admin/tickets/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.

[PATCH]: 075f629558 svf: rework the tests in svf_xxr_common()

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9043

-- gerrit

commit 075f62955811e1ce8690a07319af796274a70a50
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Jul 25 20:09:43 2025 +0200

    svf: rework the tests in svf_xxr_common()
    
    Check the variable value against the constant.
    
    Change-Id: I353bbada2180d6df789cc225ddb15f22c7deb00d
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 7ef6df4769..6a4639ce83 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -1037,9 +1037,8 @@ static int svf_xxr_common(char **argus, int num_of_argu, char command, struct sv
 			LOG_ERROR("unknown parameter: %s", argus[i]);
 			return ERROR_FAIL;
 		}
-		if (ERROR_OK !=
-		svf_copy_hexstring_to_binary(&argus[i + 1][1], pbuffer_tmp, i_tmp,
-			xxr_para_tmp->len)) {
+		if (svf_copy_hexstring_to_binary(&argus[i + 1][1], pbuffer_tmp, i_tmp,
+				xxr_para_tmp->len) != ERROR_OK) {
 			LOG_ERROR("fail to parse hex value");
 			return ERROR_FAIL;
 		}
@@ -1050,9 +1049,8 @@ static int svf_xxr_common(char **argus, int num_of_argu, char command, struct sv
 	/* the mask pattern used is all cares */
 	if (!(xxr_para_tmp->data_mask & XXR_MASK) && i_tmp != xxr_para_tmp->len) {
 		/* MASK not defined and length changed */
-		if (ERROR_OK !=
-		svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp,
-			xxr_para_tmp->len)) {
+		if (svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp, xxr_para_tmp->len)
+				!= ERROR_OK) {
 			LOG_ERROR("fail to adjust length of array");
 			return ERROR_FAIL;
 		}
@@ -1061,17 +1059,15 @@ static int svf_xxr_common(char **argus, int num_of_argu, char command, struct sv
 	/* If TDO is absent, no comparison is needed, set the mask to 0 */
 	if (!(xxr_para_tmp->data_mask & XXR_TDO)) {
 		if (!xxr_para_tmp->tdo) {
-			if (ERROR_OK !=
-			svf_adjust_array_length(&xxr_para_tmp->tdo, i_tmp,
-				xxr_para_tmp->len)) {
+			if (svf_adjust_array_length(&xxr_para_tmp->tdo, i_tmp, xxr_para_tmp->len)
+					!= ERROR_OK) {
 				LOG_ERROR("fail to adjust length of array");
 				return ERROR_FAIL;
 			}
 		}
 		if (!xxr_para_tmp->mask) {
-			if (ERROR_OK !=
-			svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp,
-				xxr_para_tmp->len)) {
+			if (svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp, xxr_para_tmp->len)
+					!= ERROR_OK) {
 				LOG_ERROR("fail to adjust length of array");
 				return ERROR_FAIL;
 			}

-- 

[PATCH]: d301ed1d70 svf: prepare for aligning switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9039

-- gerrit

commit d301ed1d70e767bd397793390a5b99d047a7a58a
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Jun 29 23:21:57 2025 +0200

    svf: prepare for aligning switch and case statements
    
    To prepare for aligning switch and case statements, fix in advance
    some checkpatch error due to existing code:
    - remove unnecessary parenthesis;
    - uniform braces around if/else statements.
    
    Change-Id: I851032e1b126462a325f73bdf236fd2dbc938ff3
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index ce994686f1..802e2326a2 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -1035,7 +1035,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 			}
 			break;
 		case FREQUENCY:
-			if ((num_of_argu != 1) && (num_of_argu != 3)) {
+			if (num_of_argu != 1 && num_of_argu != 3) {
 				LOG_ERROR("invalid parameter of %s", argus[0]);
 				return ERROR_FAIL;
 			}
@@ -1095,7 +1095,7 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 			goto xxr_common;
 xxr_common:
 			/* XXR length [TDI (tdi)] [TDO (tdo)][MASK (mask)] [SMASK (smask)] */
-			if ((num_of_argu > 10) || (num_of_argu % 2)) {
+			if (num_of_argu > 10 || (num_of_argu % 2)) {
 				LOG_ERROR("invalid parameter of %s", argus[0]);
 				return ERROR_FAIL;
 			}
@@ -1118,7 +1118,7 @@ xxr_common:
 			xxr_para_tmp->data_mask = 0;
 			for (i = 2; i < num_of_argu; i += 2) {
 				if ((strlen(argus[i + 1]) < 3) || (argus[i + 1][0] != '(') ||
-				(argus[i + 1][strlen(argus[i + 1]) - 1] != ')')) {
+						argus[i + 1][strlen(argus[i + 1]) - 1] != ')') {
 					LOG_ERROR("data section error");
 					return ERROR_FAIL;
 				}
@@ -1155,7 +1155,7 @@ xxr_common:
 			/* If a command changes the length of the last scan of the same type and the
 			 * MASK parameter is absent, */
 			/* the mask pattern used is all cares */
-			if (!(xxr_para_tmp->data_mask & XXR_MASK) && (i_tmp != xxr_para_tmp->len)) {
+			if (!(xxr_para_tmp->data_mask & XXR_MASK) && i_tmp != xxr_para_tmp->len) {
 				/* MASK not defined and length changed */
 				if (ERROR_OK !=
 				svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp,
@@ -1263,8 +1263,9 @@ xxr_common:
 					i += svf_para.tdr_para.len;
 
 					svf_add_check_para(1, svf_buffer_index, i);
-				} else
+				} else {
 					svf_add_check_para(0, svf_buffer_index, i);
+				}
 				field.num_bits = i;
 				field.out_value = &svf_tdi_buffer[svf_buffer_index];
 				field.in_value = (xxr_para_tmp->data_mask & XXR_TDO) ? &svf_tdi_buffer[svf_buffer_index] : NULL;
@@ -1356,8 +1357,9 @@ xxr_common:
 					i += svf_para.tir_para.len;
 
 					svf_add_check_para(1, svf_buffer_index, i);
-				} else
+				} else {
 					svf_add_check_para(0, svf_buffer_index, i);
+				}
 				field.num_bits = i;
 				field.out_value = &svf_tdi_buffer[svf_buffer_index];
 				field.in_value = (xxr_para_tmp->data_mask & XXR_TDO) ? &svf_tdi_buffer[svf_buffer_index] : NULL;
@@ -1381,7 +1383,7 @@ xxr_common:
 			 * SEC]] [ENDSTATE end_state] */
 			/* RUNTEST [run_state] min_time SEC [MAXIMUM max_time SEC] [ENDSTATE
 			 * end_state] */
-			if ((num_of_argu < 3) || (num_of_argu > 11)) {
+			if (num_of_argu < 3 || num_of_argu > 11) {
 				LOG_ERROR("invalid parameter of %s", argus[0]);
 				return ERROR_FAIL;
 			}

-- 

[PATCH]: f3b839ae7b svf: align switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9044

-- gerrit

commit f3b839ae7b543ada72171b55c11d550f7058e333
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Jun 29 23:25:21 2025 +0200

    svf: align switch and case statements
    
    The coding style requires the 'case' to be at the same indentation
    level of its 'switch' statement.
    
    Align the code accordingly.
    
    No changes are reported by
            git log -p -w --ignore-blank-lines --patience
    
    Change-Id: I1369294af64c2830cc7fcc2814eac073c2413ff5
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 6a4639ce83..001ffa2631 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -702,71 +702,71 @@ static int svf_read_command_from_file(FILE *fd)
 	ch = svf_read_line[0];
 	while (!cmd_ok && (ch != 0)) {
 		switch (ch) {
-			case '!':
+		case '!':
+			slash = 0;
+			if (svf_getline(&svf_read_line, &svf_read_line_size, svf_fd) <= 0)
+				return ERROR_FAIL;
+			svf_line_number++;
+			i = -1;
+			break;
+		case '/':
+			if (++slash == 2) {
 				slash = 0;
-				if (svf_getline(&svf_read_line, &svf_read_line_size, svf_fd) <= 0)
+				if (svf_getline(&svf_read_line, &svf_read_line_size,
+					svf_fd) <= 0)
 					return ERROR_FAIL;
 				svf_line_number++;
 				i = -1;
+			}
+			break;
+		case ';':
+			slash = 0;
+			cmd_ok = 1;
+			break;
+		case '\n':
+			svf_line_number++;
+			if (svf_getline(&svf_read_line, &svf_read_line_size, svf_fd) <= 0)
+				return ERROR_FAIL;
+			i = -1;
+			/* fallthrough */
+		case '\r':
+			slash = 0;
+			/* Don't save '\r' and '\n' if no data is parsed */
+			if (!cmd_pos)
 				break;
-			case '/':
-				if (++slash == 2) {
-					slash = 0;
-					if (svf_getline(&svf_read_line, &svf_read_line_size,
-						svf_fd) <= 0)
-						return ERROR_FAIL;
-					svf_line_number++;
-					i = -1;
-				}
-				break;
-			case ';':
-				slash = 0;
-				cmd_ok = 1;
-				break;
-			case '\n':
-				svf_line_number++;
-				if (svf_getline(&svf_read_line, &svf_read_line_size, svf_fd) <= 0)
+			/* fallthrough */
+		default:
+			/* The parsing code currently expects a space
+			 * before parentheses -- "TDI (123)".  Also a
+			 * space afterwards -- "TDI (123) TDO(456)".
+			 * But such spaces are optional... instead of
+			 * parser updates, cope with that by adding the
+			 * spaces as needed.
+			 *
+			 * Ensure there are 3 bytes available, for:
+			 *  - current character
+			 *  - added space.
+			 *  - terminating NUL ('\0')
+			 */
+			if (cmd_pos + 3 > svf_command_buffer_size) {
+				svf_command_buffer = realloc(svf_command_buffer, cmd_pos + 3);
+				svf_command_buffer_size = cmd_pos + 3;
+				if (!svf_command_buffer) {
+					LOG_ERROR("not enough memory");
 					return ERROR_FAIL;
-				i = -1;
-				/* fallthrough */
-			case '\r':
-				slash = 0;
-				/* Don't save '\r' and '\n' if no data is parsed */
-				if (!cmd_pos)
-					break;
-				/* fallthrough */
-			default:
-				/* The parsing code currently expects a space
-				 * before parentheses -- "TDI (123)".  Also a
-				 * space afterwards -- "TDI (123) TDO(456)".
-				 * But such spaces are optional... instead of
-				 * parser updates, cope with that by adding the
-				 * spaces as needed.
-				 *
-				 * Ensure there are 3 bytes available, for:
-				 *  - current character
-				 *  - added space.
-				 *  - terminating NUL ('\0')
-				 */
-				if (cmd_pos + 3 > svf_command_buffer_size) {
-					svf_command_buffer = realloc(svf_command_buffer, cmd_pos + 3);
-					svf_command_buffer_size = cmd_pos + 3;
-					if (!svf_command_buffer) {
-						LOG_ERROR("not enough memory");
-						return ERROR_FAIL;
-					}
 				}
+			}
 
-				/* insert a space before '(' */
-				if ('(' == ch)
-					svf_command_buffer[cmd_pos++] = ' ';
+			/* insert a space before '(' */
+			if ('(' == ch)
+				svf_command_buffer[cmd_pos++] = ' ';
 
-				svf_command_buffer[cmd_pos++] = (char)toupper(ch);
+			svf_command_buffer[cmd_pos++] = (char)toupper(ch);
 
-				/* insert a space after ')' */
-				if (')' == ch)
-					svf_command_buffer[cmd_pos++] = ' ';
-				break;
+			/* insert a space after ')' */
+			if (')' == ch)
+				svf_command_buffer[cmd_pos++] = ' ';
+			break;
 		}
 		ch = svf_read_line[++i];
 	}
@@ -785,18 +785,18 @@ static int svf_parse_cmd_string(char *str, int len, char **argus, int *num_of_ar
 
 	while (pos < len) {
 		switch (str[pos]) {
-			case '!':
-			case '/':
-				LOG_ERROR("fail to parse svf command");
-				return ERROR_FAIL;
-			case '(':
-				in_bracket = true;
-				break;
-			case ')':
-				in_bracket = false;
-				break;
-			default:
-				break;
+		case '!':
+		case '/':
+			LOG_ERROR("fail to parse svf command");
+			return ERROR_FAIL;
+		case '(':
+			in_bracket = true;
+			break;
+		case ')':
+			in_bracket = false;
+			break;
+		default:
+			break;
 		}
 
 		if (!in_bracket && isspace((int)str[pos])) {
@@ -1292,327 +1292,327 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 	command = svf_find_string_in_array(argus[0],
 			(char **)svf_command_name, ARRAY_SIZE(svf_command_name));
 	switch (command) {
-		case ENDDR:
-		case ENDIR:
-			if (num_of_argu != 2) {
-				LOG_ERROR("invalid parameter of %s", argus[0]);
-				return ERROR_FAIL;
-			}
+	case ENDDR:
+	case ENDIR:
+		if (num_of_argu != 2) {
+			LOG_ERROR("invalid parameter of %s", argus[0]);
+			return ERROR_FAIL;
+		}
 
-			i_tmp = tap_state_by_name(argus[1]);
+		i_tmp = tap_state_by_name(argus[1]);
 
-			if (svf_tap_state_is_stable(i_tmp)) {
-				if (command == ENDIR) {
-					svf_para.ir_end_state = i_tmp;
-					LOG_DEBUG("\tIR end_state = %s",
-							tap_state_name(i_tmp));
-				} else {
-					svf_para.dr_end_state = i_tmp;
-					LOG_DEBUG("\tDR end_state = %s",
-							tap_state_name(i_tmp));
-				}
+		if (svf_tap_state_is_stable(i_tmp)) {
+			if (command == ENDIR) {
+				svf_para.ir_end_state = i_tmp;
+				LOG_DEBUG("\tIR end_state = %s",
+						tap_state_name(i_tmp));
 			} else {
-				LOG_ERROR("%s: %s is not a stable state",
-						argus[0], argus[1]);
-				return ERROR_FAIL;
+				svf_para.dr_end_state = i_tmp;
+				LOG_DEBUG("\tDR end_state = %s",
+						tap_state_name(i_tmp));
 			}
-			break;
-		case FREQUENCY:
-			if (num_of_argu != 1 && num_of_argu != 3) {
-				LOG_ERROR("invalid parameter of %s", argus[0]);
+		} else {
+			LOG_ERROR("%s: %s is not a stable state",
+					argus[0], argus[1]);
+			return ERROR_FAIL;
+		}
+		break;
+	case FREQUENCY:
+		if (num_of_argu != 1 && num_of_argu != 3) {
+			LOG_ERROR("invalid parameter of %s", argus[0]);
+			return ERROR_FAIL;
+		}
+		if (num_of_argu == 1) {
+			/* TODO: set jtag speed to full speed */
+			svf_para.frequency = 0;
+		} else {
+			if (strcmp(argus[2], "HZ")) {
+				LOG_ERROR("HZ not found in FREQUENCY command");
 				return ERROR_FAIL;
 			}
-			if (num_of_argu == 1) {
-				/* TODO: set jtag speed to full speed */
-				svf_para.frequency = 0;
-			} else {
-				if (strcmp(argus[2], "HZ")) {
-					LOG_ERROR("HZ not found in FREQUENCY command");
-					return ERROR_FAIL;
-				}
-				if (svf_execute_tap() != ERROR_OK)
-					return ERROR_FAIL;
-				svf_para.frequency = atof(argus[1]);
-				/* TODO: set jtag speed to */
-				if (svf_para.frequency > 0) {
-					command_run_linef(cmd_ctx,
-							"adapter speed %d",
-							(int)svf_para.frequency / 1000);
-					LOG_DEBUG("\tfrequency = %f", svf_para.frequency);
-				}
-			}
-			break;
-		case HDR:
-			if (svf_tap_is_specified) {
-				padding_command_skipped = 1;
-				break;
-			}
-			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.hdr_para);
-			if (retval != ERROR_OK)
-				return retval;
-			break;
-		case HIR:
-			if (svf_tap_is_specified) {
-				padding_command_skipped = 1;
-				break;
-			}
-			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.hir_para);
-			if (retval != ERROR_OK)
-				return retval;
-			break;
-		case TDR:
-			if (svf_tap_is_specified) {
-				padding_command_skipped = 1;
-				break;
+			if (svf_execute_tap() != ERROR_OK)
+				return ERROR_FAIL;
+			svf_para.frequency = atof(argus[1]);
+			/* TODO: set jtag speed to */
+			if (svf_para.frequency > 0) {
+				command_run_linef(cmd_ctx,
+						"adapter speed %d",
+						(int)svf_para.frequency / 1000);
+				LOG_DEBUG("\tfrequency = %f", svf_para.frequency);
 			}
-			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.tdr_para);
-			if (retval != ERROR_OK)
-				return retval;
+		}
+		break;
+	case HDR:
+		if (svf_tap_is_specified) {
+			padding_command_skipped = 1;
 			break;
-		case TIR:
-			if (svf_tap_is_specified) {
-				padding_command_skipped = 1;
-				break;
-			}
-			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.tir_para);
-			if (retval != ERROR_OK)
-				return retval;
+		}
+		retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.hdr_para);
+		if (retval != ERROR_OK)
+			return retval;
+		break;
+	case HIR:
+		if (svf_tap_is_specified) {
+			padding_command_skipped = 1;
 			break;
-		case SDR:
-			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.sdr_para);
-			if (retval != ERROR_OK)
-				return retval;
+		}
+		retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.hir_para);
+		if (retval != ERROR_OK)
+			return retval;
+		break;
+	case TDR:
+		if (svf_tap_is_specified) {
+			padding_command_skipped = 1;
 			break;
-		case SIR:
-			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.sir_para);
-			if (retval != ERROR_OK)
-				return retval;
+		}
+		retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.tdr_para);
+		if (retval != ERROR_OK)
+			return retval;
+		break;
+	case TIR:
+		if (svf_tap_is_specified) {
+			padding_command_skipped = 1;
 			break;
-		case PIO:
-		case PIOMAP:
-			LOG_ERROR("PIO and PIOMAP are not supported");
+		}
+		retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.tir_para);
+		if (retval != ERROR_OK)
+			return retval;
+		break;
+	case SDR:
+		retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.sdr_para);
+		if (retval != ERROR_OK)
+			return retval;
+		break;
+	case SIR:
+		retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.sir_para);
+		if (retval != ERROR_OK)
+			return retval;
+		break;
+	case PIO:
+	case PIOMAP:
+		LOG_ERROR("PIO and PIOMAP are not supported");
+		return ERROR_FAIL;
+	case RUNTEST:
+		/* RUNTEST [run_state] run_count run_clk [min_time SEC [MAXIMUM max_time
+		 * SEC]] [ENDSTATE end_state] */
+		/* RUNTEST [run_state] min_time SEC [MAXIMUM max_time SEC] [ENDSTATE
+		 * end_state] */
+		if (num_of_argu < 3 || num_of_argu > 11) {
+			LOG_ERROR("invalid parameter of %s", argus[0]);
 			return ERROR_FAIL;
-		case RUNTEST:
-			/* RUNTEST [run_state] run_count run_clk [min_time SEC [MAXIMUM max_time
-			 * SEC]] [ENDSTATE end_state] */
-			/* RUNTEST [run_state] min_time SEC [MAXIMUM max_time SEC] [ENDSTATE
-			 * end_state] */
-			if (num_of_argu < 3 || num_of_argu > 11) {
-				LOG_ERROR("invalid parameter of %s", argus[0]);
+		}
+		/* init */
+		run_count = 0;
+		min_time = 0;
+		i = 1;
+
+		/* run_state */
+		i_tmp = tap_state_by_name(argus[i]);
+		if (i_tmp != TAP_INVALID) {
+			if (svf_tap_state_is_stable(i_tmp)) {
+				svf_para.runtest_run_state = i_tmp;
+
+				/* When a run_state is specified, the new
+				 * run_state becomes the default end_state.
+				 */
+				svf_para.runtest_end_state = i_tmp;
+				LOG_DEBUG("\trun_state = %s", tap_state_name(i_tmp));
+				i++;
+			} else {
+				LOG_ERROR("%s: %s is not a stable state", argus[0], tap_state_name(i_tmp));
 				return ERROR_FAIL;
 			}
-			/* init */
-			run_count = 0;
-			min_time = 0;
-			i = 1;
-
-			/* run_state */
-			i_tmp = tap_state_by_name(argus[i]);
-			if (i_tmp != TAP_INVALID) {
-				if (svf_tap_state_is_stable(i_tmp)) {
-					svf_para.runtest_run_state = i_tmp;
-
-					/* When a run_state is specified, the new
-					 * run_state becomes the default end_state.
-					 */
-					svf_para.runtest_end_state = i_tmp;
-					LOG_DEBUG("\trun_state = %s", tap_state_name(i_tmp));
-					i++;
-				} else {
-					LOG_ERROR("%s: %s is not a stable state", argus[0], tap_state_name(i_tmp));
-					return ERROR_FAIL;
-				}
-			}
+		}
 
-			/* run_count run_clk */
-			if (((i + 2) <= num_of_argu) && strcmp(argus[i + 1], "SEC")) {
-				if (!strcmp(argus[i + 1], "TCK")) {
-					/* clock source is TCK */
-					run_count = atoi(argus[i]);
-					LOG_DEBUG("\trun_count@TCK = %d", run_count);
-				} else {
-					LOG_ERROR("%s not supported for clock", argus[i + 1]);
-					return ERROR_FAIL;
-				}
-				i += 2;
-			}
-			/* min_time SEC */
-			if (((i + 2) <= num_of_argu) && !strcmp(argus[i + 1], "SEC")) {
-				min_time = atof(argus[i]);
-				LOG_DEBUG("\tmin_time = %fs", min_time);
-				i += 2;
-			}
-			/* MAXIMUM max_time SEC */
-			if (((i + 3) <= num_of_argu) &&
-			!strcmp(argus[i], "MAXIMUM") && !strcmp(argus[i + 2], "SEC")) {
-				float max_time = 0;
-				max_time = atof(argus[i + 1]);
-				LOG_DEBUG("\tmax_time = %fs", max_time);
-				i += 3;
+		/* run_count run_clk */
+		if (((i + 2) <= num_of_argu) && strcmp(argus[i + 1], "SEC")) {
+			if (!strcmp(argus[i + 1], "TCK")) {
+				/* clock source is TCK */
+				run_count = atoi(argus[i]);
+				LOG_DEBUG("\trun_count@TCK = %d", run_count);
+			} else {
+				LOG_ERROR("%s not supported for clock", argus[i + 1]);
+				return ERROR_FAIL;
 			}
-			/* ENDSTATE end_state */
-			if (((i + 2) <= num_of_argu) && !strcmp(argus[i], "ENDSTATE")) {
-				i_tmp = tap_state_by_name(argus[i + 1]);
+			i += 2;
+		}
+		/* min_time SEC */
+		if (((i + 2) <= num_of_argu) && !strcmp(argus[i + 1], "SEC")) {
+			min_time = atof(argus[i]);
+			LOG_DEBUG("\tmin_time = %fs", min_time);
+			i += 2;
+		}
+		/* MAXIMUM max_time SEC */
+		if (((i + 3) <= num_of_argu) &&
+		!strcmp(argus[i], "MAXIMUM") && !strcmp(argus[i + 2], "SEC")) {
+			float max_time = 0;
+			max_time = atof(argus[i + 1]);
+			LOG_DEBUG("\tmax_time = %fs", max_time);
+			i += 3;
+		}
+		/* ENDSTATE end_state */
+		if (((i + 2) <= num_of_argu) && !strcmp(argus[i], "ENDSTATE")) {
+			i_tmp = tap_state_by_name(argus[i + 1]);
 
-				if (svf_tap_state_is_stable(i_tmp)) {
-					svf_para.runtest_end_state = i_tmp;
-					LOG_DEBUG("\tend_state = %s", tap_state_name(i_tmp));
-				} else {
-					LOG_ERROR("%s: %s is not a stable state", argus[0], tap_state_name(i_tmp));
-					return ERROR_FAIL;
-				}
-				i += 2;
+			if (svf_tap_state_is_stable(i_tmp)) {
+				svf_para.runtest_end_state = i_tmp;
+				LOG_DEBUG("\tend_state = %s", tap_state_name(i_tmp));
+			} else {
+				LOG_ERROR("%s: %s is not a stable state", argus[0], tap_state_name(i_tmp));
+				return ERROR_FAIL;
 			}
+			i += 2;
+		}
 
-			/* all parameter should be parsed */
-			if (i == num_of_argu) {
+		/* all parameter should be parsed */
+		if (i == num_of_argu) {
 #if 1
-				/* FIXME handle statemove failures */
-				uint32_t min_usec = 1000000 * min_time;
+			/* FIXME handle statemove failures */
+			uint32_t min_usec = 1000000 * min_time;
 
-				/* enter into run_state if necessary */
-				if (cmd_queue_cur_state != svf_para.runtest_run_state)
-					svf_add_statemove(svf_para.runtest_run_state);
+			/* enter into run_state if necessary */
+			if (cmd_queue_cur_state != svf_para.runtest_run_state)
+				svf_add_statemove(svf_para.runtest_run_state);
 
-				/* add clocks and/or min wait */
-				if (run_count > 0) {
-					if (!svf_nil)
-						jtag_add_clocks(run_count);
-				}
+			/* add clocks and/or min wait */
+			if (run_count > 0) {
+				if (!svf_nil)
+					jtag_add_clocks(run_count);
+			}
 
-				if (min_usec > 0) {
-					if (!svf_nil)
-						jtag_add_sleep(min_usec);
-				}
+			if (min_usec > 0) {
+				if (!svf_nil)
+					jtag_add_sleep(min_usec);
+			}
 
-				/* move to end_state if necessary */
-				if (svf_para.runtest_end_state != svf_para.runtest_run_state)
-					svf_add_statemove(svf_para.runtest_end_state);
+			/* move to end_state if necessary */
+			if (svf_para.runtest_end_state != svf_para.runtest_run_state)
+				svf_add_statemove(svf_para.runtest_end_state);
 
 #else
-				if (svf_para.runtest_run_state != TAP_IDLE) {
-					LOG_ERROR("cannot runtest in %s state",
-							tap_state_name(svf_para.runtest_run_state));
-					return ERROR_FAIL;
-				}
-
-				if (!svf_nil)
-					jtag_add_runtest(run_count, svf_para.runtest_end_state);
-#endif
-			} else {
-				LOG_ERROR("fail to parse parameter of RUNTEST, %d out of %d is parsed",
-						i,
-						num_of_argu);
+			if (svf_para.runtest_run_state != TAP_IDLE) {
+				LOG_ERROR("cannot runtest in %s state",
+						tap_state_name(svf_para.runtest_run_state));
 				return ERROR_FAIL;
 			}
-			break;
-		case STATE:
-			/* STATE [pathstate1 [pathstate2 ...[pathstaten]]] stable_state */
-			if (num_of_argu < 2) {
-				LOG_ERROR("invalid parameter of %s", argus[0]);
+
+			if (!svf_nil)
+				jtag_add_runtest(run_count, svf_para.runtest_end_state);
+#endif
+		} else {
+			LOG_ERROR("fail to parse parameter of RUNTEST, %d out of %d is parsed",
+					i,
+					num_of_argu);
+			return ERROR_FAIL;
+		}
+		break;
+	case STATE:
+		/* STATE [pathstate1 [pathstate2 ...[pathstaten]]] stable_state */
+		if (num_of_argu < 2) {
+			LOG_ERROR("invalid parameter of %s", argus[0]);
+			return ERROR_FAIL;
+		}
+		if (num_of_argu > 2) {
+			/* STATE pathstate1 ... stable_state */
+			path = malloc((num_of_argu - 1) * sizeof(enum tap_state));
+			if (!path) {
+				LOG_ERROR("not enough memory");
 				return ERROR_FAIL;
 			}
-			if (num_of_argu > 2) {
-				/* STATE pathstate1 ... stable_state */
-				path = malloc((num_of_argu - 1) * sizeof(enum tap_state));
-				if (!path) {
-					LOG_ERROR("not enough memory");
+			num_of_argu--;	/* num of path */
+			i_tmp = 1;		/* path is from parameter 1 */
+			for (i = 0; i < num_of_argu; i++, i_tmp++) {
+				path[i] = tap_state_by_name(argus[i_tmp]);
+				if (path[i] == TAP_INVALID) {
+					LOG_ERROR("%s: %s is not a valid state", argus[0], argus[i_tmp]);
+					free(path);
 					return ERROR_FAIL;
 				}
-				num_of_argu--;	/* num of path */
-				i_tmp = 1;		/* path is from parameter 1 */
-				for (i = 0; i < num_of_argu; i++, i_tmp++) {
-					path[i] = tap_state_by_name(argus[i_tmp]);
-					if (path[i] == TAP_INVALID) {
-						LOG_ERROR("%s: %s is not a valid state", argus[0], argus[i_tmp]);
-						free(path);
-						return ERROR_FAIL;
-					}
-					/* OpenOCD refuses paths containing TAP_RESET */
-					if (path[i] == TAP_RESET) {
-						/* FIXME last state MUST be stable! */
-						if (i > 0) {
-							if (!svf_nil)
-								jtag_add_pathmove(i, path);
-						}
-						if (!svf_nil)
-							jtag_add_tlr();
-						num_of_argu -= i + 1;
-						i = -1;
-					}
-				}
-				if (num_of_argu > 0) {
-					/* execute last path if necessary */
-					if (svf_tap_state_is_stable(path[num_of_argu - 1])) {
-						/* last state MUST be stable state */
+				/* OpenOCD refuses paths containing TAP_RESET */
+				if (path[i] == TAP_RESET) {
+					/* FIXME last state MUST be stable! */
+					if (i > 0) {
 						if (!svf_nil)
-							jtag_add_pathmove(num_of_argu, path);
-						LOG_DEBUG("\tmove to %s by path_move",
-								tap_state_name(path[num_of_argu - 1]));
-					} else {
-						LOG_ERROR("%s: %s is not a stable state",
-								argus[0],
-								tap_state_name(path[num_of_argu - 1]));
-						free(path);
-						return ERROR_FAIL;
+							jtag_add_pathmove(i, path);
 					}
+					if (!svf_nil)
+						jtag_add_tlr();
+					num_of_argu -= i + 1;
+					i = -1;
 				}
-
-				free(path);
-				path = NULL;
-			} else {
-				/* STATE stable_state */
-				state = tap_state_by_name(argus[1]);
-				if (svf_tap_state_is_stable(state)) {
-					LOG_DEBUG("\tmove to %s by svf_add_statemove",
-							tap_state_name(state));
-					/* FIXME handle statemove failures */
-					svf_add_statemove(state);
+			}
+			if (num_of_argu > 0) {
+				/* execute last path if necessary */
+				if (svf_tap_state_is_stable(path[num_of_argu - 1])) {
+					/* last state MUST be stable state */
+					if (!svf_nil)
+						jtag_add_pathmove(num_of_argu, path);
+					LOG_DEBUG("\tmove to %s by path_move",
+							tap_state_name(path[num_of_argu - 1]));
 				} else {
 					LOG_ERROR("%s: %s is not a stable state",
-							argus[0], tap_state_name(state));
+							argus[0],
+							tap_state_name(path[num_of_argu - 1]));
+					free(path);
 					return ERROR_FAIL;
 				}
 			}
-			break;
-		case TRST:
-			/* TRST trst_mode */
-			if (num_of_argu != 2) {
-				LOG_ERROR("invalid parameter of %s", argus[0]);
+
+			free(path);
+			path = NULL;
+		} else {
+			/* STATE stable_state */
+			state = tap_state_by_name(argus[1]);
+			if (svf_tap_state_is_stable(state)) {
+				LOG_DEBUG("\tmove to %s by svf_add_statemove",
+						tap_state_name(state));
+				/* FIXME handle statemove failures */
+				svf_add_statemove(state);
+			} else {
+				LOG_ERROR("%s: %s is not a stable state",
+						argus[0], tap_state_name(state));
 				return ERROR_FAIL;
 			}
-			if (svf_para.trst_mode != TRST_ABSENT) {
-				if (svf_execute_tap() != ERROR_OK)
-					return ERROR_FAIL;
-				i_tmp = svf_find_string_in_array(argus[1],
-						(char **)svf_trst_mode_name,
-						ARRAY_SIZE(svf_trst_mode_name));
-				switch (i_tmp) {
-				case TRST_ON:
-					if (!svf_nil)
-						jtag_add_reset(1, 0);
-					break;
-				case TRST_Z:
-				case TRST_OFF:
-					if (!svf_nil)
-						jtag_add_reset(0, 0);
-					break;
-				case TRST_ABSENT:
-					break;
-				default:
-					LOG_ERROR("unknown TRST mode: %s", argus[1]);
-					return ERROR_FAIL;
-				}
-				svf_para.trst_mode = i_tmp;
-				LOG_DEBUG("\ttrst_mode = %s", svf_trst_mode_name[svf_para.trst_mode]);
-			} else {
-				LOG_ERROR("can not accept TRST command if trst_mode is ABSENT");
+		}
+		break;
+	case TRST:
+		/* TRST trst_mode */
+		if (num_of_argu != 2) {
+			LOG_ERROR("invalid parameter of %s", argus[0]);
+			return ERROR_FAIL;
+		}
+		if (svf_para.trst_mode != TRST_ABSENT) {
+			if (svf_execute_tap() != ERROR_OK)
+				return ERROR_FAIL;
+			i_tmp = svf_find_string_in_array(argus[1],
+					(char **)svf_trst_mode_name,
+					ARRAY_SIZE(svf_trst_mode_name));
+			switch (i_tmp) {
+			case TRST_ON:
+				if (!svf_nil)
+					jtag_add_reset(1, 0);
+				break;
+			case TRST_Z:
+			case TRST_OFF:
+				if (!svf_nil)
+					jtag_add_reset(0, 0);
+				break;
+			case TRST_ABSENT:
+				break;
+			default:
+				LOG_ERROR("unknown TRST mode: %s", argus[1]);
 				return ERROR_FAIL;
 			}
-			break;
-		default:
-			LOG_ERROR("invalid svf command: %s", argus[0]);
+			svf_para.trst_mode = i_tmp;
+			LOG_DEBUG("\ttrst_mode = %s", svf_trst_mode_name[svf_para.trst_mode]);
+		} else {
+			LOG_ERROR("can not accept TRST command if trst_mode is ABSENT");
 			return ERROR_FAIL;
+		}
+		break;
+	default:
+		LOG_ERROR("invalid svf command: %s", argus[0]);
+		return ERROR_FAIL;
 	}
 
 	if (!svf_quiet) {

-- 

[PATCH]: b194adaad1 flash: nor: align switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9034

-- gerrit

commit b194adaad1b020119852659ff2dd3526e57d3235
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 11:21:26 2025 +0200

    flash: nor: align switch and case statements
    
    The coding style requires the 'case' to be at the same indentation
    level of its 'switch' statement.
    
    Align the code accordingly.
    
    No changes are reported by
            git log -p -w --ignore-blank-lines --patience
    
    Change-Id: I6be44efd5189b671caabcf6753bb82ef44521440
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/ambiqmicro.c b/src/flash/nor/ambiqmicro.c
index 67cc6b68a7..cb9fa5ed77 100644
--- a/src/flash/nor/ambiqmicro.c
+++ b/src/flash/nor/ambiqmicro.c
@@ -190,37 +190,36 @@ static int ambiqmicro_read_part_info(struct flash_bank *bank)
 	ambiqmicro_info->target_class = (part_num & 0xFF000000) >> 24;
 
 	switch (ambiqmicro_info->target_class) {
-		case 1:		/* 1 - Apollo */
-		case 5:		/* 5 - Apollo Bootloader */
-			bank->base = bank->bank_number * 0x40000;
-			ambiqmicro_info->pagesize = 2048;
-			ambiqmicro_info->flshsiz =
+	case 1:		/* 1 - Apollo */
+	case 5:		/* 5 - Apollo Bootloader */
+		bank->base = bank->bank_number * 0x40000;
+		ambiqmicro_info->pagesize = 2048;
+		ambiqmicro_info->flshsiz =
 			apollo_flash_size[(part_num & 0x00F00000) >> 20];
-			ambiqmicro_info->sramsiz =
+		ambiqmicro_info->sramsiz =
 			apollo_sram_size[(part_num & 0x000F0000) >> 16];
-			ambiqmicro_info->num_pages = ambiqmicro_info->flshsiz /
-			ambiqmicro_info->pagesize;
-			if (ambiqmicro_info->num_pages > 128) {
-				ambiqmicro_info->num_pages = 128;
-				ambiqmicro_info->flshsiz = 1024 * 256;
-			}
-			break;
+		ambiqmicro_info->num_pages = ambiqmicro_info->flshsiz /
+		ambiqmicro_info->pagesize;
+		if (ambiqmicro_info->num_pages > 128) {
+			ambiqmicro_info->num_pages = 128;
+			ambiqmicro_info->flshsiz = 1024 * 256;
+		}
+		break;
 
-		default:
-			LOG_INFO("Unknown Class. Using Apollo-64 as default.");
+	default:
+		LOG_INFO("Unknown Class. Using Apollo-64 as default.");
 
-			bank->base = bank->bank_number * 0x40000;
-			ambiqmicro_info->pagesize = 2048;
-			ambiqmicro_info->flshsiz = apollo_flash_size[1];
-			ambiqmicro_info->sramsiz = apollo_sram_size[0];
-			ambiqmicro_info->num_pages = ambiqmicro_info->flshsiz /
+		bank->base = bank->bank_number * 0x40000;
+		ambiqmicro_info->pagesize = 2048;
+		ambiqmicro_info->flshsiz = apollo_flash_size[1];
+		ambiqmicro_info->sramsiz = apollo_sram_size[0];
+		ambiqmicro_info->num_pages = ambiqmicro_info->flshsiz /
 			ambiqmicro_info->pagesize;
-			if (ambiqmicro_info->num_pages > 128) {
-				ambiqmicro_info->num_pages = 128;
-				ambiqmicro_info->flshsiz = 1024 * 256;
-			}
-			break;
-
+		if (ambiqmicro_info->num_pages > 128) {
+			ambiqmicro_info->num_pages = 128;
+			ambiqmicro_info->flshsiz = 1024 * 256;
+		}
+		break;
 	}
 
 	if (ambiqmicro_info->target_class < ARRAY_SIZE(ambiqmicro_parts))
diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 4042d32dec..5f551681d5 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -2040,40 +2040,39 @@ do_retry:
 
 	/* Check command & argument */
 	switch (command) {
-
-		case AT91C_EFC_FCMD_WP:
-		case AT91C_EFC_FCMD_WPL:
-		case AT91C_EFC_FCMD_EWP:
-		case AT91C_EFC_FCMD_EWPL:
-		/* case AT91C_EFC_FCMD_EPL: */
-		/* case AT91C_EFC_FCMD_EPA: */
-		case AT91C_EFC_FCMD_SLB:
-		case AT91C_EFC_FCMD_CLB:
-			n = (private->size_bytes / private->page_size);
-			if (argument >= n)
-				LOG_ERROR("*BUG*: Embedded flash has only %" PRIu32 " pages", n);
-			break;
-
-		case AT91C_EFC_FCMD_SFB:
-		case AT91C_EFC_FCMD_CFB:
-			if (argument >= private->chip->details.n_gpnvms) {
-				LOG_ERROR("*BUG*: Embedded flash has only %d GPNVMs",
-						private->chip->details.n_gpnvms);
-			}
-			break;
-
-		case AT91C_EFC_FCMD_GETD:
-		case AT91C_EFC_FCMD_EA:
-		case AT91C_EFC_FCMD_GLB:
-		case AT91C_EFC_FCMD_GFB:
-		case AT91C_EFC_FCMD_STUI:
-		case AT91C_EFC_FCMD_SPUI:
-			if (argument != 0)
-				LOG_ERROR("Argument is meaningless for cmd: %d", command);
-			break;
-		default:
-			LOG_ERROR("Unknown command %d", command);
-			break;
+	case AT91C_EFC_FCMD_WP:
+	case AT91C_EFC_FCMD_WPL:
+	case AT91C_EFC_FCMD_EWP:
+	case AT91C_EFC_FCMD_EWPL:
+	/* case AT91C_EFC_FCMD_EPL: */
+	/* case AT91C_EFC_FCMD_EPA: */
+	case AT91C_EFC_FCMD_SLB:
+	case AT91C_EFC_FCMD_CLB:
+		n = (private->size_bytes / private->page_size);
+		if (argument >= n)
+			LOG_ERROR("*BUG*: Embedded flash has only %" PRIu32 " pages", n);
+		break;
+
+	case AT91C_EFC_FCMD_SFB:
+	case AT91C_EFC_FCMD_CFB:
+		if (argument >= private->chip->details.n_gpnvms) {
+			LOG_ERROR("*BUG*: Embedded flash has only %d GPNVMs",
+					private->chip->details.n_gpnvms);
+		}
+		break;
+
+	case AT91C_EFC_FCMD_GETD:
+	case AT91C_EFC_FCMD_EA:
+	case AT91C_EFC_FCMD_GLB:
+	case AT91C_EFC_FCMD_GFB:
+	case AT91C_EFC_FCMD_STUI:
+	case AT91C_EFC_FCMD_SPUI:
+		if (argument != 0)
+			LOG_ERROR("Argument is meaningless for cmd: %d", command);
+		break;
+	default:
+		LOG_ERROR("Unknown command %d", command);
+		break;
 	}
 
 	if (command == AT91C_EFC_FCMD_SPUI) {
@@ -2571,18 +2570,18 @@ static void sam3_explain_ckgr_mor(struct sam3_chip *chip)
 	chip->cfg.rc_freq = 0;
 	if (rcen) {
 		switch (v) {
-			case 0:
-				chip->cfg.rc_freq = 4 * 1000 * 1000;
-				break;
-			case 1:
-				chip->cfg.rc_freq = 8 * 1000 * 1000;
-				break;
-			case 2:
-				chip->cfg.rc_freq = 12 * 1000 * 1000;
-				break;
-			default:
-				chip->cfg.rc_freq = 0;
-				break;
+		case 0:
+			chip->cfg.rc_freq = 4 * 1000 * 1000;
+			break;
+		case 1:
+			chip->cfg.rc_freq = 8 * 1000 * 1000;
+			break;
+		case 2:
+			chip->cfg.rc_freq = 12 * 1000 * 1000;
+			break;
+		default:
+			chip->cfg.rc_freq = 0;
+			break;
 		}
 	}
 
@@ -2683,30 +2682,30 @@ static void sam3_explain_mckr(struct sam3_chip *chip)
 
 	css = sam3_reg_fieldname(chip, "CSS", chip->cfg.PMC_MCKR, 0, 2);
 	switch (css & 3) {
-		case 0:
-			fin = chip->cfg.slow_freq;
-			cp = "slowclk";
-			break;
-		case 1:
-			fin = chip->cfg.mainosc_freq;
-			cp  = "mainosc";
-			break;
-		case 2:
-			fin = chip->cfg.plla_freq;
-			cp  = "plla";
-			break;
-		case 3:
-			if (chip->cfg.CKGR_UCKR & (1 << 16)) {
-				fin = 480 * 1000 * 1000;
-				cp = "upll";
-			} else {
-				fin = 0;
-				cp  = "upll (*ERROR* UPLL is disabled)";
-			}
-			break;
-		default:
-			assert(0);
-			break;
+	case 0:
+		fin = chip->cfg.slow_freq;
+		cp = "slowclk";
+		break;
+	case 1:
+		fin = chip->cfg.mainosc_freq;
+		cp  = "mainosc";
+		break;
+	case 2:
+		fin = chip->cfg.plla_freq;
+		cp  = "plla";
+		break;
+	case 3:
+		if (chip->cfg.CKGR_UCKR & (1 << 16)) {
+			fin = 480 * 1000 * 1000;
+			cp = "upll";
+		} else {
+			fin = 0;
+			cp  = "upll (*ERROR* UPLL is disabled)";
+		}
+		break;
+	default:
+		assert(0);
+		break;
 	}
 
 	LOG_USER("%s (%3.03f Mhz)",
@@ -2714,41 +2713,41 @@ static void sam3_explain_mckr(struct sam3_chip *chip)
 		_tomhz(fin));
 	pres = sam3_reg_fieldname(chip, "PRES", chip->cfg.PMC_MCKR, 4, 3);
 	switch (pres & 0x07) {
-		case 0:
-			pdiv = 1;
-			cp = "selected clock";
-			break;
-		case 1:
-			pdiv = 2;
-			cp = "clock/2";
-			break;
-		case 2:
-			pdiv = 4;
-			cp = "clock/4";
-			break;
-		case 3:
-			pdiv = 8;
-			cp = "clock/8";
-			break;
-		case 4:
-			pdiv = 16;
-			cp = "clock/16";
-			break;
-		case 5:
-			pdiv = 32;
-			cp = "clock/32";
-			break;
-		case 6:
-			pdiv = 64;
-			cp = "clock/64";
-			break;
-		case 7:
-			pdiv = 6;
-			cp = "clock/6";
-			break;
-		default:
-			assert(0);
-			break;
+	case 0:
+		pdiv = 1;
+		cp = "selected clock";
+		break;
+	case 1:
+		pdiv = 2;
+		cp = "clock/2";
+		break;
+	case 2:
+		pdiv = 4;
+		cp = "clock/4";
+		break;
+	case 3:
+		pdiv = 8;
+		cp = "clock/8";
+		break;
+	case 4:
+		pdiv = 16;
+		cp = "clock/16";
+		break;
+	case 5:
+		pdiv = 32;
+		cp = "clock/32";
+		break;
+	case 6:
+		pdiv = 64;
+		cp = "clock/64";
+		break;
+	case 7:
+		pdiv = 6;
+		cp = "clock/6";
+		break;
+	default:
+		assert(0);
+		break;
 	}
 	LOG_USER("(%s)", cp);
 	fin = fin / pdiv;
@@ -3011,39 +3010,39 @@ FLASH_BANK_COMMAND_HANDLER(sam3_flash_bank_command)
 	}
 
 	switch (bank->base) {
-		/* at91sam3s and at91sam3n series only has bank 0*/
-		/* at91sam3u and at91sam3ax series has the same address for bank 0*/
-		case FLASH_BANK_BASE_S:
-		case FLASH_BANK0_BASE_U:
-			bank->driver_priv = &chip->details.bank[0];
-			bank->bank_number = 0;
-			chip->details.bank[0].chip = chip;
-			chip->details.bank[0].bank = bank;
-			break;
-
-		/* Bank 1 of at91sam3u or at91sam3ax series */
-		case FLASH_BANK1_BASE_U:
-		case FLASH_BANK1_BASE_256K_AX:
-		case FLASH_BANK1_BASE_512K_AX:
-			bank->driver_priv = &chip->details.bank[1];
-			bank->bank_number = 1;
-			chip->details.bank[1].chip = chip;
-			chip->details.bank[1].bank = bank;
-			break;
-
-		default:
-			LOG_ERROR("Address " TARGET_ADDR_FMT " invalid bank address (try 0x%08x or 0x%08x "
-				"[at91sam3u series] or 0x%08x [at91sam3s series] or "
-				"0x%08x [at91sam3n series] or 0x%08x or 0x%08x or 0x%08x[at91sam3ax series] )",
-				bank->base,
-				FLASH_BANK0_BASE_U,
-				FLASH_BANK1_BASE_U,
-				FLASH_BANK_BASE_S,
-				FLASH_BANK_BASE_N,
-				FLASH_BANK0_BASE_AX,
-				FLASH_BANK1_BASE_256K_AX,
-				FLASH_BANK1_BASE_512K_AX);
-			return ERROR_FAIL;
+	/* at91sam3s and at91sam3n series only has bank 0*/
+	/* at91sam3u and at91sam3ax series has the same address for bank 0*/
+	case FLASH_BANK_BASE_S:
+	case FLASH_BANK0_BASE_U:
+		bank->driver_priv = &chip->details.bank[0];
+		bank->bank_number = 0;
+		chip->details.bank[0].chip = chip;
+		chip->details.bank[0].bank = bank;
+		break;
+
+	/* Bank 1 of at91sam3u or at91sam3ax series */
+	case FLASH_BANK1_BASE_U:
+	case FLASH_BANK1_BASE_256K_AX:
+	case FLASH_BANK1_BASE_512K_AX:
+		bank->driver_priv = &chip->details.bank[1];
+		bank->bank_number = 1;
+		chip->details.bank[1].chip = chip;
+		chip->details.bank[1].bank = bank;
+		break;
+
+	default:
+		LOG_ERROR("Address " TARGET_ADDR_FMT " invalid bank address (try 0x%08x or 0x%08x "
+		"[at91sam3u series] or 0x%08x [at91sam3s series] or "
+		"0x%08x [at91sam3n series] or 0x%08x or 0x%08x or 0x%08x[at91sam3ax series] )",
+		bank->base,
+		FLASH_BANK0_BASE_U,
+		FLASH_BANK1_BASE_U,
+		FLASH_BANK_BASE_S,
+		FLASH_BANK_BASE_N,
+		FLASH_BANK0_BASE_AX,
+		FLASH_BANK1_BASE_256K_AX,
+		FLASH_BANK1_BASE_512K_AX);
+		return ERROR_FAIL;
 	}
 
 	/* we initialize after probing. */
@@ -3574,22 +3573,22 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
 	}
 
 	switch (CMD_ARGC) {
-		case 0:
-			goto showall;
-		case 1:
+	case 0:
+		goto showall;
+	case 1:
+		who = -1;
+		break;
+	case 2:
+		if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0)) {
 			who = -1;
-			break;
-		case 2:
-			if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0)) {
-				who = -1;
-			} else {
-				uint32_t v32;
-				COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
-				who = v32;
-			}
-			break;
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
+		} else {
+			uint32_t v32;
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
+			who = v32;
+		}
+		break;
+	default:
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	if (strcmp("show", CMD_ARGV[0]) == 0) {
@@ -3641,26 +3640,26 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
 		return ERROR_OK;
 
 	switch (CMD_ARGC) {
-		case 0:
-			/* show */
-			break;
-		case 1:
-		{
-			/* set */
-			uint32_t v;
-			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], v);
-			if (v > 200000) {
-				/* absurd slow clock of 200Khz? */
-				command_print(CMD, "Absurd/illegal slow clock freq: %d\n", (int)(v));
-				return ERROR_COMMAND_SYNTAX_ERROR;
-			}
-			chip->cfg.slow_freq = v;
-			break;
-		}
-		default:
-			/* error */
-			command_print(CMD, "Too many parameters");
+	case 0:
+		/* show */
+		break;
+	case 1:
+	{
+		/* set */
+		uint32_t v;
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], v);
+		if (v > 200000) {
+			/* absurd slow clock of 200Khz? */
+			command_print(CMD, "Absurd/illegal slow clock freq: %d\n", (int)(v));
 			return ERROR_COMMAND_SYNTAX_ERROR;
+		}
+		chip->cfg.slow_freq = v;
+		break;
+	}
+	default:
+		/* error */
+		command_print(CMD, "Too many parameters");
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 	command_print(CMD, "Slowclk freq: %d.%03dkhz",
 		(int)(chip->cfg.slow_freq / 1000),
diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index 08f1955778..dd3a1ca3f0 100644
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -1490,40 +1490,39 @@ do_retry:
 
 	/* Check command & argument */
 	switch (command) {
-
-		case AT91C_EFC_FCMD_WP:
-		case AT91C_EFC_FCMD_WPL:
-		case AT91C_EFC_FCMD_EWP:
-		case AT91C_EFC_FCMD_EWPL:
-		/* case AT91C_EFC_FCMD_EPL: */
-		case AT91C_EFC_FCMD_EPA:
-		case AT91C_EFC_FCMD_SLB:
-		case AT91C_EFC_FCMD_CLB:
-			n = (private->size_bytes / private->page_size);
-			if (argument >= n)
-				LOG_ERROR("*BUG*: Embedded flash has only %" PRIu32 " pages", n);
-			break;
-
-		case AT91C_EFC_FCMD_SFB:
-		case AT91C_EFC_FCMD_CFB:
-			if (argument >= private->chip->details.n_gpnvms) {
-				LOG_ERROR("*BUG*: Embedded flash has only %d GPNVMs",
-						private->chip->details.n_gpnvms);
-			}
-			break;
-
-		case AT91C_EFC_FCMD_GETD:
-		case AT91C_EFC_FCMD_EA:
-		case AT91C_EFC_FCMD_GLB:
-		case AT91C_EFC_FCMD_GFB:
-		case AT91C_EFC_FCMD_STUI:
-		case AT91C_EFC_FCMD_SPUI:
-			if (argument != 0)
-				LOG_ERROR("Argument is meaningless for cmd: %d", command);
-			break;
-		default:
-			LOG_ERROR("Unknown command %d", command);
-			break;
+	case AT91C_EFC_FCMD_WP:
+	case AT91C_EFC_FCMD_WPL:
+	case AT91C_EFC_FCMD_EWP:
+	case AT91C_EFC_FCMD_EWPL:
+	/* case AT91C_EFC_FCMD_EPL: */
+	case AT91C_EFC_FCMD_EPA:
+	case AT91C_EFC_FCMD_SLB:
+	case AT91C_EFC_FCMD_CLB:
+		n = (private->size_bytes / private->page_size);
+		if (argument >= n)
+			LOG_ERROR("*BUG*: Embedded flash has only %" PRIu32 " pages", n);
+		break;
+
+	case AT91C_EFC_FCMD_SFB:
+	case AT91C_EFC_FCMD_CFB:
+		if (argument >= private->chip->details.n_gpnvms) {
+			LOG_ERROR("*BUG*: Embedded flash has only %d GPNVMs",
+					private->chip->details.n_gpnvms);
+		}
+		break;
+
+	case AT91C_EFC_FCMD_GETD:
+	case AT91C_EFC_FCMD_EA:
+	case AT91C_EFC_FCMD_GLB:
+	case AT91C_EFC_FCMD_GFB:
+	case AT91C_EFC_FCMD_STUI:
+	case AT91C_EFC_FCMD_SPUI:
+		if (argument != 0)
+			LOG_ERROR("Argument is meaningless for cmd: %d", command);
+		break;
+	default:
+		LOG_ERROR("Unknown command %d", command);
+		break;
 	}
 
 	if (command == AT91C_EFC_FCMD_SPUI) {
@@ -1678,21 +1677,21 @@ static int flashd_erase_pages(struct sam4_bank_private *private,
 	LOG_DEBUG("Here");
 	uint8_t erase_pages;
 	switch (num_pages)	{
-		case 4:
-			erase_pages = 0x00;
-			break;
-		case 8:
-			erase_pages = 0x01;
-			break;
-		case 16:
-			erase_pages = 0x02;
-			break;
-		case 32:
-			erase_pages = 0x03;
-			break;
-		default:
-			erase_pages = 0x00;
-			break;
+	case 4:
+		erase_pages = 0x00;
+		break;
+	case 8:
+		erase_pages = 0x01;
+		break;
+	case 16:
+		erase_pages = 0x02;
+		break;
+	case 32:
+		erase_pages = 0x03;
+		break;
+	default:
+		erase_pages = 0x00;
+		break;
 	}
 
 	/* AT91C_EFC_FCMD_EPA
@@ -2080,18 +2079,18 @@ static void sam4_explain_ckgr_mor(struct sam4_chip *chip)
 	chip->cfg.rc_freq = 0;
 	if (rcen) {
 		switch (v) {
-			case 0:
-				chip->cfg.rc_freq = 4 * 1000 * 1000;
-				break;
-			case 1:
-				chip->cfg.rc_freq = 8 * 1000 * 1000;
-				break;
-			case 2:
-				chip->cfg.rc_freq = 12 * 1000 * 1000;
-				break;
-			default:
-				chip->cfg.rc_freq = 0;
-				break;
+		case 0:
+			chip->cfg.rc_freq = 4 * 1000 * 1000;
+			break;
+		case 1:
+			chip->cfg.rc_freq = 8 * 1000 * 1000;
+			break;
+		case 2:
+			chip->cfg.rc_freq = 12 * 1000 * 1000;
+			break;
+		default:
+			chip->cfg.rc_freq = 0;
+			break;
 		}
 	}
 
@@ -2192,30 +2191,30 @@ static void sam4_explain_mckr(struct sam4_chip *chip)
 
 	css = sam4_reg_fieldname(chip, "CSS", chip->cfg.PMC_MCKR, 0, 2);
 	switch (css & 3) {
-		case 0:
-			fin = chip->cfg.slow_freq;
-			cp = "slowclk";
-			break;
-		case 1:
-			fin = chip->cfg.mainosc_freq;
-			cp  = "mainosc";
-			break;
-		case 2:
-			fin = chip->cfg.plla_freq;
-			cp  = "plla";
-			break;
-		case 3:
-			if (chip->cfg.CKGR_UCKR & (1 << 16)) {
-				fin = 480 * 1000 * 1000;
-				cp = "upll";
-			} else {
-				fin = 0;
-				cp  = "upll (*ERROR* UPLL is disabled)";
-			}
-			break;
-		default:
-			assert(0);
-			break;
+	case 0:
+		fin = chip->cfg.slow_freq;
+		cp = "slowclk";
+		break;
+	case 1:
+		fin = chip->cfg.mainosc_freq;
+		cp  = "mainosc";
+		break;
+	case 2:
+		fin = chip->cfg.plla_freq;
+		cp  = "plla";
+		break;
+	case 3:
+		if (chip->cfg.CKGR_UCKR & (1 << 16)) {
+			fin = 480 * 1000 * 1000;
+			cp = "upll";
+		} else {
+			fin = 0;
+			cp  = "upll (*ERROR* UPLL is disabled)";
+		}
+		break;
+	default:
+		assert(0);
+		break;
 	}
 
 	LOG_USER("%s (%3.03f Mhz)",
@@ -2223,41 +2222,41 @@ static void sam4_explain_mckr(struct sam4_chip *chip)
 		_tomhz(fin));
 	pres = sam4_reg_fieldname(chip, "PRES", chip->cfg.PMC_MCKR, 4, 3);
 	switch (pres & 0x07) {
-		case 0:
-			pdiv = 1;
-			cp = "selected clock";
-			break;
-		case 1:
-			pdiv = 2;
-			cp = "clock/2";
-			break;
-		case 2:
-			pdiv = 4;
-			cp = "clock/4";
-			break;
-		case 3:
-			pdiv = 8;
-			cp = "clock/8";
-			break;
-		case 4:
-			pdiv = 16;
-			cp = "clock/16";
-			break;
-		case 5:
-			pdiv = 32;
-			cp = "clock/32";
-			break;
-		case 6:
-			pdiv = 64;
-			cp = "clock/64";
-			break;
-		case 7:
-			pdiv = 6;
-			cp = "clock/6";
-			break;
-		default:
-			assert(0);
-			break;
+	case 0:
+		pdiv = 1;
+		cp = "selected clock";
+		break;
+	case 1:
+		pdiv = 2;
+		cp = "clock/2";
+		break;
+	case 2:
+		pdiv = 4;
+		cp = "clock/4";
+		break;
+	case 3:
+		pdiv = 8;
+		cp = "clock/8";
+		break;
+	case 4:
+		pdiv = 16;
+		cp = "clock/16";
+		break;
+	case 5:
+		pdiv = 32;
+		cp = "clock/32";
+		break;
+	case 6:
+		pdiv = 64;
+		cp = "clock/64";
+		break;
+	case 7:
+		pdiv = 6;
+		cp = "clock/6";
+		break;
+	default:
+		assert(0);
+		break;
 	}
 	LOG_USER("(%s)", cp);
 	fin = fin / pdiv;
@@ -2504,32 +2503,32 @@ FLASH_BANK_COMMAND_HANDLER(sam4_flash_bank_command)
 	}
 
 	switch (bank->base) {
-		/* at91sam4s series only has bank 0*/
-		/* at91sam4sd series has the same address for bank 0 (FLASH_BANK0_BASE_SD)*/
-		case FLASH_BANK_BASE_S:
-		case FLASH_BANK_BASE_C:
-			bank->driver_priv = &chip->details.bank[0];
-			bank->bank_number = 0;
-			chip->details.bank[0].chip = chip;
-			chip->details.bank[0].bank = bank;
-			break;
-
-		/* Bank 1 of at91sam4sd/at91sam4c32 series */
-		case FLASH_BANK1_BASE_1024K_SD:
-		case FLASH_BANK1_BASE_2048K_SD:
-		case FLASH_BANK1_BASE_C32:
-			bank->driver_priv = &chip->details.bank[1];
-			bank->bank_number = 1;
-			chip->details.bank[1].chip = chip;
-			chip->details.bank[1].bank = bank;
-			break;
-
-		default:
-			LOG_ERROR("Address " TARGET_ADDR_FMT " invalid bank address (try 0x%08x"
-				"[at91sam4s series] )",
-				bank->base,
-				FLASH_BANK_BASE_S);
-			return ERROR_FAIL;
+	/* at91sam4s series only has bank 0*/
+	/* at91sam4sd series has the same address for bank 0 (FLASH_BANK0_BASE_SD)*/
+	case FLASH_BANK_BASE_S:
+	case FLASH_BANK_BASE_C:
+		bank->driver_priv = &chip->details.bank[0];
+		bank->bank_number = 0;
+		chip->details.bank[0].chip = chip;
+		chip->details.bank[0].bank = bank;
+		break;
+
+	/* Bank 1 of at91sam4sd/at91sam4c32 series */
+	case FLASH_BANK1_BASE_1024K_SD:
+	case FLASH_BANK1_BASE_2048K_SD:
+	case FLASH_BANK1_BASE_C32:
+		bank->driver_priv = &chip->details.bank[1];
+		bank->bank_number = 1;
+		chip->details.bank[1].chip = chip;
+		chip->details.bank[1].bank = bank;
+		break;
+
+	default:
+		LOG_ERROR("Address " TARGET_ADDR_FMT " invalid bank address (try 0x%08x"
+			"[at91sam4s series] )",
+			bank->base,
+			FLASH_BANK_BASE_S);
+		return ERROR_FAIL;
 	}
 
 	/* we initialize after probing. */
@@ -3122,22 +3121,22 @@ COMMAND_HANDLER(sam4_handle_gpnvm_command)
 	}
 
 	switch (CMD_ARGC) {
-		case 0:
-			goto showall;
-		case 1:
+	case 0:
+		goto showall;
+	case 1:
+		who = -1;
+		break;
+	case 2:
+		if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0)) {
 			who = -1;
-			break;
-		case 2:
-			if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0)) {
-				who = -1;
-			} else {
-				uint32_t v32;
-				COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
-				who = v32;
-			}
-			break;
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
+		} else {
+			uint32_t v32;
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
+			who = v32;
+		}
+		break;
+	default:
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	if (strcmp("show", CMD_ARGV[0]) == 0) {
@@ -3189,26 +3188,26 @@ COMMAND_HANDLER(sam4_handle_slowclk_command)
 		return ERROR_OK;
 
 	switch (CMD_ARGC) {
-		case 0:
-			/* show */
-			break;
-		case 1:
-		{
-			/* set */
-			uint32_t v;
-			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], v);
-			if (v > 200000) {
-				/* absurd slow clock of 200Khz? */
-				command_print(CMD, "Absurd/illegal slow clock freq: %d\n", (int)(v));
-				return ERROR_COMMAND_SYNTAX_ERROR;
-			}
-			chip->cfg.slow_freq = v;
-			break;
-		}
-		default:
-			/* error */
-			command_print(CMD, "Too many parameters");
+	case 0:
+		/* show */
+		break;
+	case 1:
+	{
+		/* set */
+		uint32_t v;
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], v);
+		if (v > 200000) {
+			/* absurd slow clock of 200Khz? */
+			command_print(CMD, "Absurd/illegal slow clock freq: %d\n", (int)(v));
 			return ERROR_COMMAND_SYNTAX_ERROR;
+		}
+		chip->cfg.slow_freq = v;
+		break;
+	}
+	default:
+		/* error */
+		command_print(CMD, "Too many parameters");
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 	command_print(CMD, "Slowclk freq: %d.%03dkhz",
 		(int)(chip->cfg.slow_freq / 1000),
diff --git a/src/flash/nor/at91sam4l.c b/src/flash/nor/at91sam4l.c
index ddf42a8c5f..1db15377eb 100644
--- a/src/flash/nor/at91sam4l.c
+++ b/src/flash/nor/at91sam4l.c
@@ -282,19 +282,19 @@ static int sam4l_probe(struct flash_bank *bank)
 	chip->ram_kb = sam4l_ram_sizes[0xF & (id >> 16)];
 
 	switch (0xF & (id >> 8)) {
-		case 0x07:
-			chip->flash_kb = 128;
-			break;
-		case 0x09:
-			chip->flash_kb = 256;
-			break;
-		case 0x0A:
-			chip->flash_kb = 512;
-			break;
-		default:
-			LOG_ERROR("Unknown flash size (chip ID is %08" PRIx32 "), assuming 128K", id);
-			chip->flash_kb = 128;
-			break;
+	case 0x07:
+		chip->flash_kb = 128;
+		break;
+	case 0x09:
+		chip->flash_kb = 256;
+		break;
+	case 0x0A:
+		chip->flash_kb = 512;
+		break;
+	default:
+		LOG_ERROR("Unknown flash size (chip ID is %08" PRIx32 "), assuming 128K", id);
+		chip->flash_kb = 128;
+		break;
 	}
 
 	/* Retrieve the Flash parameters */
diff --git a/src/flash/nor/at91sam7.c b/src/flash/nor/at91sam7.c
index d06c9451ce..316596e6e2 100644
--- a/src/flash/nor/at91sam7.c
+++ b/src/flash/nor/at91sam7.c
@@ -193,41 +193,41 @@ static void at91sam7_read_clock_info(struct flash_bank *bank)
 	at91sam7_info->mck_valid = 0;
 	at91sam7_info->mck_freq = 0;
 	switch (mckr & PMC_MCKR_CSS) {
-		case 0:			/* Slow Clock */
+	case 0:			/* Slow Clock */
+		at91sam7_info->mck_valid = 1;
+		tmp = RC_FREQ;
+		break;
+
+	case 1:			/* Main Clock */
+		if ((mcfr & CKGR_MCFR_MAINRDY) && at91sam7_info->ext_freq == 0) {
 			at91sam7_info->mck_valid = 1;
-			tmp = RC_FREQ;
-			break;
-
-		case 1:			/* Main Clock */
-			if ((mcfr & CKGR_MCFR_MAINRDY) && at91sam7_info->ext_freq == 0) {
-				at91sam7_info->mck_valid = 1;
-				tmp = RC_FREQ / 16ul * (mcfr & 0xffff);
-			} else if (at91sam7_info->ext_freq != 0) {
-				at91sam7_info->mck_valid = 1;
-				tmp = at91sam7_info->ext_freq;
-			}
-			break;
-
-		case 2:			/* Reserved */
-			break;
-
-		case 3:			/* PLL Clock */
-			if ((mcfr & CKGR_MCFR_MAINRDY) && at91sam7_info->ext_freq == 0) {
-				target_read_u32(target, CKGR_PLLR, &pllr);
-				if (!(pllr & CKGR_PLLR_DIV))
-					break;	/* 0 Hz */
-				at91sam7_info->mck_valid = 1;
-				mainfreq = RC_FREQ / 16ul * (mcfr & 0xffff);
-				/* Integer arithmetic should have sufficient precision
-				 * as long as PLL is properly configured. */
-				tmp = mainfreq / (pllr & CKGR_PLLR_DIV)*
-						(((pllr & CKGR_PLLR_MUL) >> 16) + 1);
-			} else if ((at91sam7_info->ext_freq != 0) && ((pllr & CKGR_PLLR_DIV) != 0)) {
-				at91sam7_info->mck_valid = 1;
-				tmp = at91sam7_info->ext_freq / (pllr&CKGR_PLLR_DIV)*
-						(((pllr & CKGR_PLLR_MUL) >> 16) + 1);
-			}
-			break;
+			tmp = RC_FREQ / 16ul * (mcfr & 0xffff);
+		} else if (at91sam7_info->ext_freq != 0) {
+			at91sam7_info->mck_valid = 1;
+			tmp = at91sam7_info->ext_freq;
+		}
+		break;
+
+	case 2:			/* Reserved */
+		break;
+
+	case 3:			/* PLL Clock */
+		if ((mcfr & CKGR_MCFR_MAINRDY) && at91sam7_info->ext_freq == 0) {
+			target_read_u32(target, CKGR_PLLR, &pllr);
+			if (!(pllr & CKGR_PLLR_DIV))
+				break;	/* 0 Hz */
+			at91sam7_info->mck_valid = 1;
+			mainfreq = RC_FREQ / 16ul * (mcfr & 0xffff);
+			/* Integer arithmetic should have sufficient precision
+			 * as long as PLL is properly configured. */
+			tmp = mainfreq / (pllr & CKGR_PLLR_DIV) *
+					(((pllr & CKGR_PLLR_MUL) >> 16) + 1);
+		} else if ((at91sam7_info->ext_freq != 0) && ((pllr & CKGR_PLLR_DIV) != 0)) {
+			at91sam7_info->mck_valid = 1;
+			tmp = at91sam7_info->ext_freq / (pllr & CKGR_PLLR_DIV) *
+					(((pllr & CKGR_PLLR_MUL) >> 16) + 1);
+		}
+		break;
 	}
 
 	/* Prescaler adjust */
@@ -415,130 +415,130 @@ static int at91sam7_read_part_info(struct flash_bank *bank)
 
 	/* check flash size */
 	switch ((cidr >> 8)&0x000F) {
-		case FLASH_SIZE_8KB:
-			break;
-
-		case FLASH_SIZE_16KB:
-			banks_num = 1;
-			sectors_num = 8;
-			pages_per_sector = 32;
-			page_size  = 64;
-			base_address = 0x00100000;
-			if (arch == 0x70) {
-				num_nvmbits = 2;
-				target_name_t = "AT91SAM7S161/16";
-			}
-			break;
-
-		case FLASH_SIZE_32KB:
-			banks_num = 1;
-			sectors_num = 8;
-			pages_per_sector = 32;
-			page_size  = 128;
-			base_address = 0x00100000;
-			if (arch == 0x70) {
-				num_nvmbits = 2;
-				target_name_t = "AT91SAM7S321/32";
-			}
-			if (arch == 0x72) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7SE32";
-			}
-			break;
-
-		case FLASH_SIZE_64KB:
-			banks_num = 1;
-			sectors_num = 16;
-			pages_per_sector = 32;
-			page_size  = 128;
-			base_address = 0x00100000;
-			if (arch == 0x70) {
-				num_nvmbits = 2;
-				target_name_t = "AT91SAM7S64";
-			}
-			break;
-
-		case FLASH_SIZE_128KB:
-			banks_num = 1;
-			sectors_num = 8;
-			pages_per_sector = 64;
-			page_size  = 256;
-			base_address = 0x00100000;
-			if (arch == 0x70) {
-				num_nvmbits = 2;
-				target_name_t = "AT91SAM7S128";
-			}
-			if (arch == 0x71) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7XC128";
-			}
-			if (arch == 0x72) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7SE128";
-			}
-			if (arch == 0x75) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7X128";
-			}
-			break;
-
-		case FLASH_SIZE_256KB:
-			banks_num = 1;
-			sectors_num = 16;
-			pages_per_sector = 64;
-			page_size  = 256;
-			base_address = 0x00100000;
-			if (arch == 0x60) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7A3";
-			}
-			if (arch == 0x70) {
-				num_nvmbits = 2;
-				target_name_t = "AT91SAM7S256";
-			}
-			if (arch == 0x71) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7XC256";
-			}
-			if (arch == 0x72) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7SE256";
-			}
-			if (arch == 0x75) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7X256";
-			}
-			break;
-
-		case FLASH_SIZE_512KB:
-			banks_num = 2;
-			sectors_num = 16;
-			pages_per_sector = 64;
-			page_size  = 256;
-			base_address = 0x00100000;
-			if (arch == 0x70) {
-				num_nvmbits = 2;
-				target_name_t = "AT91SAM7S512";
-			}
-			if (arch == 0x71) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7XC512";
-			}
-			if (arch == 0x72) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7SE512";
-			}
-			if (arch == 0x75) {
-				num_nvmbits = 3;
-				target_name_t = "AT91SAM7X512";
-			}
-			break;
+	case FLASH_SIZE_8KB:
+		break;
+
+	case FLASH_SIZE_16KB:
+		banks_num = 1;
+		sectors_num = 8;
+		pages_per_sector = 32;
+		page_size  = 64;
+		base_address = 0x00100000;
+		if (arch == 0x70) {
+			num_nvmbits = 2;
+			target_name_t = "AT91SAM7S161/16";
+		}
+		break;
+
+	case FLASH_SIZE_32KB:
+		banks_num = 1;
+		sectors_num = 8;
+		pages_per_sector = 32;
+		page_size  = 128;
+		base_address = 0x00100000;
+		if (arch == 0x70) {
+			num_nvmbits = 2;
+			target_name_t = "AT91SAM7S321/32";
+		}
+		if (arch == 0x72) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7SE32";
+		}
+		break;
+
+	case FLASH_SIZE_64KB:
+		banks_num = 1;
+		sectors_num = 16;
+		pages_per_sector = 32;
+		page_size  = 128;
+		base_address = 0x00100000;
+		if (arch == 0x70) {
+			num_nvmbits = 2;
+			target_name_t = "AT91SAM7S64";
+		}
+		break;
+
+	case FLASH_SIZE_128KB:
+		banks_num = 1;
+		sectors_num = 8;
+		pages_per_sector = 64;
+		page_size  = 256;
+		base_address = 0x00100000;
+		if (arch == 0x70) {
+			num_nvmbits = 2;
+			target_name_t = "AT91SAM7S128";
+		}
+		if (arch == 0x71) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7XC128";
+		}
+		if (arch == 0x72) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7SE128";
+		}
+		if (arch == 0x75) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7X128";
+		}
+		break;
+
+	case FLASH_SIZE_256KB:
+		banks_num = 1;
+		sectors_num = 16;
+		pages_per_sector = 64;
+		page_size  = 256;
+		base_address = 0x00100000;
+		if (arch == 0x60) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7A3";
+		}
+		if (arch == 0x70) {
+			num_nvmbits = 2;
+			target_name_t = "AT91SAM7S256";
+		}
+		if (arch == 0x71) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7XC256";
+		}
+		if (arch == 0x72) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7SE256";
+		}
+		if (arch == 0x75) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7X256";
+		}
+		break;
+
+	case FLASH_SIZE_512KB:
+		banks_num = 2;
+		sectors_num = 16;
+		pages_per_sector = 64;
+		page_size  = 256;
+		base_address = 0x00100000;
+		if (arch == 0x70) {
+			num_nvmbits = 2;
+			target_name_t = "AT91SAM7S512";
+		}
+		if (arch == 0x71) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7XC512";
+		}
+		if (arch == 0x72) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7SE512";
+		}
+		if (arch == 0x75) {
+			num_nvmbits = 3;
+			target_name_t = "AT91SAM7X512";
+		}
+		break;
 
-		case FLASH_SIZE_1024KB:
-			break;
+	case FLASH_SIZE_1024KB:
+		break;
 
-		case FLASH_SIZE_2048KB:
-			break;
+	case FLASH_SIZE_2048KB:
+		break;
 	}
 
 	if (strcmp(target_name_t, "Unknown") == 0) {
diff --git a/src/flash/nor/atsamv.c b/src/flash/nor/atsamv.c
index 85a4384200..782c9e8e8e 100644
--- a/src/flash/nor/atsamv.c
+++ b/src/flash/nor/atsamv.c
@@ -138,21 +138,21 @@ static int samv_erase_pages(struct target *target,
 {
 	uint8_t erase_pages;
 	switch (num_pages) {
-		case 4:
-			erase_pages = 0x00;
-			break;
-		case 8:
-			erase_pages = 0x01;
-			break;
-		case 16:
-			erase_pages = 0x02;
-			break;
-		case 32:
-			erase_pages = 0x03;
-			break;
-		default:
-			erase_pages = 0x00;
-			break;
+	case 4:
+		erase_pages = 0x00;
+		break;
+	case 8:
+		erase_pages = 0x01;
+		break;
+	case 16:
+		erase_pages = 0x02;
+		break;
+	case 32:
+		erase_pages = 0x03;
+		break;
+	default:
+		erase_pages = 0x00;
+		break;
 	}
 
 	/* SAMV_EFC_FCMD_EPA
@@ -320,18 +320,18 @@ static int samv_probe(struct flash_bank *bank)
 
 	uint8_t nvm_size_code = (device_id >> 8) & 0xf;
 	switch (nvm_size_code) {
-		case 10:
-			bank->size = 512 * 1024;
-			break;
-		case 12:
-			bank->size = 1024 * 1024;
-			break;
-		case 14:
-			bank->size = 2048 * 1024;
-			break;
-		default:
-			LOG_ERROR("unrecognized flash size code: %d", nvm_size_code);
-			return ERROR_FAIL;
+	case 10:
+		bank->size = 512 * 1024;
+		break;
+	case 12:
+		bank->size = 1024 * 1024;
+		break;
+	case 14:
+		bank->size = 2048 * 1024;
+		break;
+	default:
+		LOG_ERROR("unrecognized flash size code: %d", nvm_size_code);
+		return ERROR_FAIL;
 	}
 
 	struct samv_flash_bank *samv_info = bank->driver_priv;
@@ -600,22 +600,22 @@ COMMAND_HANDLER(samv_handle_gpnvm_command)
 	int who = 0;
 
 	switch (CMD_ARGC) {
-		case 0:
-			goto showall;
-		case 1:
+	case 0:
+		goto showall;
+	case 1:
+		who = -1;
+		break;
+	case 2:
+		if (!strcmp(CMD_ARGV[0], "show") && !strcmp(CMD_ARGV[1], "all")) {
 			who = -1;
-			break;
-		case 2:
-			if (!strcmp(CMD_ARGV[0], "show") && !strcmp(CMD_ARGV[1], "all")) {
-				who = -1;
-			} else {
-				uint32_t v32;
-				COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
-				who = v32;
-			}
-			break;
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
+		} else {
+			uint32_t v32;
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
+			who = v32;
+		}
+		break;
+	default:
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	unsigned int v = 0;
diff --git a/src/flash/nor/cc26xx.c b/src/flash/nor/cc26xx.c
index 54d61421ce..e97f1ba137 100644
--- a/src/flash/nor/cc26xx.c
+++ b/src/flash/nor/cc26xx.c
@@ -51,22 +51,22 @@ static uint32_t cc26xx_device_type(uint32_t icepick_id, uint32_t user_id)
 	uint32_t device_type = 0;
 
 	switch (icepick_id & ICEPICK_ID_MASK) {
-		case CC26X0_ICEPICK_ID:
-			device_type = CC26X0_TYPE;
-			break;
-		case CC26X1_ICEPICK_ID:
-			device_type = CC26X1_TYPE;
-			break;
-		case CC13X0_ICEPICK_ID:
-			device_type = CC13X0_TYPE;
-			break;
-		case CC13X2_CC26X2_ICEPICK_ID:
-		default:
-			if ((user_id & USER_ID_CC13_MASK) != 0)
-				device_type = CC13X2_TYPE;
-			else
-				device_type = CC26X2_TYPE;
-			break;
+	case CC26X0_ICEPICK_ID:
+		device_type = CC26X0_TYPE;
+		break;
+	case CC26X1_ICEPICK_ID:
+		device_type = CC26X1_TYPE;
+		break;
+	case CC13X0_ICEPICK_ID:
+		device_type = CC13X0_TYPE;
+		break;
+	case CC13X2_CC26X2_ICEPICK_ID:
+	default:
+		if ((user_id & USER_ID_CC13_MASK) != 0)
+			device_type = CC13X2_TYPE;
+		else
+			device_type = CC26X2_TYPE;
+		break;
 	}
 
 	return device_type;
@@ -77,17 +77,17 @@ static uint32_t cc26xx_sector_length(uint32_t icepick_id)
 	uint32_t sector_length;
 
 	switch (icepick_id & ICEPICK_ID_MASK) {
-		case CC26X0_ICEPICK_ID:
-		case CC26X1_ICEPICK_ID:
-		case CC13X0_ICEPICK_ID:
-			/* Chameleon family device */
-			sector_length = CC26X0_SECTOR_LENGTH;
-			break;
-		case CC13X2_CC26X2_ICEPICK_ID:
-		default:
-			/* Agama family device */
-			sector_length = CC26X2_SECTOR_LENGTH;
-			break;
+	case CC26X0_ICEPICK_ID:
+	case CC26X1_ICEPICK_ID:
+	case CC13X0_ICEPICK_ID:
+		/* Chameleon family device */
+		sector_length = CC26X0_SECTOR_LENGTH;
+		break;
+	case CC13X2_CC26X2_ICEPICK_ID:
+	default:
+		/* Agama family device */
+		sector_length = CC26X2_SECTOR_LENGTH;
+		break;
 	}
 
 	return sector_length;
@@ -427,31 +427,31 @@ static int cc26xx_probe(struct flash_bank *bank)
 
 	/* Set up appropriate flash helper algorithm */
 	switch (cc26xx_bank->icepick_id & ICEPICK_ID_MASK) {
-		case CC26X0_ICEPICK_ID:
-		case CC26X1_ICEPICK_ID:
-		case CC13X0_ICEPICK_ID:
-			/* Chameleon family device */
-			cc26xx_bank->algo_code = cc26x0_algo;
-			cc26xx_bank->algo_size = sizeof(cc26x0_algo);
-			cc26xx_bank->algo_working_size = CC26X0_WORKING_SIZE;
-			cc26xx_bank->buffer_addr[0] = CC26X0_ALGO_BUFFER_0;
-			cc26xx_bank->buffer_addr[1] = CC26X0_ALGO_BUFFER_1;
-			cc26xx_bank->params_addr[0] = CC26X0_ALGO_PARAMS_0;
-			cc26xx_bank->params_addr[1] = CC26X0_ALGO_PARAMS_1;
-			max_sectors = CC26X0_MAX_SECTORS;
-			break;
-		case CC13X2_CC26X2_ICEPICK_ID:
-		default:
-			/* Agama family device */
-			cc26xx_bank->algo_code = cc26x2_algo;
-			cc26xx_bank->algo_size = sizeof(cc26x2_algo);
-			cc26xx_bank->algo_working_size = CC26X2_WORKING_SIZE;
-			cc26xx_bank->buffer_addr[0] = CC26X2_ALGO_BUFFER_0;
-			cc26xx_bank->buffer_addr[1] = CC26X2_ALGO_BUFFER_1;
-			cc26xx_bank->params_addr[0] = CC26X2_ALGO_PARAMS_0;
-			cc26xx_bank->params_addr[1] = CC26X2_ALGO_PARAMS_1;
-			max_sectors = CC26X2_MAX_SECTORS;
-			break;
+	case CC26X0_ICEPICK_ID:
+	case CC26X1_ICEPICK_ID:
+	case CC13X0_ICEPICK_ID:
+		/* Chameleon family device */
+		cc26xx_bank->algo_code = cc26x0_algo;
+		cc26xx_bank->algo_size = sizeof(cc26x0_algo);
+		cc26xx_bank->algo_working_size = CC26X0_WORKING_SIZE;
+		cc26xx_bank->buffer_addr[0] = CC26X0_ALGO_BUFFER_0;
+		cc26xx_bank->buffer_addr[1] = CC26X0_ALGO_BUFFER_1;
+		cc26xx_bank->params_addr[0] = CC26X0_ALGO_PARAMS_0;
+		cc26xx_bank->params_addr[1] = CC26X0_ALGO_PARAMS_1;
+		max_sectors = CC26X0_MAX_SECTORS;
+		break;
+	case CC13X2_CC26X2_ICEPICK_ID:
+	default:
+		/* Agama family device */
+		cc26xx_bank->algo_code = cc26x2_algo;
+		cc26xx_bank->algo_size = sizeof(cc26x2_algo);
+		cc26xx_bank->algo_working_size = CC26X2_WORKING_SIZE;
+		cc26xx_bank->buffer_addr[0] = CC26X2_ALGO_BUFFER_0;
+		cc26xx_bank->buffer_addr[1] = CC26X2_ALGO_BUFFER_1;
+		cc26xx_bank->params_addr[0] = CC26X2_ALGO_PARAMS_0;
+		cc26xx_bank->params_addr[1] = CC26X2_ALGO_PARAMS_1;
+		max_sectors = CC26X2_MAX_SECTORS;
+		break;
 	}
 
 	retval = target_read_u32(target, CC26XX_FLASH_SIZE_INFO, &value);
@@ -505,25 +505,25 @@ static int cc26xx_info(struct flash_bank *bank, struct command_invocation *cmd)
 	const char *device;
 
 	switch (cc26xx_bank->device_type) {
-		case CC26X0_TYPE:
-			device = "CC26x0";
-			break;
-		case CC26X1_TYPE:
-			device = "CC26x1";
-			break;
-		case CC13X0_TYPE:
-			device = "CC13x0";
-			break;
-		case CC13X2_TYPE:
-			device = "CC13x2";
-			break;
-		case CC26X2_TYPE:
-			device = "CC26x2";
-			break;
-		case CC26XX_NO_TYPE:
-		default:
-			device = "Unrecognized";
-			break;
+	case CC26X0_TYPE:
+		device = "CC26x0";
+		break;
+	case CC26X1_TYPE:
+		device = "CC26x1";
+		break;
+	case CC13X0_TYPE:
+		device = "CC13x0";
+		break;
+	case CC13X2_TYPE:
+		device = "CC13x2";
+		break;
+	case CC26X2_TYPE:
+		device = "CC26x2";
+		break;
+	case CC26XX_NO_TYPE:
+	default:
+		device = "Unrecognized";
+		break;
 	}
 
 	command_print_sameline(cmd,
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 2a15e49132..be10d5b2a2 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -945,14 +945,14 @@ int cfi_erase(struct flash_bank *bank, unsigned int first,
 		return ERROR_FLASH_BANK_NOT_PROBED;
 
 	switch (cfi_info->pri_id) {
-		case 1:
-		case 3:
-			return cfi_intel_erase(bank, first, last);
-		case 2:
-			return cfi_spansion_erase(bank, first, last);
-		default:
-			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-			break;
+	case 1:
+	case 3:
+		return cfi_intel_erase(bank, first, last);
+	case 2:
+		return cfi_spansion_erase(bank, first, last);
+	default:
+		LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+		break;
 	}
 
 	return ERROR_OK;
@@ -1084,12 +1084,12 @@ int cfi_protect(struct flash_bank *bank, int set, unsigned int first,
 		return ERROR_FLASH_BANK_NOT_PROBED;
 
 	switch (cfi_info->pri_id) {
-		case 1:
-		case 3:
-			return cfi_intel_protect(bank, set, first, last);
-		default:
-			LOG_WARNING("protect: cfi primary command set %i unsupported", cfi_info->pri_id);
-			return ERROR_OK;
+	case 1:
+	case 3:
+		return cfi_intel_protect(bank, set, first, last);
+	default:
+		LOG_WARNING("protect: cfi primary command set %i unsupported", cfi_info->pri_id);
+		return ERROR_OK;
 	}
 }
 
@@ -1100,16 +1100,16 @@ static uint32_t cfi_command_val(struct flash_bank *bank, uint8_t cmd)
 	uint8_t buf[CFI_MAX_BUS_WIDTH];
 	cfi_command(bank, cmd, buf);
 	switch (bank->bus_width) {
-		case 1:
-			return buf[0];
-		case 2:
-			return target_buffer_get_u16(target, buf);
-		case 4:
-			return target_buffer_get_u32(target, buf);
-		default:
-			LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
-					bank->bus_width);
-			return 0;
+	case 1:
+		return buf[0];
+	case 2:
+		return target_buffer_get_u16(target, buf);
+	case 4:
+		return target_buffer_get_u32(target, buf);
+	default:
+		LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
+				bank->bus_width);
+		return 0;
 	}
 }
 
@@ -1214,22 +1214,22 @@ static int cfi_intel_write_block(struct flash_bank *bank, const uint8_t *buffer,
 
 	/* prepare algorithm code for target endian */
 	switch (bank->bus_width) {
-		case 1:
-			target_code_src = word_8_code;
-			target_code_size = sizeof(word_8_code);
-			break;
-		case 2:
-			target_code_src = word_16_code;
-			target_code_size = sizeof(word_16_code);
-			break;
-		case 4:
-			target_code_src = word_32_code;
-			target_code_size = sizeof(word_32_code);
-			break;
-		default:
-			LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
-					bank->bus_width);
-			return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+	case 1:
+		target_code_src = word_8_code;
+		target_code_size = sizeof(word_8_code);
+		break;
+	case 2:
+		target_code_src = word_16_code;
+		target_code_size = sizeof(word_16_code);
+		break;
+	case 4:
+		target_code_src = word_32_code;
+		target_code_size = sizeof(word_32_code);
+		break;
+	default:
+		LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
+				bank->bus_width);
+		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
 	/* flash write code */
@@ -1448,22 +1448,22 @@ static int cfi_spansion_write_block_mips(struct flash_bank *bank, const uint8_t
 	const uint32_t *target_code_src = NULL;
 
 	switch (bank->bus_width) {
-		case 2:
-			/* Check for DQ5 support */
-			if (cfi_info->status_poll_mask & (1 << 5)) {
-				target_code_src = mips_word_16_code;
-				target_code_size = sizeof(mips_word_16_code);
-			} else {
-				LOG_ERROR("Need DQ5 support");
-				return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-				/* target_code_src = mips_word_16_code_dq7only; */
-				/* target_code_size = sizeof(mips_word_16_code_dq7only); */
-			}
-			break;
-		default:
-			LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
-					bank->bus_width);
+	case 2:
+		/* Check for DQ5 support */
+		if (cfi_info->status_poll_mask & (1 << 5)) {
+			target_code_src = mips_word_16_code;
+			target_code_size = sizeof(mips_word_16_code);
+		} else {
+			LOG_ERROR("Need DQ5 support");
 			return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+			/* target_code_src = mips_word_16_code_dq7only; */
+			/* target_code_size = sizeof(mips_word_16_code_dq7only); */
+		}
+		break;
+	default:
+		LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
+				bank->bus_width);
+		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
 	/* flash write code */
@@ -1800,49 +1800,49 @@ static int cfi_spansion_write_block(struct flash_bank *bank, const uint8_t *buff
 	const uint32_t *target_code_src = NULL;
 
 	switch (bank->bus_width) {
-		case 1:
+	case 1:
+		if (is_armv7m(target_to_armv7m(target))) {
+			LOG_ERROR("Unknown ARM architecture");
+			return ERROR_FAIL;
+		}
+		target_code_src = armv4_5_word_8_code;
+		target_code_size = sizeof(armv4_5_word_8_code);
+		break;
+	case 2:
+		/* Check for DQ5 support */
+		if (cfi_info->status_poll_mask & (1 << 5)) {
 			if (is_armv7m(target_to_armv7m(target))) {
-				LOG_ERROR("Unknown ARM architecture");
-				return ERROR_FAIL;
+				/* armv7m target */
+				target_code_src = armv7m_word_16_code;
+				target_code_size = sizeof(armv7m_word_16_code);
+			} else { /* armv4_5 target */
+				target_code_src = armv4_5_word_16_code;
+				target_code_size = sizeof(armv4_5_word_16_code);
 			}
-			target_code_src = armv4_5_word_8_code;
-			target_code_size = sizeof(armv4_5_word_8_code);
-			break;
-		case 2:
-			/* Check for DQ5 support */
-			if (cfi_info->status_poll_mask & (1 << 5)) {
-				if (is_armv7m(target_to_armv7m(target))) {
-					/* armv7m target */
-					target_code_src = armv7m_word_16_code;
-					target_code_size = sizeof(armv7m_word_16_code);
-				} else { /* armv4_5 target */
-					target_code_src = armv4_5_word_16_code;
-					target_code_size = sizeof(armv4_5_word_16_code);
-				}
-			} else {
-				/* No DQ5 support. Use DQ7 DATA# polling only. */
-				if (is_armv7m(target_to_armv7m(target))) {
-					/* armv7m target */
-					target_code_src = armv7m_word_16_code_dq7only;
-					target_code_size = sizeof(armv7m_word_16_code_dq7only);
-				} else { /* armv4_5 target */
-					target_code_src = armv4_5_word_16_code_dq7only;
-					target_code_size = sizeof(armv4_5_word_16_code_dq7only);
-				}
-			}
-			break;
-		case 4:
+		} else {
+			/* No DQ5 support. Use DQ7 DATA# polling only. */
 			if (is_armv7m(target_to_armv7m(target))) {
-				LOG_ERROR("Unknown ARM architecture");
-				return ERROR_FAIL;
+				/* armv7m target */
+				target_code_src = armv7m_word_16_code_dq7only;
+				target_code_size = sizeof(armv7m_word_16_code_dq7only);
+			} else { /* armv4_5 target */
+				target_code_src = armv4_5_word_16_code_dq7only;
+				target_code_size = sizeof(armv4_5_word_16_code_dq7only);
 			}
-			target_code_src = armv4_5_word_32_code;
-			target_code_size = sizeof(armv4_5_word_32_code);
-			break;
-		default:
-			LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
-					bank->bus_width);
-			return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+		}
+		break;
+	case 4:
+		if (is_armv7m(target_to_armv7m(target))) {
+			LOG_ERROR("Unknown ARM architecture");
+			return ERROR_FAIL;
+		}
+		target_code_src = armv4_5_word_32_code;
+		target_code_size = sizeof(armv4_5_word_32_code);
+		break;
+	default:
+		LOG_ERROR("Unsupported bank buswidth %u, can't do block memory writes",
+				bank->bus_width);
+		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	}
 
 	/* flash write code */
@@ -2172,14 +2172,14 @@ int cfi_write_word(struct flash_bank *bank, uint8_t *word, uint32_t address)
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
 
 	switch (cfi_info->pri_id) {
-		case 1:
-		case 3:
-			return cfi_intel_write_word(bank, word, address);
-		case 2:
-			return cfi_spansion_write_word(bank, word, address);
-		default:
-			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-			break;
+	case 1:
+	case 3:
+		return cfi_intel_write_word(bank, word, address);
+	case 2:
+		return cfi_spansion_write_word(bank, word, address);
+	default:
+		LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+		break;
 	}
 
 	return ERROR_FLASH_OPERATION_FAILED;
@@ -2197,14 +2197,14 @@ static int cfi_write_words(struct flash_bank *bank, const uint8_t *word,
 	}
 
 	switch (cfi_info->pri_id) {
-		case 1:
-		case 3:
-			return cfi_intel_write_words(bank, word, wordcount, address);
-		case 2:
-			return cfi_spansion_write_words(bank, word, wordcount, address);
-		default:
-			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-			break;
+	case 1:
+	case 3:
+		return cfi_intel_write_words(bank, word, wordcount, address);
+	case 2:
+		return cfi_spansion_write_words(bank, word, wordcount, address);
+	default:
+		LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+		break;
 	}
 
 	return ERROR_FLASH_OPERATION_FAILED;
@@ -2345,18 +2345,18 @@ static int cfi_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t of
 	/* handle blocks of bus_size aligned bytes */
 	blk_count = count & ~(bank->bus_width - 1);	/* round down, leave tail bytes */
 	switch (cfi_info->pri_id) {
-		/* try block writes (fails without working area) */
-		case 1:
-		case 3:
-			retval = cfi_intel_write_block(bank, buffer, write_p, blk_count);
-			break;
-		case 2:
-			retval = cfi_spansion_write_block(bank, buffer, write_p, blk_count);
-			break;
-		default:
-			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-			retval = ERROR_FLASH_OPERATION_FAILED;
-			break;
+	/* try block writes (fails without working area) */
+	case 1:
+	case 3:
+		retval = cfi_intel_write_block(bank, buffer, write_p, blk_count);
+		break;
+	case 2:
+		retval = cfi_spansion_write_block(bank, buffer, write_p, blk_count);
+		break;
+	default:
+		LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+		retval = ERROR_FLASH_OPERATION_FAILED;
+		break;
 	}
 	if (retval == ERROR_OK) {
 		/* Increment pointers and decrease count on successful block write */
@@ -2581,22 +2581,22 @@ int cfi_probe(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 	switch (bank->chip_width) {
-		case 1:
-			cfi_info->manufacturer = *value_buf0;
-			cfi_info->device_id = *value_buf1;
-			break;
-		case 2:
-			cfi_info->manufacturer = target_buffer_get_u16(target, value_buf0);
-			cfi_info->device_id = target_buffer_get_u16(target, value_buf1);
-			break;
-		case 4:
-			cfi_info->manufacturer = target_buffer_get_u32(target, value_buf0);
-			cfi_info->device_id = target_buffer_get_u32(target, value_buf1);
-			break;
-		default:
-			LOG_ERROR("Unsupported bank chipwidth %u, can't probe memory",
-					bank->chip_width);
-			return ERROR_FLASH_OPERATION_FAILED;
+	case 1:
+		cfi_info->manufacturer = *value_buf0;
+		cfi_info->device_id = *value_buf1;
+		break;
+	case 2:
+		cfi_info->manufacturer = target_buffer_get_u16(target, value_buf0);
+		cfi_info->device_id = target_buffer_get_u16(target, value_buf1);
+		break;
+	case 4:
+		cfi_info->manufacturer = target_buffer_get_u32(target, value_buf0);
+		cfi_info->device_id = target_buffer_get_u32(target, value_buf1);
+		break;
+	default:
+		LOG_ERROR("Unsupported bank chipwidth %u, can't probe memory",
+				bank->chip_width);
+		return ERROR_FLASH_OPERATION_FAILED;
 	}
 
 	LOG_INFO("Flash Manufacturer/Device: 0x%04x 0x%04x",
@@ -2734,25 +2734,25 @@ int cfi_probe(struct flash_bank *bank)
 		 * the sector layout to be able to apply fixups
 		 */
 		switch (cfi_info->pri_id) {
-			/* Intel command set (standard and extended) */
-			case 0x0001:
-			case 0x0003:
-				cfi_read_intel_pri_ext(bank);
-				break;
-			/* AMD/Spansion, Atmel, ... command set */
-			case 0x0002:
-				cfi_info->status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7;	/*
-												 *default
-												 *for
-												 *all
-												 *CFI
-												 *flashes
-												 **/
-				cfi_read_0002_pri_ext(bank);
-				break;
-			default:
-				LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-				break;
+		/* Intel command set (standard and extended) */
+		case 0x0001:
+		case 0x0003:
+			cfi_read_intel_pri_ext(bank);
+			break;
+		/* AMD/Spansion, Atmel, ... command set */
+		case 0x0002:
+			cfi_info->status_poll_mask = CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7;	/*
+											 *default
+											 *for
+											 *all
+											 *CFI
+											 *flashes
+											 **/
+			cfi_read_0002_pri_ext(bank);
+			break;
+		default:
+			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+			break;
 		}
 
 		/* return to read array mode
@@ -2798,18 +2798,18 @@ int cfi_probe(struct flash_bank *bank)
 
 	/* apply fixups depending on the primary command set */
 	switch (cfi_info->pri_id) {
-		/* Intel command set (standard and extended) */
-		case 0x0001:
-		case 0x0003:
-			cfi_fixup(bank, cfi_0001_fixups);
-			break;
-		/* AMD/Spansion, Atmel, ... command set */
-		case 0x0002:
-			cfi_fixup(bank, cfi_0002_fixups);
-			break;
-		default:
-			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-			break;
+	/* Intel command set (standard and extended) */
+	case 0x0001:
+	case 0x0003:
+		cfi_fixup(bank, cfi_0001_fixups);
+		break;
+	/* AMD/Spansion, Atmel, ... command set */
+	case 0x0002:
+		cfi_fixup(bank, cfi_0002_fixups);
+		break;
+	default:
+		LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+		break;
 	}
 
 	if ((cfi_info->dev_size * bank->bus_width / bank->chip_width) != bank->size) {
@@ -2939,14 +2939,14 @@ int cfi_protect_check(struct flash_bank *bank)
 		return ERROR_FLASH_BANK_NOT_PROBED;
 
 	switch (cfi_info->pri_id) {
-		case 1:
-		case 3:
-			return cfi_intel_protect_check(bank);
-		case 2:
-			return cfi_spansion_protect_check(bank);
-		default:
-			LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-			break;
+	case 1:
+	case 3:
+		return cfi_intel_protect_check(bank);
+	case 2:
+		return cfi_spansion_protect_check(bank);
+	default:
+		LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+		break;
 	}
 
 	return ERROR_OK;
@@ -3011,16 +3011,16 @@ int cfi_get_info(struct flash_bank *bank, struct command_invocation *cmd)
 			1 << cfi_info->max_buf_write_size);
 
 	switch (cfi_info->pri_id) {
-	    case 1:
-	    case 3:
-		    cfi_intel_info(bank, cmd);
-		    break;
-	    case 2:
-		    cfi_spansion_info(bank, cmd);
-		    break;
-	    default:
-		    LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
-		    break;
+	case 1:
+	case 3:
+	    cfi_intel_info(bank, cmd);
+	    break;
+	case 2:
+	    cfi_spansion_info(bank, cmd);
+	    break;
+	default:
+	    LOG_ERROR("cfi primary command set %i unsupported", cfi_info->pri_id);
+	    break;
 	}
 
 	return ERROR_OK;
diff --git a/src/flash/nor/efm32.c b/src/flash/nor/efm32.c
index f8e0886570..2dac45e79a 100644
--- a/src/flash/nor/efm32.c
+++ b/src/flash/nor/efm32.c
@@ -88,14 +88,14 @@ enum efm32_bank_index {
 static int efm32x_get_bank_index(target_addr_t base)
 {
 	switch (base) {
-		case EFM32_FLASH_BASE:
-			return EFM32_BANK_INDEX_MAIN;
-		case EFM32_MSC_USER_DATA:
-			return EFM32_BANK_INDEX_USER_DATA;
-		case EFM32_MSC_LOCK_BITS:
-			return EFM32_BANK_INDEX_LOCK_BITS;
-		default:
-			return ERROR_FAIL;
+	case EFM32_FLASH_BASE:
+		return EFM32_BANK_INDEX_MAIN;
+	case EFM32_MSC_USER_DATA:
+		return EFM32_BANK_INDEX_USER_DATA;
+	case EFM32_MSC_LOCK_BITS:
+		return EFM32_BANK_INDEX_LOCK_BITS;
+	default:
+		return ERROR_FAIL;
 	}
 }
 
@@ -282,14 +282,14 @@ static int efm32x_read_info(struct flash_bank *bank)
 	}
 
 	switch (efm32_info->family_data->series) {
-		case 0:
-			efm32x_info->reg_base = EFM32_MSC_REGBASE;
-			efm32x_info->reg_lock = EFM32_MSC_REG_LOCK;
-			break;
-		case 1:
-			efm32x_info->reg_base = EFM32_MSC_REGBASE_SERIES1;
-			efm32x_info->reg_lock = EFM32_MSC_REG_LOCK_SERIES1;
-			break;
+	case 0:
+		efm32x_info->reg_base = EFM32_MSC_REGBASE;
+		efm32x_info->reg_lock = EFM32_MSC_REG_LOCK;
+		break;
+	case 1:
+		efm32x_info->reg_base = EFM32_MSC_REGBASE_SERIES1;
+		efm32x_info->reg_lock = EFM32_MSC_REG_LOCK_SERIES1;
+		break;
 	}
 
 	if (efm32_info->family_data->msc_regbase != 0)
@@ -662,18 +662,18 @@ static int efm32x_get_page_lock(struct flash_bank *bank, size_t page)
 	uint32_t mask = 0;
 
 	switch (bank->base) {
-		case EFM32_FLASH_BASE:
-			dw = efm32x_info->lb_page[page >> 5];
-			mask = 1 << (page & 0x1f);
-			break;
-		case EFM32_MSC_USER_DATA:
-			dw = efm32x_info->lb_page[126];
-			mask = 0x1;
-			break;
-		case EFM32_MSC_LOCK_BITS:
-			dw = efm32x_info->lb_page[126];
-			mask = 0x2;
-			break;
+	case EFM32_FLASH_BASE:
+		dw = efm32x_info->lb_page[page >> 5];
+		mask = 1 << (page & 0x1f);
+		break;
+	case EFM32_MSC_USER_DATA:
+		dw = efm32x_info->lb_page[126];
+		mask = 0x1;
+		break;
+	case EFM32_MSC_LOCK_BITS:
+		dw = efm32x_info->lb_page[126];
+		mask = 0x2;
+		break;
 	}
 
 	return (dw & mask) ? 0 : 1;
diff --git a/src/flash/nor/em357.c b/src/flash/nor/em357.c
index 207346f10d..0ac5d81dbd 100644
--- a/src/flash/nor/em357.c
+++ b/src/flash/nor/em357.c
@@ -670,36 +670,36 @@ static int em357_probe(struct flash_bank *bank)
 	em357_info->probed = false;
 
 	switch (bank->size) {
-		case 0x10000:
-			/* 64k -- 64 1k pages */
-			num_pages = 64;
-			page_size = 1024;
-			break;
-		case 0x20000:
-			/* 128k -- 128 1k pages */
-			num_pages = 128;
-			page_size = 1024;
-			break;
-		case 0x30000:
-			/* 192k -- 96 2k pages */
-			num_pages = 96;
-			page_size = 2048;
-			break;
-		case 0x40000:
-			/* 256k -- 128 2k pages */
-			num_pages = 128;
-			page_size = 2048;
-			break;
-		case 0x80000:
-			/* 512k -- 256 2k pages */
-			num_pages = 256;
-			page_size = 2048;
-			break;
-		default:
-			LOG_WARNING("No size specified for em357 flash driver, assuming 192k!");
-			num_pages = 96;
-			page_size = 2048;
-			break;
+	case 0x10000:
+		/* 64k -- 64 1k pages */
+		num_pages = 64;
+		page_size = 1024;
+		break;
+	case 0x20000:
+		/* 128k -- 128 1k pages */
+		num_pages = 128;
+		page_size = 1024;
+		break;
+	case 0x30000:
+		/* 192k -- 96 2k pages */
+		num_pages = 96;
+		page_size = 2048;
+		break;
+	case 0x40000:
+		/* 256k -- 128 2k pages */
+		num_pages = 128;
+		page_size = 2048;
+		break;
+	case 0x80000:
+		/* 512k -- 256 2k pages */
+		num_pages = 256;
+		page_size = 2048;
+		break;
+	default:
+		LOG_WARNING("No size specified for em357 flash driver, assuming 192k!");
+		num_pages = 96;
+		page_size = 2048;
+		break;
 	}
 
 	/* Enable FPEC CLK */
diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 85c306bd44..82e68de3fb 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -2145,24 +2145,24 @@ static int kinetis_probe_chip_s32k(struct kinetis_chip *k_chip)
 		k_chip->max_flash_prog_size = 512;
 
 		switch (k_chip->sim_sdid & KINETIS_SDID_S32K_DERIVATE_MASK) {
-			case KINETIS_SDID_S32K_DERIVATE_KXX6:
-				/* S32K116 CPU 48Mhz Flash 128KB RAM 17KB+2KB */
-				/* Non-Interleaved */
-				k_chip->pflash_size = 128 << 10;
-				k_chip->pflash_sector_size = 2 << 10;
-				/* Non-Interleaved */
-				k_chip->nvm_size = 32 << 10;
-				k_chip->nvm_sector_size = 2 << 10;
-				break;
-			case KINETIS_SDID_S32K_DERIVATE_KXX8:
-				/* S32K118 CPU 80Mhz Flash 256KB+32KB RAM 32KB+4KB */
-				/* Non-Interleaved */
-				k_chip->pflash_size = 256 << 10;
-				k_chip->pflash_sector_size = 2 << 10;
-				/* Non-Interleaved */
-				k_chip->nvm_size = 32 << 10;
-				k_chip->nvm_sector_size = 2 << 10;
-				break;
+		case KINETIS_SDID_S32K_DERIVATE_KXX6:
+			/* S32K116 CPU 48Mhz Flash 128KB RAM 17KB+2KB */
+			/* Non-Interleaved */
+			k_chip->pflash_size = 128 << 10;
+			k_chip->pflash_sector_size = 2 << 10;
+			/* Non-Interleaved */
+			k_chip->nvm_size = 32 << 10;
+			k_chip->nvm_sector_size = 2 << 10;
+			break;
+		case KINETIS_SDID_S32K_DERIVATE_KXX8:
+			/* S32K118 CPU 80Mhz Flash 256KB+32KB RAM 32KB+4KB */
+			/* Non-Interleaved */
+			k_chip->pflash_size = 256 << 10;
+			k_chip->pflash_sector_size = 2 << 10;
+			/* Non-Interleaved */
+			k_chip->nvm_size = 32 << 10;
+			k_chip->nvm_sector_size = 2 << 10;
+			break;
 		}
 		break;
 
diff --git a/src/flash/nor/kinetis_ke.c b/src/flash/nor/kinetis_ke.c
index 8207504b5f..51d5cb504b 100644
--- a/src/flash/nor/kinetis_ke.c
+++ b/src/flash/nor/kinetis_ke.c
@@ -238,19 +238,18 @@ static int kinetis_ke_prepare_flash(struct flash_bank *bank)
 	 * Trim internal clock
 	 */
 	switch (KINETIS_KE_SRSID_SUBFAMID(kinfo->sim_srsid)) {
-
-		case KINETIS_KE_SRSID_KEX2:
-			/* Both KE02_20 and KE02_40 should get the same trim value */
-			trim_value = 0x4C;
-			break;
-
-		case KINETIS_KE_SRSID_KEX4:
-			trim_value = 0x54;
-			break;
-
-		case KINETIS_KE_SRSID_KEX6:
-			trim_value = 0x58;
-			break;
+	case KINETIS_KE_SRSID_KEX2:
+		/* Both KE02_20 and KE02_40 should get the same trim value */
+		trim_value = 0x4C;
+		break;
+
+	case KINETIS_KE_SRSID_KEX4:
+		trim_value = 0x54;
+		break;
+
+	case KINETIS_KE_SRSID_KEX6:
+		trim_value = 0x58;
+		break;
 	}
 
 	result = target_read_u8(target, ICS_C4, &c4);
@@ -293,54 +292,52 @@ static int kinetis_ke_prepare_flash(struct flash_bank *bank)
 	 * Configure SIM (bus clock)
 	 */
 	switch (KINETIS_KE_SRSID_SUBFAMID(kinfo->sim_srsid)) {
+	/* KE02 sub-family operates on SIM_BUSDIV */
+	case KINETIS_KE_SRSID_KEX2:
+		bus_reg_val = 0;
+		bus_reg_addr = SIM_BUSDIV;
+		bus_clock = 20000000;
+		break;
+
+	/* KE04 and KE06 sub-family operates on SIM_CLKDIV
+	 * Clocks are divided by:
+	 * DIV1 = core clock = 48MHz
+	 * DIV2 = bus clock = 24Mhz
+	 * DIV3 = timer clocks
+	 * So we need to configure SIM_CLKDIV, DIV1 and DIV2 value
+	 */
+	case KINETIS_KE_SRSID_KEX4:
+		/* KE04 devices have the SIM_CLKDIV register at a different offset
+		 * depending on the pin count. */
+		switch (KINETIS_KE_SRSID_PINCOUNT(kinfo->sim_srsid)) {
+		/* 16, 20 and 24 pins */
+		case 1:
+		case 2:
+		case 3:
+			bus_reg_addr = SIM_CLKDIV_KE04_16_20_24;
+			break;
 
-		/* KE02 sub-family operates on SIM_BUSDIV */
-		case KINETIS_KE_SRSID_KEX2:
-			bus_reg_val = 0;
-			bus_reg_addr = SIM_BUSDIV;
-			bus_clock = 20000000;
+		/* 44, 64 and 80 pins */
+		case 5:
+		case 7:
+		case 8:
+			bus_reg_addr = SIM_CLKDIV_KE04_44_64_80;
 			break;
 
-		/* KE04 and KE06 sub-family operates on SIM_CLKDIV
-		 * Clocks are divided by:
-		 * DIV1 = core clock = 48MHz
-		 * DIV2 = bus clock = 24Mhz
-		 * DIV3 = timer clocks
-		 * So we need to configure SIM_CLKDIV, DIV1 and DIV2 value
-		 */
-		case KINETIS_KE_SRSID_KEX4:
-			/* KE04 devices have the SIM_CLKDIV register at a different offset
-			 * depending on the pin count. */
-			switch (...
 
[truncated message content]

[PATCH]: 31fcda3333 svf: factorize big switch case

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9040

-- gerrit

commit 31fcda3333748ce31b755393d0ac2d2693d7ce2f
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Jun 29 23:43:11 2025 +0200

    svf: factorize big switch case
    
    Factorize function svf_run_command() by moving out of the 'case'
    the common code related to the label 'xxr_common'.
    
    The target is to drop later on the ugly label 'xxr_common' inside
    the switch.
    
    Apart for:
    - the function and local variables declaration,
    - the added function call in place of original code,
    - the reduced indentation in the new function,
    this change is a dummy copy/paste with no code modification.
    
    Change-Id: I8149cf25f460326ba6666a9287c5c309e5d99488
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 802e2326a2..d0a8563dd2 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -979,6 +979,295 @@ static int svf_execute_tap(void)
 	return ERROR_OK;
 }
 
+static int svf_xxr_common(char **argus, int num_of_argu, char command, struct svf_xxr_para *xxr_para_tmp)
+{
+	int i, i_tmp;
+	uint8_t **pbuffer_tmp;
+	struct scan_field field;
+
+	/* XXR length [TDI (tdi)] [TDO (tdo)][MASK (mask)] [SMASK (smask)] */
+	if (num_of_argu > 10 || (num_of_argu % 2)) {
+		LOG_ERROR("invalid parameter of %s", argus[0]);
+		return ERROR_FAIL;
+	}
+	i_tmp = xxr_para_tmp->len;
+	xxr_para_tmp->len = atoi(argus[1]);
+	/* If we are to enlarge the buffers, all parts of xxr_para_tmp
+	 * need to be freed */
+	if (i_tmp < xxr_para_tmp->len) {
+		free(xxr_para_tmp->tdi);
+		xxr_para_tmp->tdi = NULL;
+		free(xxr_para_tmp->tdo);
+		xxr_para_tmp->tdo = NULL;
+		free(xxr_para_tmp->mask);
+		xxr_para_tmp->mask = NULL;
+		free(xxr_para_tmp->smask);
+		xxr_para_tmp->smask = NULL;
+	}
+
+	LOG_DEBUG("\tlength = %d", xxr_para_tmp->len);
+	xxr_para_tmp->data_mask = 0;
+	for (i = 2; i < num_of_argu; i += 2) {
+		if ((strlen(argus[i + 1]) < 3) || (argus[i + 1][0] != '(') ||
+				argus[i + 1][strlen(argus[i + 1]) - 1] != ')') {
+			LOG_ERROR("data section error");
+			return ERROR_FAIL;
+		}
+		argus[i + 1][strlen(argus[i + 1]) - 1] = '\0';
+		/* TDI, TDO, MASK, SMASK */
+		if (!strcmp(argus[i], "TDI")) {
+			/* TDI */
+			pbuffer_tmp = &xxr_para_tmp->tdi;
+			xxr_para_tmp->data_mask |= XXR_TDI;
+		} else if (!strcmp(argus[i], "TDO")) {
+			/* TDO */
+			pbuffer_tmp = &xxr_para_tmp->tdo;
+			xxr_para_tmp->data_mask |= XXR_TDO;
+		} else if (!strcmp(argus[i], "MASK")) {
+			/* MASK */
+			pbuffer_tmp = &xxr_para_tmp->mask;
+			xxr_para_tmp->data_mask |= XXR_MASK;
+		} else if (!strcmp(argus[i], "SMASK")) {
+			/* SMASK */
+			pbuffer_tmp = &xxr_para_tmp->smask;
+			xxr_para_tmp->data_mask |= XXR_SMASK;
+		} else {
+			LOG_ERROR("unknown parameter: %s", argus[i]);
+			return ERROR_FAIL;
+		}
+		if (ERROR_OK !=
+		svf_copy_hexstring_to_binary(&argus[i + 1][1], pbuffer_tmp, i_tmp,
+			xxr_para_tmp->len)) {
+			LOG_ERROR("fail to parse hex value");
+			return ERROR_FAIL;
+		}
+		SVF_BUF_LOG(DEBUG, *pbuffer_tmp, xxr_para_tmp->len, argus[i]);
+	}
+	/* If a command changes the length of the last scan of the same type and the
+	 * MASK parameter is absent, */
+	/* the mask pattern used is all cares */
+	if (!(xxr_para_tmp->data_mask & XXR_MASK) && i_tmp != xxr_para_tmp->len) {
+		/* MASK not defined and length changed */
+		if (ERROR_OK !=
+		svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp,
+			xxr_para_tmp->len)) {
+			LOG_ERROR("fail to adjust length of array");
+			return ERROR_FAIL;
+		}
+		buf_set_ones(xxr_para_tmp->mask, xxr_para_tmp->len);
+	}
+	/* If TDO is absent, no comparison is needed, set the mask to 0 */
+	if (!(xxr_para_tmp->data_mask & XXR_TDO)) {
+		if (!xxr_para_tmp->tdo) {
+			if (ERROR_OK !=
+			svf_adjust_array_length(&xxr_para_tmp->tdo, i_tmp,
+				xxr_para_tmp->len)) {
+				LOG_ERROR("fail to adjust length of array");
+				return ERROR_FAIL;
+			}
+		}
+		if (!xxr_para_tmp->mask) {
+			if (ERROR_OK !=
+			svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp,
+				xxr_para_tmp->len)) {
+				LOG_ERROR("fail to adjust length of array");
+				return ERROR_FAIL;
+			}
+		}
+		memset(xxr_para_tmp->mask, 0, (xxr_para_tmp->len + 7) >> 3);
+	}
+	/* do scan if necessary */
+	if (command == SDR) {
+		/* check buffer size first, reallocate if necessary */
+		i = svf_para.hdr_para.len + svf_para.sdr_para.len +
+				svf_para.tdr_para.len;
+		if ((svf_buffer_size - svf_buffer_index) < ((i + 7) >> 3)) {
+			/* reallocate buffer */
+			if (svf_realloc_buffers(svf_buffer_index + ((i + 7) >> 3)) != ERROR_OK) {
+				LOG_ERROR("not enough memory");
+				return ERROR_FAIL;
+			}
+		}
+
+		/* assemble dr data */
+		i = 0;
+		buf_set_buf(svf_para.hdr_para.tdi,
+				0,
+				&svf_tdi_buffer[svf_buffer_index],
+				i,
+				svf_para.hdr_para.len);
+		i += svf_para.hdr_para.len;
+		buf_set_buf(svf_para.sdr_para.tdi,
+				0,
+				&svf_tdi_buffer[svf_buffer_index],
+				i,
+				svf_para.sdr_para.len);
+		i += svf_para.sdr_para.len;
+		buf_set_buf(svf_para.tdr_para.tdi,
+				0,
+				&svf_tdi_buffer[svf_buffer_index],
+				i,
+				svf_para.tdr_para.len);
+		i += svf_para.tdr_para.len;
+
+		/* add check data */
+		if (svf_para.sdr_para.data_mask & XXR_TDO) {
+			/* assemble dr mask data */
+			i = 0;
+			buf_set_buf(svf_para.hdr_para.mask,
+					0,
+					&svf_mask_buffer[svf_buffer_index],
+					i,
+					svf_para.hdr_para.len);
+			i += svf_para.hdr_para.len;
+			buf_set_buf(svf_para.sdr_para.mask,
+					0,
+					&svf_mask_buffer[svf_buffer_index],
+					i,
+					svf_para.sdr_para.len);
+			i += svf_para.sdr_para.len;
+			buf_set_buf(svf_para.tdr_para.mask,
+					0,
+					&svf_mask_buffer[svf_buffer_index],
+					i,
+					svf_para.tdr_para.len);
+
+			/* assemble dr check data */
+			i = 0;
+			buf_set_buf(svf_para.hdr_para.tdo,
+					0,
+					&svf_tdo_buffer[svf_buffer_index],
+					i,
+					svf_para.hdr_para.len);
+			i += svf_para.hdr_para.len;
+			buf_set_buf(svf_para.sdr_para.tdo,
+					0,
+					&svf_tdo_buffer[svf_buffer_index],
+					i,
+					svf_para.sdr_para.len);
+			i += svf_para.sdr_para.len;
+			buf_set_buf(svf_para.tdr_para.tdo,
+					0,
+					&svf_tdo_buffer[svf_buffer_index],
+					i,
+					svf_para.tdr_para.len);
+			i += svf_para.tdr_para.len;
+
+			svf_add_check_para(1, svf_buffer_index, i);
+		} else {
+			svf_add_check_para(0, svf_buffer_index, i);
+		}
+		field.num_bits = i;
+		field.out_value = &svf_tdi_buffer[svf_buffer_index];
+		field.in_value = (xxr_para_tmp->data_mask & XXR_TDO) ? &svf_tdi_buffer[svf_buffer_index] : NULL;
+		if (!svf_nil) {
+			/* NOTE:  doesn't use SVF-specified state paths */
+			jtag_add_plain_dr_scan(field.num_bits,
+					field.out_value,
+					field.in_value,
+					svf_para.dr_end_state);
+		}
+
+		if (svf_addcycles)
+			jtag_add_clocks(svf_addcycles);
+
+		svf_buffer_index += (i + 7) >> 3;
+	} else if (command == SIR) {
+		/* check buffer size first, reallocate if necessary */
+		i = svf_para.hir_para.len + svf_para.sir_para.len +
+				svf_para.tir_para.len;
+		if ((svf_buffer_size - svf_buffer_index) < ((i + 7) >> 3)) {
+			if (svf_realloc_buffers(svf_buffer_index + ((i + 7) >> 3)) != ERROR_OK) {
+				LOG_ERROR("not enough memory");
+				return ERROR_FAIL;
+			}
+		}
+
+		/* assemble ir data */
+		i = 0;
+		buf_set_buf(svf_para.hir_para.tdi,
+				0,
+				&svf_tdi_buffer[svf_buffer_index],
+				i,
+				svf_para.hir_para.len);
+		i += svf_para.hir_para.len;
+		buf_set_buf(svf_para.sir_para.tdi,
+				0,
+				&svf_tdi_buffer[svf_buffer_index],
+				i,
+				svf_para.sir_para.len);
+		i += svf_para.sir_para.len;
+		buf_set_buf(svf_para.tir_para.tdi,
+				0,
+				&svf_tdi_buffer[svf_buffer_index],
+				i,
+				svf_para.tir_para.len);
+		i += svf_para.tir_para.len;
+
+		/* add check data */
+		if (svf_para.sir_para.data_mask & XXR_TDO) {
+			/* assemble dr mask data */
+			i = 0;
+			buf_set_buf(svf_para.hir_para.mask,
+					0,
+					&svf_mask_buffer[svf_buffer_index],
+					i,
+					svf_para.hir_para.len);
+			i += svf_para.hir_para.len;
+			buf_set_buf(svf_para.sir_para.mask,
+					0,
+					&svf_mask_buffer[svf_buffer_index],
+					i,
+					svf_para.sir_para.len);
+			i += svf_para.sir_para.len;
+			buf_set_buf(svf_para.tir_para.mask,
+					0,
+					&svf_mask_buffer[svf_buffer_index],
+					i,
+					svf_para.tir_para.len);
+
+			/* assemble dr check data */
+			i = 0;
+			buf_set_buf(svf_para.hir_para.tdo,
+					0,
+					&svf_tdo_buffer[svf_buffer_index],
+					i,
+					svf_para.hir_para.len);
+			i += svf_para.hir_para.len;
+			buf_set_buf(svf_para.sir_para.tdo,
+					0,
+					&svf_tdo_buffer[svf_buffer_index],
+					i,
+					svf_para.sir_para.len);
+			i += svf_para.sir_para.len;
+			buf_set_buf(svf_para.tir_para.tdo,
+					0,
+					&svf_tdo_buffer[svf_buffer_index],
+					i,
+					svf_para.tir_para.len);
+			i += svf_para.tir_para.len;
+
+			svf_add_check_para(1, svf_buffer_index, i);
+		} else {
+			svf_add_check_para(0, svf_buffer_index, i);
+		}
+		field.num_bits = i;
+		field.out_value = &svf_tdi_buffer[svf_buffer_index];
+		field.in_value = (xxr_para_tmp->data_mask & XXR_TDO) ? &svf_tdi_buffer[svf_buffer_index] : NULL;
+		if (!svf_nil) {
+			/* NOTE:  doesn't use SVF-specified state paths */
+			jtag_add_plain_ir_scan(field.num_bits,
+					field.out_value,
+					field.in_value,
+					svf_para.ir_end_state);
+		}
+
+		svf_buffer_index += (i + 7) >> 3;
+	}
+
+	return ERROR_OK;
+}
+
 static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 {
 	char *argus[256], command;
@@ -992,8 +1281,6 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 	float min_time;
 	/* for XXR */
 	struct svf_xxr_para *xxr_para_tmp;
-	uint8_t **pbuffer_tmp;
-	struct scan_field field;
 	/* for STATE */
 	enum tap_state *path = NULL, state;
 	/* flag padding commands skipped due to -tap command */
@@ -1094,285 +1381,9 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 			xxr_para_tmp = &svf_para.sir_para;
 			goto xxr_common;
 xxr_common:
-			/* XXR length [TDI (tdi)] [TDO (tdo)][MASK (mask)] [SMASK (smask)] */
-			if (num_of_argu > 10 || (num_of_argu % 2)) {
-				LOG_ERROR("invalid parameter of %s", argus[0]);
-				return ERROR_FAIL;
-			}
-			i_tmp = xxr_para_tmp->len;
-			xxr_para_tmp->len = atoi(argus[1]);
-			/* If we are to enlarge the buffers, all parts of xxr_para_tmp
-			 * need to be freed */
-			if (i_tmp < xxr_para_tmp->len) {
-				free(xxr_para_tmp->tdi);
-				xxr_para_tmp->tdi = NULL;
-				free(xxr_para_tmp->tdo);
-				xxr_para_tmp->tdo = NULL;
-				free(xxr_para_tmp->mask);
-				xxr_para_tmp->mask = NULL;
-				free(xxr_para_tmp->smask);
-				xxr_para_tmp->smask = NULL;
-			}
-
-			LOG_DEBUG("\tlength = %d", xxr_para_tmp->len);
-			xxr_para_tmp->data_mask = 0;
-			for (i = 2; i < num_of_argu; i += 2) {
-				if ((strlen(argus[i + 1]) < 3) || (argus[i + 1][0] != '(') ||
-						argus[i + 1][strlen(argus[i + 1]) - 1] != ')') {
-					LOG_ERROR("data section error");
-					return ERROR_FAIL;
-				}
-				argus[i + 1][strlen(argus[i + 1]) - 1] = '\0';
-				/* TDI, TDO, MASK, SMASK */
-				if (!strcmp(argus[i], "TDI")) {
-					/* TDI */
-					pbuffer_tmp = &xxr_para_tmp->tdi;
-					xxr_para_tmp->data_mask |= XXR_TDI;
-				} else if (!strcmp(argus[i], "TDO")) {
-					/* TDO */
-					pbuffer_tmp = &xxr_para_tmp->tdo;
-					xxr_para_tmp->data_mask |= XXR_TDO;
-				} else if (!strcmp(argus[i], "MASK")) {
-					/* MASK */
-					pbuffer_tmp = &xxr_para_tmp->mask;
-					xxr_para_tmp->data_mask |= XXR_MASK;
-				} else if (!strcmp(argus[i], "SMASK")) {
-					/* SMASK */
-					pbuffer_tmp = &xxr_para_tmp->smask;
-					xxr_para_tmp->data_mask |= XXR_SMASK;
-				} else {
-					LOG_ERROR("unknown parameter: %s", argus[i]);
-					return ERROR_FAIL;
-				}
-				if (ERROR_OK !=
-				svf_copy_hexstring_to_binary(&argus[i + 1][1], pbuffer_tmp, i_tmp,
-					xxr_para_tmp->len)) {
-					LOG_ERROR("fail to parse hex value");
-					return ERROR_FAIL;
-				}
-				SVF_BUF_LOG(DEBUG, *pbuffer_tmp, xxr_para_tmp->len, argus[i]);
-			}
-			/* If a command changes the length of the last scan of the same type and the
-			 * MASK parameter is absent, */
-			/* the mask pattern used is all cares */
-			if (!(xxr_para_tmp->data_mask & XXR_MASK) && i_tmp != xxr_para_tmp->len) {
-				/* MASK not defined and length changed */
-				if (ERROR_OK !=
-				svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp,
-					xxr_para_tmp->len)) {
-					LOG_ERROR("fail to adjust length of array");
-					return ERROR_FAIL;
-				}
-				buf_set_ones(xxr_para_tmp->mask, xxr_para_tmp->len);
-			}
-			/* If TDO is absent, no comparison is needed, set the mask to 0 */
-			if (!(xxr_para_tmp->data_mask & XXR_TDO)) {
-				if (!xxr_para_tmp->tdo) {
-					if (ERROR_OK !=
-					svf_adjust_array_length(&xxr_para_tmp->tdo, i_tmp,
-						xxr_para_tmp->len)) {
-						LOG_ERROR("fail to adjust length of array");
-						return ERROR_FAIL;
-					}
-				}
-				if (!xxr_para_tmp->mask) {
-					if (ERROR_OK !=
-					svf_adjust_array_length(&xxr_para_tmp->mask, i_tmp,
-						xxr_para_tmp->len)) {
-						LOG_ERROR("fail to adjust length of array");
-						return ERROR_FAIL;
-					}
-				}
-				memset(xxr_para_tmp->mask, 0, (xxr_para_tmp->len + 7) >> 3);
-			}
-			/* do scan if necessary */
-			if (command == SDR) {
-				/* check buffer size first, reallocate if necessary */
-				i = svf_para.hdr_para.len + svf_para.sdr_para.len +
-						svf_para.tdr_para.len;
-				if ((svf_buffer_size - svf_buffer_index) < ((i + 7) >> 3)) {
-					/* reallocate buffer */
-					if (svf_realloc_buffers(svf_buffer_index + ((i + 7) >> 3)) != ERROR_OK) {
-						LOG_ERROR("not enough memory");
-						return ERROR_FAIL;
-					}
-				}
-
-				/* assemble dr data */
-				i = 0;
-				buf_set_buf(svf_para.hdr_para.tdi,
-						0,
-						&svf_tdi_buffer[svf_buffer_index],
-						i,
-						svf_para.hdr_para.len);
-				i += svf_para.hdr_para.len;
-				buf_set_buf(svf_para.sdr_para.tdi,
-						0,
-						&svf_tdi_buffer[svf_buffer_index],
-						i,
-						svf_para.sdr_para.len);
-				i += svf_para.sdr_para.len;
-				buf_set_buf(svf_para.tdr_para.tdi,
-						0,
-						&svf_tdi_buffer[svf_buffer_index],
-						i,
-						svf_para.tdr_para.len);
-				i += svf_para.tdr_para.len;
-
-				/* add check data */
-				if (svf_para.sdr_para.data_mask & XXR_TDO) {
-					/* assemble dr mask data */
-					i = 0;
-					buf_set_buf(svf_para.hdr_para.mask,
-							0,
-							&svf_mask_buffer[svf_buffer_index],
-							i,
-							svf_para.hdr_para.len);
-					i += svf_para.hdr_para.len;
-					buf_set_buf(svf_para.sdr_para.mask,
-							0,
-							&svf_mask_buffer[svf_buffer_index],
-							i,
-							svf_para.sdr_para.len);
-					i += svf_para.sdr_para.len;
-					buf_set_buf(svf_para.tdr_para.mask,
-							0,
-							&svf_mask_buffer[svf_buffer_index],
-							i,
-							svf_para.tdr_para.len);
-
-					/* assemble dr check data */
-					i = 0;
-					buf_set_buf(svf_para.hdr_para.tdo,
-							0,
-							&svf_tdo_buffer[svf_buffer_index],
-							i,
-							svf_para.hdr_para.len);
-					i += svf_para.hdr_para.len;
-					buf_set_buf(svf_para.sdr_para.tdo,
-							0,
-							&svf_tdo_buffer[svf_buffer_index],
-							i,
-							svf_para.sdr_para.len);
-					i += svf_para.sdr_para.len;
-					buf_set_buf(svf_para.tdr_para.tdo,
-							0,
-							&svf_tdo_buffer[svf_buffer_index],
-							i,
-							svf_para.tdr_para.len);
-					i += svf_para.tdr_para.len;
-
-					svf_add_check_para(1, svf_buffer_index, i);
-				} else {
-					svf_add_check_para(0, svf_buffer_index, i);
-				}
-				field.num_bits = i;
-				field.out_value = &svf_tdi_buffer[svf_buffer_index];
-				field.in_value = (xxr_para_tmp->data_mask & XXR_TDO) ? &svf_tdi_buffer[svf_buffer_index] : NULL;
-				if (!svf_nil) {
-					/* NOTE:  doesn't use SVF-specified state paths */
-					jtag_add_plain_dr_scan(field.num_bits,
-							field.out_value,
-							field.in_value,
-							svf_para.dr_end_state);
-				}
-
-				if (svf_addcycles)
-					jtag_add_clocks(svf_addcycles);
-
-				svf_buffer_index += (i + 7) >> 3;
-			} else if (command == SIR) {
-				/* check buffer size first, reallocate if necessary */
-				i = svf_para.hir_para.len + svf_para.sir_para.len +
-						svf_para.tir_para.len;
-				if ((svf_buffer_size - svf_buffer_index) < ((i + 7) >> 3)) {
-					if (svf_realloc_buffers(svf_buffer_index + ((i + 7) >> 3)) != ERROR_OK) {
-						LOG_ERROR("not enough memory");
-						return ERROR_FAIL;
-					}
-				}
-
-				/* assemble ir data */
-				i = 0;
-				buf_set_buf(svf_para.hir_para.tdi,
-						0,
-						&svf_tdi_buffer[svf_buffer_index],
-						i,
-						svf_para.hir_para.len);
-				i += svf_para.hir_para.len;
-				buf_set_buf(svf_para.sir_para.tdi,
-						0,
-						&svf_tdi_buffer[svf_buffer_index],
-						i,
-						svf_para.sir_para.len);
-				i += svf_para.sir_para.len;
-				buf_set_buf(svf_para.tir_para.tdi,
-						0,
-						&svf_tdi_buffer[svf_buffer_index],
-						i,
-						svf_para.tir_para.len);
-				i += svf_para.tir_para.len;
-
-				/* add check data */
-				if (svf_para.sir_para.data_mask & XXR_TDO) {
-					/* assemble dr mask data */
-					i = 0;
-					buf_set_buf(svf_para.hir_para.mask,
-							0,
-							&svf_mask_buffer[svf_buffer_index],
-							i,
-							svf_para.hir_para.len);
-					i += svf_para.hir_para.len;
-					buf_set_buf(svf_para.sir_para.mask,
-							0,
-							&svf_mask_buffer[svf_buffer_index],
-							i,
-							svf_para.sir_para.len);
-					i += svf_para.sir_para.len;
-					buf_set_buf(svf_para.tir_para.mask,
-							0,
-							&svf_mask_buffer[svf_buffer_index],
-							i,
-							svf_para.tir_para.len);
-
-					/* assemble dr check data */
-					i = 0;
-					buf_set_buf(svf_para.hir_para.tdo,
-							0,
-							&svf_tdo_buffer[svf_buffer_index],
-							i,
-							svf_para.hir_para.len);
-					i += svf_para.hir_para.len;
-					buf_set_buf(svf_para.sir_para.tdo,
-							0,
-							&svf_tdo_buffer[svf_buffer_index],
-							i,
-							svf_para.sir_para.len);
-					i += svf_para.sir_para.len;
-					buf_set_buf(svf_para.tir_para.tdo,
-							0,
-							&svf_tdo_buffer[svf_buffer_index],
-							i,
-							svf_para.tir_para.len);
-					i += svf_para.tir_para.len;
-
-					svf_add_check_para(1, svf_buffer_index, i);
-				} else {
-					svf_add_check_para(0, svf_buffer_index, i);
-				}
-				field.num_bits = i;
-				field.out_value = &svf_tdi_buffer[svf_buffer_index];
-				field.in_value = (xxr_para_tmp->data_mask & XXR_TDO) ? &svf_tdi_buffer[svf_buffer_index] : NULL;
-				if (!svf_nil) {
-					/* NOTE:  doesn't use SVF-specified state paths */
-					jtag_add_plain_ir_scan(field.num_bits,
-							field.out_value,
-							field.in_value,
-							svf_para.ir_end_state);
-				}
-
-				svf_buffer_index += (i + 7) >> 3;
-			}
+			int retval = svf_xxr_common(argus, num_of_argu, command, xxr_para_tmp);
+			if (retval != ERROR_OK)
+				return retval;
 			break;
 		case PIO:
 		case PIOMAP:

-- 

[PATCH]: fa757d9fc3 svf: rework svf_parse_cmd_string()

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9042

-- gerrit

commit fa757d9fc31af99c2b4a5183a9a3b73efd2a75ff
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Jun 30 00:22:28 2025 +0200

    svf: rework svf_parse_cmd_string()
    
    Rework the function to drop the goto in the switch statement.
    While there, change some variable to boolean.
    
    Change-Id: I37cbc8aafaeb8aef7f083ee6f5afa9eae71e0cd9
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 5c87f895a0..7ef6df4769 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -780,7 +780,8 @@ static int svf_read_command_from_file(FILE *fd)
 
 static int svf_parse_cmd_string(char *str, int len, char **argus, int *num_of_argu)
 {
-	int pos = 0, num = 0, space_found = 1, in_bracket = 0;
+	bool space_found = true, in_bracket = false;
+	int pos = 0, num = 0;
 
 	while (pos < len) {
 		switch (str[pos]) {
@@ -789,22 +790,23 @@ static int svf_parse_cmd_string(char *str, int len, char **argus, int *num_of_ar
 				LOG_ERROR("fail to parse svf command");
 				return ERROR_FAIL;
 			case '(':
-				in_bracket = 1;
-				goto parse_char;
+				in_bracket = true;
+				break;
 			case ')':
-				in_bracket = 0;
-				goto parse_char;
+				in_bracket = false;
+				break;
 			default:
-parse_char:
-				if (!in_bracket && isspace((int) str[pos])) {
-					space_found = 1;
-					str[pos] = '\0';
-				} else if (space_found) {
-					argus[num++] = &str[pos];
-					space_found = 0;
-				}
 				break;
 		}
+
+		if (!in_bracket && isspace((int)str[pos])) {
+			space_found = true;
+			str[pos] = '\0';
+		} else if (space_found) {
+			argus[num++] = &str[pos];
+			space_found = false;
+		}
+
 		pos++;
 	}
 

-- 

[PATCH]: 37ff68cc3e rtos: linux: align switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9038

-- gerrit

commit 37ff68cc3ea859ff0b65e64de4caa6423251be33
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 01:21:00 2025 +0200

    rtos: linux: align switch and case statements
    
    The coding style requires the 'case' to be at the same indentation
    level of its 'switch' statement.
    
    Align the code accordingly.
    
    No changes are reported by
            git log -p -w --ignore-blank-lines --patience
    
    Change-Id: Ic4070571d322776b638a15a40af85cd31fdae7ce
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 785be13fd8..5f59dc883a 100644
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -1282,76 +1282,77 @@ static int linux_thread_packet(struct connection *connection, char const *packet
 		target->rtos->rtos_specific_params;
 
 	switch (packet[0]) {
-		case 'T':		/* Is thread alive?*/
-
-			linux_gdb_t_packet(connection, target, packet, packet_size);
-			break;
-		case 'H':		/* Set current thread */
-			/*  ( 'c' for step and continue, 'g' for all other operations )*/
-			/*LOG_INFO(" H packet received '%s'", packet);*/
-			linux_gdb_h_packet(connection, target, packet, packet_size);
-			break;
-		case 'q':
-
-			if (!strncmp(packet, "qSymbol", 7)) {
-				if (rtos_qsymbol(connection, packet, packet_size) == 1) {
-					linux_compute_virt2phys(target,
-							target->rtos->symbols[INIT_TASK].address);
-				}
-			} else if (!strncmp(packet, "qfThreadInfo", 12)) {
-				if (!linux_os->thread_list) {
-					retval = linux_gdb_thread_packet(target,
-							connection,
-							packet,
-							packet_size);
-				} else {
-					retval = linux_gdb_thread_update(target,
-							connection,
-							packet,
-							packet_size);
-				}
-			} else if (!strncmp(packet, "qsThreadInfo", 12)) {
-				gdb_put_packet(connection, "l", 1);
-			} else if (!strncmp(packet, "qThreadExtraInfo,", 17)) {
-				linux_thread_extra_info(target, connection, packet,
+	case 'T':		/* Is thread alive?*/
+		linux_gdb_t_packet(connection, target, packet, packet_size);
+		break;
+
+	case 'H':		/* Set current thread */
+		/*  ( 'c' for step and continue, 'g' for all other operations )*/
+		/*LOG_INFO(" H packet received '%s'", packet);*/
+		linux_gdb_h_packet(connection, target, packet, packet_size);
+		break;
+
+	case 'q':
+		if (!strncmp(packet, "qSymbol", 7)) {
+			if (rtos_qsymbol(connection, packet, packet_size) == 1) {
+				linux_compute_virt2phys(target,
+						target->rtos->symbols[INIT_TASK].address);
+			}
+		} else if (!strncmp(packet, "qfThreadInfo", 12)) {
+			if (!linux_os->thread_list) {
+				retval = linux_gdb_thread_packet(target,
+						connection,
+						packet,
 						packet_size);
 			} else {
-				retval = GDB_THREAD_PACKET_NOT_CONSUMED;
+				retval = linux_gdb_thread_update(target,
+						connection,
+						packet,
+						packet_size);
 			}
-			break;
-
-		case 'Q':
-			/* previously response was : thread not found
-			 * gdb_put_packet(connection, "E01", 3); */
+		} else if (!strncmp(packet, "qsThreadInfo", 12)) {
+			gdb_put_packet(connection, "l", 1);
+		} else if (!strncmp(packet, "qThreadExtraInfo,", 17)) {
+			linux_thread_extra_info(target, connection, packet,
+					packet_size);
+		} else {
 			retval = GDB_THREAD_PACKET_NOT_CONSUMED;
-			break;
-		case 'c':
-		case 's':
-			if (linux_os->threads_lookup == 1) {
-				ct = linux_os->current_threads;
+		}
+		break;
 
-				while ((ct) && (ct->core_id) != target->coreid)
-					ct = ct->next;
+	case 'Q':
+		/* previously response was : thread not found
+		 * gdb_put_packet(connection, "E01", 3); */
+		retval = GDB_THREAD_PACKET_NOT_CONSUMED;
+		break;
 
-				if ((ct) && (ct->threadid == -1)) {
-					ct = linux_os->current_threads;
+	case 'c':
+	case 's':
+		if (linux_os->threads_lookup == 1) {
+			ct = linux_os->current_threads;
 
-					while ((ct) && (ct->threadid == -1))
-						ct = ct->next;
-				}
+			while ((ct) && (ct->core_id) != target->coreid)
+				ct = ct->next;
 
-				if ((ct) && (ct->threadid !=
-						 target->rtos->current_threadid)
-				&& (target->rtos->current_threadid != -1))
-					LOG_WARNING("WARNING! current GDB thread do not match "
-							"current thread running. "
-							"Switch thread in GDB to threadid %d",
-							(int)ct->threadid);
+			if ((ct) && (ct->threadid == -1)) {
+				ct = linux_os->current_threads;
 
-				LOG_INFO("threads_needs_update = 1");
-				linux_os->threads_needs_update = 1;
+				while ((ct) && (ct->threadid == -1))
+					ct = ct->next;
 			}
-			break;
+
+			if ((ct) && (ct->threadid !=
+					 target->rtos->current_threadid)
+			&& (target->rtos->current_threadid != -1))
+				LOG_WARNING("WARNING! current GDB thread do not match "
+						"current thread running. "
+						"Switch thread in GDB to threadid %d",
+						(int)ct->threadid);
+
+			LOG_INFO("threads_needs_update = 1");
+			linux_os->threads_needs_update = 1;
+		}
+		break;
 	}
 
 	return retval;

-- 

[PATCH]: f541252c18 rtos: linux: prepare for aligning switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9037

-- gerrit

commit f541252c184adc60b452d8fd078ee7fba5dee79a
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 14:02:50 2025 +0200

    rtos: linux: prepare for aligning switch and case statements
    
    To prepare for aligning switch and case statements, fix in advance
    some checkpatch error due to existing code:
    - fix useless 'else' after 'break', by moving the 'break'
      statement.
    
    While there:
    - modify the checks on strncmp().
    
    Change-Id: I123f3c0e3999669440845c946e4839d7288e8d91
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 7ee97668ef..785be13fd8 100644
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -1293,38 +1293,32 @@ static int linux_thread_packet(struct connection *connection, char const *packet
 			break;
 		case 'q':
 
-			if (strncmp(packet, "qSymbol", 7) == 0) {
+			if (!strncmp(packet, "qSymbol", 7)) {
 				if (rtos_qsymbol(connection, packet, packet_size) == 1) {
 					linux_compute_virt2phys(target,
 							target->rtos->symbols[INIT_TASK].address);
 				}
-
-				break;
-			} else if (strncmp(packet, "qfThreadInfo", 12) == 0) {
+			} else if (!strncmp(packet, "qfThreadInfo", 12)) {
 				if (!linux_os->thread_list) {
 					retval = linux_gdb_thread_packet(target,
 							connection,
 							packet,
 							packet_size);
-					break;
 				} else {
 					retval = linux_gdb_thread_update(target,
 							connection,
 							packet,
 							packet_size);
-					break;
 				}
-			} else if (strncmp(packet, "qsThreadInfo", 12) == 0) {
+			} else if (!strncmp(packet, "qsThreadInfo", 12)) {
 				gdb_put_packet(connection, "l", 1);
-				break;
-			} else if (strncmp(packet, "qThreadExtraInfo,", 17) == 0) {
+			} else if (!strncmp(packet, "qThreadExtraInfo,", 17)) {
 				linux_thread_extra_info(target, connection, packet,
 						packet_size);
-				break;
 			} else {
 				retval = GDB_THREAD_PACKET_NOT_CONSUMED;
-				break;
 			}
+			break;
 
 		case 'Q':
 			/* previously response was : thread not found

-- 

[PATCH]: 19a08b49ea svf: drop goto and label in switch statement

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9041

-- gerrit

commit 19a08b49ea6816f0a8080bc17d8fceb055e8245f
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Jun 29 23:15:54 2025 +0200

    svf: drop goto and label in switch statement
    
    Drop the jumps to the label thanks to the factorized code.
    Drop the now unused label.
    
    Change-Id: I7e61ecee5a883a6ed6b77bfbff54a615d1b4d61c
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index d0a8563dd2..5c87f895a0 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -1271,7 +1271,7 @@ static int svf_xxr_common(char **argus, int num_of_argu, char command, struct sv
 static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 {
 	char *argus[256], command;
-	int num_of_argu = 0, i;
+	int num_of_argu = 0, i, retval;
 
 	/* tmp variable */
 	int i_tmp;
@@ -1279,8 +1279,6 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 	/* for RUNTEST */
 	int run_count;
 	float min_time;
-	/* for XXR */
-	struct svf_xxr_para *xxr_para_tmp;
 	/* for STATE */
 	enum tap_state *path = NULL, state;
 	/* flag padding commands skipped due to -tap command */
@@ -1351,37 +1349,44 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
 				padding_command_skipped = 1;
 				break;
 			}
-			xxr_para_tmp = &svf_para.hdr_para;
-			goto xxr_common;
+			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.hdr_para);
+			if (retval != ERROR_OK)
+				return retval;
+			break;
 		case HIR:
 			if (svf_tap_is_specified) {
 				padding_command_skipped = 1;
 				break;
 			}
-			xxr_para_tmp = &svf_para.hir_para;
-			goto xxr_common;
+			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.hir_para);
+			if (retval != ERROR_OK)
+				return retval;
+			break;
 		case TDR:
 			if (svf_tap_is_specified) {
 				padding_command_skipped = 1;
 				break;
 			}
-			xxr_para_tmp = &svf_para.tdr_para;
-			goto xxr_common;
+			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.tdr_para);
+			if (retval != ERROR_OK)
+				return retval;
+			break;
 		case TIR:
 			if (svf_tap_is_specified) {
 				padding_command_skipped = 1;
 				break;
 			}
-			xxr_para_tmp = &svf_para.tir_para;
-			goto xxr_common;
+			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.tir_para);
+			if (retval != ERROR_OK)
+				return retval;
+			break;
 		case SDR:
-			xxr_para_tmp = &svf_para.sdr_para;
-			goto xxr_common;
+			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.sdr_para);
+			if (retval != ERROR_OK)
+				return retval;
+			break;
 		case SIR:
-			xxr_para_tmp = &svf_para.sir_para;
-			goto xxr_common;
-xxr_common:
-			int retval = svf_xxr_common(argus, num_of_argu, command, xxr_para_tmp);
+			retval = svf_xxr_common(argus, num_of_argu, command, &svf_para.sir_para);
 			if (retval != ERROR_OK)
 				return retval;
 			break;

-- 

[PATCH]: c3cddf1bc4 flash: nor: jtagspi: invert the operands in check

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9035

-- gerrit

commit c3cddf1bc443b7c4cee4eaa376f50b9dbc773859
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Jul 25 20:07:27 2025 +0200

    flash: nor: jtagspi: invert the operands in check
    
    Check the variable against the constant.
    No functional change.
    
    Change-Id: Ie3138e516f4b81bf544780981863e856f8ffc528
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/jtagspi.c b/src/flash/nor/jtagspi.c
index 4b975390be..e1bb17ab1f 100644
--- a/src/flash/nor/jtagspi.c
+++ b/src/flash/nor/jtagspi.c
@@ -230,7 +230,7 @@ COMMAND_HANDLER(jtagspi_handle_set)
 	*/
 	retval = CALL_COMMAND_HANDLER(flash_command_get_bank_probe_optional, 0,
 		&bank, false);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 	info = bank->driver_priv;
 
@@ -420,7 +420,7 @@ COMMAND_HANDLER(jtagspi_handle_always_4byte)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	jtagspi_info = bank->driver_priv;

-- 

[PATCH]: 7a6da1761f rtos: linux: drop useless code

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9036

-- gerrit

commit 7a6da1761fe5dfdcbfe2fedea81a452430935dce
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 01:09:22 2025 +0200

    rtos: linux: drop useless code
    
    Since the initial code merged in 2012, the last case of the switch
    has a useless test on 'retval' that is not assigned in the case.
    Since 'retval' is initialized to ERROR_OK, the condition is always
    false.
    
    Drop the check on 'retval'.
    While there, drop the useless parenthesis around the 'case' and
    add the 'break' statement.
    
    Change-Id: I3f673b5e10f6b28a4a74881b8a06a71b58afb422
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 4ca02605ed..7ee97668ef 100644
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -1332,7 +1332,7 @@ static int linux_thread_packet(struct connection *connection, char const *packet
 			retval = GDB_THREAD_PACKET_NOT_CONSUMED;
 			break;
 		case 'c':
-		case 's': {
+		case 's':
 			if (linux_os->threads_lookup == 1) {
 				ct = linux_os->current_threads;
 
@@ -1357,11 +1357,7 @@ static int linux_thread_packet(struct connection *connection, char const *packet
 				LOG_INFO("threads_needs_update = 1");
 				linux_os->threads_needs_update = 1;
 			}
-		}
-
-		/* if a packet handler returned an error, exit input loop */
-		if (retval != ERROR_OK)
-			return retval;
+			break;
 	}
 
 	return retval;

-- 

[PATCH]: a7c7c93b39 flash: nand: align switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9032

-- gerrit

commit a7c7c93b39a17da43108ad35e6705a24f7e7a9fa
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 00:05:13 2025 +0200

    flash: nand: align switch and case statements
    
    The coding style requires the 'case' to be at the same indentation
    level of its 'switch' statement.
    
    Align the code accordingly.
    
    No changes are reported by
            git log -p -w --ignore-blank-lines --patience
    
    Change-Id: I9689e5b4650b8301d1b81e384e4db41b4efc3993
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nand/core.c b/src/flash/nand/core.c
index e5f330d2d6..a79844eb5f 100644
--- a/src/flash/nand/core.c
+++ b/src/flash/nand/core.c
@@ -310,15 +310,15 @@ int nand_probe(struct nand_device *nand)
 	retval = nand->controller->init(nand);
 	if (retval != ERROR_OK) {
 		switch (retval) {
-			case ERROR_NAND_OPERATION_FAILED:
-				LOG_DEBUG("controller initialization failed");
-				return ERROR_NAND_OPERATION_FAILED;
-			case ERROR_NAND_OPERATION_NOT_SUPPORTED:
-				LOG_ERROR("BUG: controller reported that it doesn't support default parameters");
-				return ERROR_NAND_OPERATION_FAILED;
-			default:
-				LOG_ERROR("BUG: unknown controller initialization failure");
-				return ERROR_NAND_OPERATION_FAILED;
+		case ERROR_NAND_OPERATION_FAILED:
+			LOG_DEBUG("controller initialization failed");
+			return ERROR_NAND_OPERATION_FAILED;
+		case ERROR_NAND_OPERATION_NOT_SUPPORTED:
+			LOG_ERROR("BUG: controller reported that it doesn't support default parameters");
+			return ERROR_NAND_OPERATION_FAILED;
+		default:
+			LOG_ERROR("BUG: unknown controller initialization failure");
+			return ERROR_NAND_OPERATION_FAILED;
 		}
 	}
 
@@ -449,18 +449,18 @@ int nand_probe(struct nand_device *nand)
 	/* erase size */
 	if (nand->device->erase_size == 0) {
 		switch ((id_buff[4] >> 4) & 3) {
-			case 0:
-				nand->erase_size = 64 << 10;
-				break;
-			case 1:
-				nand->erase_size = 128 << 10;
-				break;
-			case 2:
-				nand->erase_size = 256 << 10;
-				break;
-			case 3:
-				nand->erase_size = 512 << 10;
-				break;
+		case 0:
+			nand->erase_size = 64 << 10;
+			break;
+		case 1:
+			nand->erase_size = 128 << 10;
+			break;
+		case 2:
+			nand->erase_size = 256 << 10;
+			break;
+		case 3:
+			nand->erase_size = 512 << 10;
+			break;
 		}
 	} else
 		nand->erase_size = nand->device->erase_size;
@@ -469,18 +469,18 @@ int nand_probe(struct nand_device *nand)
 	retval = nand->controller->init(nand);
 	if (retval != ERROR_OK) {
 		switch (retval) {
-			case ERROR_NAND_OPERATION_FAILED:
-				LOG_DEBUG("controller initialization failed");
-				return ERROR_NAND_OPERATION_FAILED;
-			case ERROR_NAND_OPERATION_NOT_SUPPORTED:
-				LOG_ERROR("controller doesn't support requested parameters (buswidth: %i, address cycles: %i, page size: %i)",
-					nand->bus_width,
-					nand->address_cycles,
-					nand->page_size);
-				return ERROR_NAND_OPERATION_FAILED;
-			default:
-				LOG_ERROR("BUG: unknown controller initialization failure");
-				return ERROR_NAND_OPERATION_FAILED;
+		case ERROR_NAND_OPERATION_FAILED:
+			LOG_DEBUG("controller initialization failed");
+			return ERROR_NAND_OPERATION_FAILED;
+		case ERROR_NAND_OPERATION_NOT_SUPPORTED:
+			LOG_ERROR("controller doesn't support requested parameters (buswidth: %i, address cycles: %i, page size: %i)",
+				nand->bus_width,
+				nand->address_cycles,
+				nand->page_size);
+			return ERROR_NAND_OPERATION_FAILED;
+		default:
+			LOG_ERROR("BUG: unknown controller initialization failure");
+			return ERROR_NAND_OPERATION_FAILED;
 		}
 	}
 
diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c
index 17040fe172..d27b4c748c 100644
--- a/src/flash/nand/davinci.c
+++ b/src/flash/nand/davinci.c
@@ -256,17 +256,17 @@ static int davinci_write_page(struct nand_device *nand, uint32_t page,
 
 	/* If we're not given OOB, write 0xff where we don't write ECC codes. */
 	switch (nand->page_size) {
-		case 512:
-			oob_size = 16;
-			break;
-		case 2048:
-			oob_size = 64;
-			break;
-		case 4096:
-			oob_size = 128;
-			break;
-		default:
-			return ERROR_NAND_OPERATION_FAILED;
+	case 512:
+		oob_size = 16;
+		break;
+	case 2048:
+		oob_size = 64;
+		break;
+	case 4096:
+		oob_size = 128;
+		break;
+	default:
+		return ERROR_NAND_OPERATION_FAILED;
 	}
 	if (!oob) {
 		ooballoc = malloc(oob_size);
@@ -391,15 +391,15 @@ static int davinci_write_page_ecc1(struct nand_device *nand, uint32_t page,
 	 * for 16-bit OOB, those extra bytes are discontiguous.
 	 */
 	switch (nand->page_size) {
-		case 512:
-			oob_offset = 0;
-			break;
-		case 2048:
-			oob_offset = 40;
-			break;
-		default:
-			oob_offset = 80;
-			break;
+	case 512:
+		oob_offset = 0;
+		break;
+	case 2048:
+		oob_offset = 40;
+		break;
+	default:
+		oob_offset = 80;
+		break;
 	}
 
 	davinci_write_pagecmd(nand, NAND_CMD_SEQIN, page);
@@ -482,15 +482,15 @@ static int davinci_write_page_ecc4(struct nand_device *nand, uint32_t page,
 	 * the standard ECC logic can't handle.
 	 */
 	switch (nand->page_size) {
-		case 512:
-			l = ecc512;
-			break;
-		case 2048:
-			l = ecc2048;
-			break;
-		default:
-			l = ecc4096;
-			break;
+	case 512:
+		l = ecc512;
+		break;
+	case 2048:
+		l = ecc2048;
+		break;
+	default:
+		l = ecc4096;
+		break;
 	}
 
 	davinci_write_pagecmd(nand, NAND_CMD_SEQIN, page);
@@ -741,19 +741,19 @@ NAND_DEVICE_COMMAND_HANDLER(davinci_nand_device_command)
 	info->read_page = nand_read_page_raw;
 
 	switch (eccmode) {
-		case HWECC1:
-			/* ECC_HW, 1-bit corrections, 3 bytes ECC per 512 data bytes */
-			info->write_page = davinci_write_page_ecc1;
-			break;
-		case HWECC4:
-			/* ECC_HW, 4-bit corrections, 10 bytes ECC per 512 data bytes */
-			info->write_page = davinci_write_page_ecc4;
-			break;
-		case HWECC4_INFIX:
-			/* Same 4-bit ECC HW, with problematic page/ecc layout */
-			info->read_page = davinci_read_page_ecc4infix;
-			info->write_page = davinci_write_page_ecc4infix;
-			break;
+	case HWECC1:
+		/* ECC_HW, 1-bit corrections, 3 bytes ECC per 512 data bytes */
+		info->write_page = davinci_write_page_ecc1;
+		break;
+	case HWECC4:
+		/* ECC_HW, 4-bit corrections, 10 bytes ECC per 512 data bytes */
+		info->write_page = davinci_write_page_ecc4;
+		break;
+	case HWECC4_INFIX:
+		/* Same 4-bit ECC HW, with problematic page/ecc layout */
+		info->read_page = davinci_read_page_ecc4infix;
+		info->write_page = davinci_write_page_ecc4infix;
+		break;
 	}
 
 	return ERROR_OK;
diff --git a/src/flash/nand/mx3.c b/src/flash/nand/mx3.c
index abcc44c3fc..23c18947ba 100644
--- a/src/flash/nand/mx3.c
+++ b/src/flash/nand/mx3.c
@@ -256,23 +256,23 @@ static int imx31_command(struct nand_device *nand, uint8_t command)
 	}
 
 	switch (command) {
-		case NAND_CMD_READOOB:
-			command = NAND_CMD_READ0;
-			in_sram_address = MX3_NF_SPARE_BUFFER0;	/* set read point for
-								* data_read() and
-								* read_block_data() to
-								* spare area in SRAM
-								* buffer */
-			break;
-		case NAND_CMD_READ1:
-			command = NAND_CMD_READ0;
-			/*
-			 * offset == one half of page size
-			 */
-			in_sram_address = MX3_NF_MAIN_BUFFER0 + (nand->page_size >> 1);
-			break;
-		default:
-			in_sram_address = MX3_NF_MAIN_BUFFER0;
+	case NAND_CMD_READOOB:
+		command = NAND_CMD_READ0;
+		in_sram_address = MX3_NF_SPARE_BUFFER0;	/* set read point for
+												 * data_read() and
+												 * read_block_data() to
+												 * spare area in SRAM
+												 * buffer */
+		break;
+	case NAND_CMD_READ1:
+		command = NAND_CMD_READ0;
+		/*
+		 * offset == one half of page size
+		 */
+		in_sram_address = MX3_NF_MAIN_BUFFER0 + (nand->page_size >> 1);
+		break;
+	default:
+		in_sram_address = MX3_NF_MAIN_BUFFER0;
 	}
 
 	target_write_u16(target, MX3_NF_FCMD, command);
@@ -291,20 +291,20 @@ static int imx31_command(struct nand_device *nand, uint8_t command)
 	*/
 	sign_of_sequental_byte_read = 0;
 	switch (command) {
-		case NAND_CMD_READID:
-			mx3_nf_info->optype = MX3_NF_DATAOUT_NANDID;
-			mx3_nf_info->fin = MX3_NF_FIN_DATAOUT;
-			break;
-		case NAND_CMD_STATUS:
-			mx3_nf_info->optype = MX3_NF_DATAOUT_NANDSTATUS;
-			mx3_nf_info->fin = MX3_NF_FIN_DATAOUT;
-			break;
-		case NAND_CMD_READ0:
-			mx3_nf_info->fin = MX3_NF_FIN_DATAOUT;
-			mx3_nf_info->optype = MX3_NF_DATAOUT_PAGE;
-			break;
-		default:
-			mx3_nf_info->optype = MX3_NF_DATAOUT_PAGE;
+	case NAND_CMD_READID:
+		mx3_nf_info->optype = MX3_NF_DATAOUT_NANDID;
+		mx3_nf_info->fin = MX3_NF_FIN_DATAOUT;
+		break;
+	case NAND_CMD_STATUS:
+		mx3_nf_info->optype = MX3_NF_DATAOUT_NANDSTATUS;
+		mx3_nf_info->fin = MX3_NF_FIN_DATAOUT;
+		break;
+	case NAND_CMD_READ0:
+		mx3_nf_info->fin = MX3_NF_FIN_DATAOUT;
+		mx3_nf_info->optype = MX3_NF_DATAOUT_PAGE;
+		break;
+	default:
+		mx3_nf_info->optype = MX3_NF_DATAOUT_PAGE;
 	}
 	return ERROR_OK;
 }
@@ -647,46 +647,46 @@ static int do_data_output(struct nand_device *nand)
 	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	struct target *target = nand->target;
 	switch (mx3_nf_info->fin) {
-		case MX3_NF_FIN_DATAOUT:
-			/*
-			 * start data output operation (set MX3_NF_BIT_OP_DONE==0)
-			 */
-			target_write_u16 (target, MX3_NF_CFG2,
-					MX3_NF_BIT_DATAOUT_TYPE(mx3_nf_info->optype));
-			{
-				int poll_result;
-				poll_result = poll_for_complete_op(target, "data output");
-				if (poll_result != ERROR_OK)
-					return poll_result;
+	case MX3_NF_FIN_DATAOUT:
+		/*
+		 * start data output operation (set MX3_NF_BIT_OP_DONE==0)
+		 */
+		target_write_u16 (target, MX3_NF_CFG2,
+				MX3_NF_BIT_DATAOUT_TYPE(mx3_nf_info->optype));
+		{
+			int poll_result;
+			poll_result = poll_for_complete_op(target, "data output");
+			if (poll_result != ERROR_OK)
+				return poll_result;
+		}
+		mx3_nf_info->fin = MX3_NF_FIN_NONE;
+		/*
+		 * ECC stuff
+		 */
+		if (mx3_nf_info->optype == MX3_NF_DATAOUT_PAGE
+				&& mx3_nf_info->flags.hw_ecc_enabled) {
+			uint16_t ecc_status;
+			target_read_u16 (target, MX3_NF_ECCSTATUS, &ecc_status);
+			switch (ecc_status & 0x000c) {
+			case 1 << 2:
+				LOG_DEBUG("main area read with 1 (correctable) error");
+				break;
+			case 2 << 2:
+				LOG_DEBUG("main area read with more than 1 (incorrectable) error");
+				return ERROR_NAND_OPERATION_FAILED;
 			}
-			mx3_nf_info->fin = MX3_NF_FIN_NONE;
-			/*
-			 * ECC stuff
-			 */
-			if (mx3_nf_info->optype == MX3_NF_DATAOUT_PAGE
-					&& mx3_nf_info->flags.hw_ecc_enabled) {
-				uint16_t ecc_status;
-				target_read_u16 (target, MX3_NF_ECCSTATUS, &ecc_status);
-				switch (ecc_status & 0x000c) {
-				case 1 << 2:
-					LOG_DEBUG("main area read with 1 (correctable) error");
-					break;
-				case 2 << 2:
-					LOG_DEBUG("main area read with more than 1 (incorrectable) error");
-					return ERROR_NAND_OPERATION_FAILED;
-				}
-				switch (ecc_status & 0x0003) {
-				case 1:
-					LOG_DEBUG("spare area read with 1 (correctable) error");
-					break;
-				case 2:
-					LOG_DEBUG("main area read with more than 1 (incorrectable) error");
-					return ERROR_NAND_OPERATION_FAILED;
-				}
+			switch (ecc_status & 0x0003) {
+			case 1:
+				LOG_DEBUG("spare area read with 1 (correctable) error");
+				break;
+			case 2:
+				LOG_DEBUG("main area read with more than 1 (incorrectable) error");
+				return ERROR_NAND_OPERATION_FAILED;
 			}
-			break;
-		case MX3_NF_FIN_NONE:
-			break;
+		}
+		break;
+	case MX3_NF_FIN_NONE:
+		break;
 	}
 	return ERROR_OK;
 }
diff --git a/src/flash/nand/mxc.c b/src/flash/nand/mxc.c
index 845a3bb9a6..f37468f8dc 100644
--- a/src/flash/nand/mxc.c
+++ b/src/flash/nand/mxc.c
@@ -338,26 +338,26 @@ static int mxc_command(struct nand_device *nand, uint8_t command)
 		return validate_target_result;
 
 	switch (command) {
-		case NAND_CMD_READOOB:
-			command = NAND_CMD_READ0;
-			/* set read point for data_read() and read_block_data() to
-			 * spare area in SRAM buffer
-			 */
-			if (nfc_is_v1())
-				in_sram_address = MXC_NF_V1_SPARE_BUFFER0;
-			else
-				in_sram_address = MXC_NF_V2_SPARE_BUFFER0;
-			break;
-		case NAND_CMD_READ1:
-			command = NAND_CMD_READ0;
-			/*
-			 * offset == one half of page size
-			 */
-			in_sram_address = MXC_NF_MAIN_BUFFER0 + (nand->page_size >> 1);
-			break;
-		default:
-			in_sram_address = MXC_NF_MAIN_BUFFER0;
-			break;
+	case NAND_CMD_READOOB:
+		command = NAND_CMD_READ0;
+		/* set read point for data_read() and read_block_data() to
+		 * spare area in SRAM buffer
+		 */
+		if (nfc_is_v1())
+			in_sram_address = MXC_NF_V1_SPARE_BUFFER0;
+		else
+			in_sram_address = MXC_NF_V2_SPARE_BUFFER0;
+		break;
+	case NAND_CMD_READ1:
+		command = NAND_CMD_READ0;
+		/*
+		 * offset == one half of page size
+		 */
+		in_sram_address = MXC_NF_MAIN_BUFFER0 + (nand->page_size >> 1);
+		break;
+	default:
+		in_sram_address = MXC_NF_MAIN_BUFFER0;
+		break;
 	}
 
 	target_write_u16(target, MXC_NF_FCMD, command);
@@ -374,24 +374,24 @@ static int mxc_command(struct nand_device *nand, uint8_t command)
 	sign_of_sequental_byte_read = 0;
 	/* Handle special read command and adjust NF_CFG2(FDO) */
 	switch (command) {
-		case NAND_CMD_READID:
-			mxc_nf_info->optype = MXC_NF_DATAOUT_NANDID;
-			mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
-			break;
-		case NAND_CMD_STATUS:
-			mxc_nf_info->optype = MXC_NF_DATAOUT_NANDSTATUS;
-			mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
-			target_write_u16 (target, MXC_NF_BUFADDR, 0);
-			in_sram_address = 0;
-			break;
-		case NAND_CMD_READ0:
-			mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
-			mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
-			break;
-		default:
-			/* Other command use the default 'One page data out' FDO */
-			mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
-			break;
+	case NAND_CMD_READID:
+		mxc_nf_info->optype = MXC_NF_DATAOUT_NANDID;
+		mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
+		break;
+	case NAND_CMD_STATUS:
+		mxc_nf_info->optype = MXC_NF_DATAOUT_NANDSTATUS;
+		mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
+		target_write_u16 (target, MXC_NF_BUFADDR, 0);
+		in_sram_address = 0;
+		break;
+	case NAND_CMD_READ0:
+		mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
+		mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
+		break;
+	default:
+		/* Other command use the default 'One page data out' FDO */
+		mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
+		break;
 	}
 	return ERROR_OK;
 }
@@ -857,20 +857,20 @@ static int ecc_status_v1(struct nand_device *nand)
 
 	target_read_u16(target, MXC_NF_ECCSTATUS, &ecc_status);
 	switch (ecc_status & 0x000c) {
-		case 1 << 2:
-			LOG_INFO("main area read with 1 (correctable) error");
-			break;
-		case 2 << 2:
-			LOG_INFO("main area read with more than 1 (incorrectable) error");
-			return ERROR_NAND_OPERATION_FAILED;
+	case 1 << 2:
+		LOG_INFO("main area read with 1 (correctable) error");
+		break;
+	case 2 << 2:
+		LOG_INFO("main area read with more than 1 (incorrectable) error");
+		return ERROR_NAND_OPERATION_FAILED;
 	}
 	switch (ecc_status & 0x0003) {
-		case 1:
-			LOG_INFO("spare area read with 1 (correctable) error");
-			break;
-		case 2:
-			LOG_INFO("main area read with more than 1 (incorrectable) error");
-			return ERROR_NAND_OPERATION_FAILED;
+	case 1:
+		LOG_INFO("spare area read with 1 (correctable) error");
+		break;
+	case 2:
+		LOG_INFO("main area read with more than 1 (incorrectable) error");
+		return ERROR_NAND_OPERATION_FAILED;
 	}
 	return ERROR_OK;
 }
@@ -904,31 +904,31 @@ static int do_data_output(struct nand_device *nand)
 	struct target *target = nand->target;
 	int poll_result;
 	switch (mxc_nf_info->fin) {
-		case MXC_NF_FIN_DATAOUT:
-			/*
-			 * start data output operation (set MXC_NF_BIT_OP_DONE==0)
-			 */
-			target_write_u16(target, MXC_NF_CFG2, MXC_NF_BIT_DATAOUT_TYPE(mxc_nf_info->optype));
-			poll_result = poll_for_complete_op(nand, "data output");
-			if (poll_result != ERROR_OK)
-				return poll_result;
+	case MXC_NF_FIN_DATAOUT:
+		/*
+		 * start data output operation (set MXC_NF_BIT_OP_DONE==0)
+		 */
+		target_write_u16(target, MXC_NF_CFG2, MXC_NF_BIT_DATAOUT_TYPE(mxc_nf_info->optype));
+		poll_result = poll_for_complete_op(nand, "data output");
+		if (poll_result != ERROR_OK)
+			return poll_result;
 
-			mxc_nf_info->fin = MXC_NF_FIN_NONE;
-			/*
-			 * ECC stuff
-			 */
-			if (mxc_nf_info->optype == MXC_NF_DATAOUT_PAGE && mxc_nf_info->flags.hw_ecc_enabled) {
-				int ecc_status;
-				if (nfc_is_v1())
-					ecc_status = ecc_status_v1(nand);
-				else
-					ecc_status = ecc_status_v2(nand);
-				if (ecc_status != ERROR_OK)
-					return ecc_status;
-			}
-			break;
-		case MXC_NF_FIN_NONE:
-			break;
+		mxc_nf_info->fin = MXC_NF_FIN_NONE;
+		/*
+		 * ECC stuff
+		 */
+		if (mxc_nf_info->optype == MXC_NF_DATAOUT_PAGE && mxc_nf_info->flags.hw_ecc_enabled) {
+			int ecc_status;
+			if (nfc_is_v1())
+				ecc_status = ecc_status_v1(nand);
+			else
+				ecc_status = ecc_status_v2(nand);
+			if (ecc_status != ERROR_OK)
+				return ecc_status;
+		}
+		break;
+	case MXC_NF_FIN_NONE:
+		break;
 	}
 	return ERROR_OK;
 }
diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index d40377cc0b..0d6686d007 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -50,22 +50,22 @@ COMMAND_HANDLER(handle_nand_info_command)
 	int last = -1;
 
 	switch (CMD_ARGC) {
-		case 1:
-			first = 0;
-			last = INT32_MAX;
-			break;
-		case 2:
-			COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], i);
-			first = i;
-			last = i;
-			i = 0;
-			break;
-		case 3:
-			COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
-			COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
-			break;
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
+	case 1:
+		first = 0;
+		last = INT32_MAX;
+		break;
+	case 2:
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], i);
+		first = i;
+		last = i;
+		i = 0;
+		break;
+	case 3:
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
+		break;
+	default:
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct nand_device *p;

-- 

[PATCH]: 9be75f72e3 openocd: align switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9009

-- gerrit

commit 9be75f72e36d4a657d04646e5207804f35379bbe
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 01:24:34 2025 +0200

    openocd: align switch and case statements
    
    The coding style requires the 'case' to be at the same indentation
    level of its 'switch' statement.
    
    Align the code accordingly.
    
    No changes are reported by
            git log -p -w --ignore-blank-lines --patience
    
    Change-Id: I2a4c33f12506e898e1efbbfd711cc5834d81dda1
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/openocd.c b/src/openocd.c
index e63a9661a3..f3e1bee48e 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -75,20 +75,20 @@ static int log_target_callback_event_handler(struct target *target,
 	void *priv)
 {
 	switch (event) {
-		case TARGET_EVENT_GDB_START:
-			target->verbose_halt_msg = false;
-			break;
-		case TARGET_EVENT_GDB_END:
-			target->verbose_halt_msg = true;
-			break;
-		case TARGET_EVENT_HALTED:
-			if (target->verbose_halt_msg) {
-				/* do not display information when debugger caused the halt */
-				target_arch_state(target);
-			}
-			break;
-		default:
-			break;
+	case TARGET_EVENT_GDB_START:
+		target->verbose_halt_msg = false;
+		break;
+	case TARGET_EVENT_GDB_END:
+		target->verbose_halt_msg = true;
+		break;
+	case TARGET_EVENT_HALTED:
+		if (target->verbose_halt_msg) {
+			/* do not display information when debugger caused the halt */
+			target_arch_state(target);
+		}
+		break;
+	default:
+		break;
 	}
 
 	return ERROR_OK;

-- 

[PATCH]: 5b8664f9d0 flash: nand: prepare for aligning switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9011

-- gerrit

commit 5b8664f9d01137ed803cae2f92780ae79fc043f8
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 10:34:00 2025 +0200

    flash: nand: prepare for aligning switch and case statements
    
    To prepare for aligning switch and case statements, fix in advance
    some checkpatch error due to existing code:
    - remove useless parenthesis;
    - don't end line with an open parenthesis;
    - expand multiple assignments.
    
    While there, put the 'default' case as last in the list.
    
    Change-Id: I17bf5e88b145ef9b5b188424182f4e54b818eeae
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nand/core.c b/src/flash/nand/core.c
index c5430aeb05..e5f330d2d6 100644
--- a/src/flash/nand/core.c
+++ b/src/flash/nand/core.c
@@ -314,8 +314,7 @@ int nand_probe(struct nand_device *nand)
 				LOG_DEBUG("controller initialization failed");
 				return ERROR_NAND_OPERATION_FAILED;
 			case ERROR_NAND_OPERATION_NOT_SUPPORTED:
-				LOG_ERROR(
-				"BUG: controller reported that it doesn't support default parameters");
+				LOG_ERROR("BUG: controller reported that it doesn't support default parameters");
 				return ERROR_NAND_OPERATION_FAILED;
 			default:
 				LOG_ERROR("BUG: unknown controller initialization failure");
@@ -474,11 +473,10 @@ int nand_probe(struct nand_device *nand)
 				LOG_DEBUG("controller initialization failed");
 				return ERROR_NAND_OPERATION_FAILED;
 			case ERROR_NAND_OPERATION_NOT_SUPPORTED:
-				LOG_ERROR(
-				"controller doesn't support requested parameters (buswidth: %i, address cycles: %i, page size: %i)",
-				nand->bus_width,
-				nand->address_cycles,
-				nand->page_size);
+				LOG_ERROR("controller doesn't support requested parameters (buswidth: %i, address cycles: %i, page size: %i)",
+					nand->bus_width,
+					nand->address_cycles,
+					nand->page_size);
 				return ERROR_NAND_OPERATION_FAILED;
 			default:
 				LOG_ERROR("BUG: unknown controller initialization failure");
diff --git a/src/flash/nand/mx3.c b/src/flash/nand/mx3.c
index 86e94685b7..abcc44c3fc 100644
--- a/src/flash/nand/mx3.c
+++ b/src/flash/nand/mx3.c
@@ -663,7 +663,7 @@ static int do_data_output(struct nand_device *nand)
 			/*
 			 * ECC stuff
 			 */
-			if ((mx3_nf_info->optype == MX3_NF_DATAOUT_PAGE)
+			if (mx3_nf_info->optype == MX3_NF_DATAOUT_PAGE
 					&& mx3_nf_info->flags.hw_ecc_enabled) {
 				uint16_t ecc_status;
 				target_read_u16 (target, MX3_NF_ECCSTATUS, &ecc_status);
diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 67a62770fb..d40377cc0b 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -50,21 +50,22 @@ COMMAND_HANDLER(handle_nand_info_command)
 	int last = -1;
 
 	switch (CMD_ARGC) {
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
 		case 1:
 			first = 0;
 			last = INT32_MAX;
 			break;
 		case 2:
 			COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], i);
-			first = last = i;
+			first = i;
+			last = i;
 			i = 0;
 			break;
 		case 3:
 			COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
 			COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
 			break;
+		default:
+			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct nand_device *p;

-- 

[PATCH]: 5e1c312b02 flash: nor: prepare for aligning switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9033

-- gerrit

commit 5e1c312b020acd174db85bddc28ba8d9d3beaf72
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 11:08:18 2025 +0200

    flash: nor: prepare for aligning switch and case statements
    
    To prepare for aligning switch and case statements, fix in advance
    some checkpatch error due to existing code:
    - remove useless parenthesis;
    - uniform braces around if/else statements,
    - add space around operators.
    
    While there:
    - put the 'default' case as last in the list;
    - convert format strings to drop cast.
    
    Change-Id: I335b200add75b95bf1e908af39e957b61b617e22
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index b86a18da75..4042d32dec 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -2571,9 +2571,6 @@ static void sam3_explain_ckgr_mor(struct sam3_chip *chip)
 	chip->cfg.rc_freq = 0;
 	if (rcen) {
 		switch (v) {
-			default:
-				chip->cfg.rc_freq = 0;
-				break;
 			case 0:
 				chip->cfg.rc_freq = 4 * 1000 * 1000;
 				break;
@@ -2583,6 +2580,9 @@ static void sam3_explain_ckgr_mor(struct sam3_chip *chip)
 			case 2:
 				chip->cfg.rc_freq = 12 * 1000 * 1000;
 				break;
+			default:
+				chip->cfg.rc_freq = 0;
+				break;
 		}
 	}
 
@@ -3011,25 +3011,11 @@ FLASH_BANK_COMMAND_HANDLER(sam3_flash_bank_command)
 	}
 
 	switch (bank->base) {
-		default:
-			LOG_ERROR("Address 0x%08x invalid bank address (try 0x%08x or 0x%08x "
-			"[at91sam3u series] or 0x%08x [at91sam3s series] or "
-			"0x%08x [at91sam3n series] or 0x%08x or 0x%08x or 0x%08x[at91sam3ax series] )",
-			((unsigned int)(bank->base)),
-			((unsigned int)(FLASH_BANK0_BASE_U)),
-			((unsigned int)(FLASH_BANK1_BASE_U)),
-			((unsigned int)(FLASH_BANK_BASE_S)),
-			((unsigned int)(FLASH_BANK_BASE_N)),
-			((unsigned int)(FLASH_BANK0_BASE_AX)),
-		    ((unsigned int)(FLASH_BANK1_BASE_256K_AX)),
-		    ((unsigned int)(FLASH_BANK1_BASE_512K_AX)));
-			return ERROR_FAIL;
-
 		/* at91sam3s and at91sam3n series only has bank 0*/
 		/* at91sam3u and at91sam3ax series has the same address for bank 0*/
 		case FLASH_BANK_BASE_S:
 		case FLASH_BANK0_BASE_U:
-			bank->driver_priv = &(chip->details.bank[0]);
+			bank->driver_priv = &chip->details.bank[0];
 			bank->bank_number = 0;
 			chip->details.bank[0].chip = chip;
 			chip->details.bank[0].bank = bank;
@@ -3039,11 +3025,25 @@ FLASH_BANK_COMMAND_HANDLER(sam3_flash_bank_command)
 		case FLASH_BANK1_BASE_U:
 		case FLASH_BANK1_BASE_256K_AX:
 		case FLASH_BANK1_BASE_512K_AX:
-			bank->driver_priv = &(chip->details.bank[1]);
+			bank->driver_priv = &chip->details.bank[1];
 			bank->bank_number = 1;
 			chip->details.bank[1].chip = chip;
 			chip->details.bank[1].bank = bank;
 			break;
+
+		default:
+			LOG_ERROR("Address " TARGET_ADDR_FMT " invalid bank address (try 0x%08x or 0x%08x "
+				"[at91sam3u series] or 0x%08x [at91sam3s series] or "
+				"0x%08x [at91sam3n series] or 0x%08x or 0x%08x or 0x%08x[at91sam3ax series] )",
+				bank->base,
+				FLASH_BANK0_BASE_U,
+				FLASH_BANK1_BASE_U,
+				FLASH_BANK_BASE_S,
+				FLASH_BANK_BASE_N,
+				FLASH_BANK0_BASE_AX,
+				FLASH_BANK1_BASE_256K_AX,
+				FLASH_BANK1_BASE_512K_AX);
+			return ERROR_FAIL;
 	}
 
 	/* we initialize after probing. */
@@ -3574,22 +3574,22 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
 	}
 
 	switch (CMD_ARGC) {
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
 		case 0:
 			goto showall;
 		case 1:
 			who = -1;
 			break;
 		case 2:
-			if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0))
+			if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0)) {
 				who = -1;
-			else {
+			} else {
 				uint32_t v32;
 				COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
 				who = v32;
 			}
 			break;
+		default:
+			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	if (strcmp("show", CMD_ARGV[0]) == 0) {
diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index 26a803784d..08f1955778 100644
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -2080,9 +2080,6 @@ static void sam4_explain_ckgr_mor(struct sam4_chip *chip)
 	chip->cfg.rc_freq = 0;
 	if (rcen) {
 		switch (v) {
-			default:
-				chip->cfg.rc_freq = 0;
-				break;
 			case 0:
 				chip->cfg.rc_freq = 4 * 1000 * 1000;
 				break;
@@ -2092,6 +2089,9 @@ static void sam4_explain_ckgr_mor(struct sam4_chip *chip)
 			case 2:
 				chip->cfg.rc_freq = 12 * 1000 * 1000;
 				break;
+			default:
+				chip->cfg.rc_freq = 0;
+				break;
 		}
 	}
 
@@ -2504,18 +2504,11 @@ FLASH_BANK_COMMAND_HANDLER(sam4_flash_bank_command)
 	}
 
 	switch (bank->base) {
-		default:
-			LOG_ERROR("Address 0x%08x invalid bank address (try 0x%08x"
-				"[at91sam4s series] )",
-				((unsigned int)(bank->base)),
-				((unsigned int)(FLASH_BANK_BASE_S)));
-			return ERROR_FAIL;
-
 		/* at91sam4s series only has bank 0*/
 		/* at91sam4sd series has the same address for bank 0 (FLASH_BANK0_BASE_SD)*/
 		case FLASH_BANK_BASE_S:
 		case FLASH_BANK_BASE_C:
-			bank->driver_priv = &(chip->details.bank[0]);
+			bank->driver_priv = &chip->details.bank[0];
 			bank->bank_number = 0;
 			chip->details.bank[0].chip = chip;
 			chip->details.bank[0].bank = bank;
@@ -2525,11 +2518,18 @@ FLASH_BANK_COMMAND_HANDLER(sam4_flash_bank_command)
 		case FLASH_BANK1_BASE_1024K_SD:
 		case FLASH_BANK1_BASE_2048K_SD:
 		case FLASH_BANK1_BASE_C32:
-			bank->driver_priv = &(chip->details.bank[1]);
+			bank->driver_priv = &chip->details.bank[1];
 			bank->bank_number = 1;
 			chip->details.bank[1].chip = chip;
 			chip->details.bank[1].bank = bank;
 			break;
+
+		default:
+			LOG_ERROR("Address " TARGET_ADDR_FMT " invalid bank address (try 0x%08x"
+				"[at91sam4s series] )",
+				bank->base,
+				FLASH_BANK_BASE_S);
+			return ERROR_FAIL;
 	}
 
 	/* we initialize after probing. */
@@ -3122,22 +3122,22 @@ COMMAND_HANDLER(sam4_handle_gpnvm_command)
 	}
 
 	switch (CMD_ARGC) {
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
 		case 0:
 			goto showall;
 		case 1:
 			who = -1;
 			break;
 		case 2:
-			if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0))
+			if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0)) {
 				who = -1;
-			else {
+			} else {
 				uint32_t v32;
 				COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
 				who = v32;
 			}
 			break;
+		default:
+			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	if (strcmp("show", CMD_ARGV[0]) == 0) {
diff --git a/src/flash/nor/at91sam7.c b/src/flash/nor/at91sam7.c
index 86c80765fc..d06c9451ce 100644
--- a/src/flash/nor/at91sam7.c
+++ b/src/flash/nor/at91sam7.c
@@ -199,8 +199,7 @@ static void at91sam7_read_clock_info(struct flash_bank *bank)
 			break;
 
 		case 1:			/* Main Clock */
-			if ((mcfr & CKGR_MCFR_MAINRDY) &&
-			(at91sam7_info->ext_freq == 0)) {
+			if ((mcfr & CKGR_MCFR_MAINRDY) && at91sam7_info->ext_freq == 0) {
 				at91sam7_info->mck_valid = 1;
 				tmp = RC_FREQ / 16ul * (mcfr & 0xffff);
 			} else if (at91sam7_info->ext_freq != 0) {
@@ -213,8 +212,7 @@ static void at91sam7_read_clock_info(struct flash_bank *bank)
 			break;
 
 		case 3:			/* PLL Clock */
-			if ((mcfr & CKGR_MCFR_MAINRDY) &&
-			(at91sam7_info->ext_freq == 0)) {
+			if ((mcfr & CKGR_MCFR_MAINRDY) && at91sam7_info->ext_freq == 0) {
 				target_read_u32(target, CKGR_PLLR, &pllr);
 				if (!(pllr & CKGR_PLLR_DIV))
 					break;	/* 0 Hz */
@@ -224,8 +222,7 @@ static void at91sam7_read_clock_info(struct flash_bank *bank)
 				 * as long as PLL is properly configured. */
 				tmp = mainfreq / (pllr & CKGR_PLLR_DIV)*
 						(((pllr & CKGR_PLLR_MUL) >> 16) + 1);
-			} else if ((at91sam7_info->ext_freq != 0) &&
-					((pllr&CKGR_PLLR_DIV) != 0)) {
+			} else if ((at91sam7_info->ext_freq != 0) && ((pllr & CKGR_PLLR_DIV) != 0)) {
 				at91sam7_info->mck_valid = 1;
 				tmp = at91sam7_info->ext_freq / (pllr&CKGR_PLLR_DIV)*
 						(((pllr & CKGR_PLLR_MUL) >> 16) + 1);
diff --git a/src/flash/nor/atsamv.c b/src/flash/nor/atsamv.c
index d6d8938b67..85a4384200 100644
--- a/src/flash/nor/atsamv.c
+++ b/src/flash/nor/atsamv.c
@@ -606,9 +606,9 @@ COMMAND_HANDLER(samv_handle_gpnvm_command)
 			who = -1;
 			break;
 		case 2:
-			if (!strcmp(CMD_ARGV[0], "show") && !strcmp(CMD_ARGV[1], "all"))
+			if (!strcmp(CMD_ARGV[0], "show") && !strcmp(CMD_ARGV[1], "all")) {
 				who = -1;
-			else {
+			} else {
 				uint32_t v32;
 				COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
 				who = v32;

-- 

[PATCH]: 8d94945b93 helper: align switch and case statements

[<ge...@op...>]

This is an automated email from Gerrit.

"Antonio Borneo <bor...@gm...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9010

-- gerrit

commit 8d94945b9388a8edb3e82b989dd9ef77eb4f5fb7
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 28 14:27:15 2025 +0200

    helper: align switch and case statements
    
    The coding style requires the 'case' to be at the same indentation
    level of its 'switch' statement.
    
    Align the code accordingly.
    
    No changes are reported by
            git log -p -w --ignore-blank-lines --patience
    
    Change-Id: Iea3b60b3f01afbe31c495e8ea4ddc2b4c8efa936
    Signed-off-by: Antonio Borneo <bor...@gm...>

diff --git a/src/helper/command.c b/src/helper/command.c
index b70081a4dd..d683e715a9 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -405,16 +405,16 @@ static bool command_can_run(struct command_context *cmd_ctx, struct command *c,
 	/* Many commands may be run only before/after 'init' */
 	const char *when;
 	switch (c->mode) {
-		case COMMAND_CONFIG:
-			when = "before";
-			break;
-		case COMMAND_EXEC:
-			when = "after";
-			break;
-		/* handle the impossible with humor; it guarantees a bug report! */
-		default:
-			when = "if Cthulhu is summoned by";
-			break;
+	case COMMAND_CONFIG:
+		when = "before";
+		break;
+	case COMMAND_EXEC:
+		when = "after";
+		break;
+	/* handle the impossible with humor; it guarantees a bug report! */
+	default:
+		when = "if Cthulhu is summoned by";
+		break;
 	}
 	LOG_ERROR("The '%s' command must be used %s 'init'.",
 			full_name ? full_name : c->name, when);
@@ -738,16 +738,16 @@ static COMMAND_HELPER(command_help_show, struct help_entry *c,
 			const char *stage_msg = "";
 
 			switch (mode) {
-				case COMMAND_CONFIG:
-					stage_msg = " (configuration command)";
-					break;
-				case COMMAND_ANY:
-					stage_msg = " (command valid any time)";
-					break;
-				case COMMAND_UNKNOWN:
-				default:
-					stage_msg = " (?mode error?)";
-					break;
+			case COMMAND_CONFIG:
+				stage_msg = " (configuration command)";
+				break;
+			case COMMAND_ANY:
+				stage_msg = " (command valid any time)";
+				break;
+			case COMMAND_UNKNOWN:
+			default:
+				stage_msg = " (?mode error?)";
+				break;
 			}
 			msg = alloc_printf("%s%s", c->help ? c->help : "", stage_msg);
 		} else
@@ -908,19 +908,19 @@ COMMAND_HANDLER(handle_command_mode)
 
 	const char *mode_str;
 	switch (mode) {
-		case COMMAND_ANY:
-			mode_str = "any";
-			break;
-		case COMMAND_CONFIG:
-			mode_str = "config";
-			break;
-		case COMMAND_EXEC:
-			mode_str = "exec";
-			break;
-		case COMMAND_UNKNOWN:
-		default:
-			mode_str = "unknown";
-			break;
+	case COMMAND_ANY:
+		mode_str = "any";
+		break;
+	case COMMAND_CONFIG:
+		mode_str = "config";
+		break;
+	case COMMAND_EXEC:
+		mode_str = "exec";
+		break;
+	case COMMAND_UNKNOWN:
+	default:
+		mode_str = "unknown";
+		break;
 	}
 	command_print(CMD, "%s", mode_str);
 	return ERROR_OK;
@@ -1325,19 +1325,19 @@ COMMAND_HELPER(command_parse_str_to_buf, const char *str, void *buf, unsigned in
 COMMAND_HELPER(handle_command_parse_bool, bool *out, const char *label)
 {
 	switch (CMD_ARGC) {
-		case 1: {
-			const char *in = CMD_ARGV[0];
-			if (command_parse_bool_arg(in, out) != ERROR_OK) {
-				LOG_ERROR("%s: argument '%s' is not valid", CMD_NAME, in);
-				return ERROR_COMMAND_SYNTAX_ERROR;
-			}
-		}
-			/* fallthrough */
-		case 0:
-			LOG_INFO("%s is %s", label, *out ? "enabled" : "disabled");
-			break;
-		default:
+	case 1: {
+		const char *in = CMD_ARGV[0];
+		if (command_parse_bool_arg(in, out) != ERROR_OK) {
+			LOG_ERROR("%s: argument '%s' is not valid", CMD_NAME, in);
 			return ERROR_COMMAND_SYNTAX_ERROR;
+		}
+	}
+		/* fallthrough */
+	case 0:
+		LOG_INFO("%s is %s", label, *out ? "enabled" : "disabled");
+		break;
+	default:
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 	return ERROR_OK;
 }
diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index a290a5d2ff..1059c67060 100644
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -49,24 +49,24 @@ static inline int fileio_open_local(struct fileio *fileio)
 	ssize_t file_size;
 
 	switch (fileio->access) {
-		case FILEIO_READ:
-			strcpy(file_access, "r");
-			break;
-		case FILEIO_WRITE:
-			strcpy(file_access, "w");
-			break;
-		case FILEIO_READWRITE:
-			strcpy(file_access, "w+");
-			break;
-		case FILEIO_APPEND:
-			strcpy(file_access, "a");
-			break;
-		case FILEIO_APPENDREAD:
-			strcpy(file_access, "a+");
-			break;
-		default:
-			LOG_ERROR("BUG: access neither read, write nor readwrite");
-			return ERROR_COMMAND_SYNTAX_ERROR;
+	case FILEIO_READ:
+		strcpy(file_access, "r");
+		break;
+	case FILEIO_WRITE:
+		strcpy(file_access, "w");
+		break;
+	case FILEIO_READWRITE:
+		strcpy(file_access, "w+");
+		break;
+	case FILEIO_APPEND:
+		strcpy(file_access, "a");
+		break;
+	case FILEIO_APPENDREAD:
+		strcpy(file_access, "a+");
+		break;
+	default:
+		LOG_ERROR("BUG: access neither read, write nor readwrite");
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	/* win32 always opens in binary mode */
diff --git a/src/helper/options.c b/src/helper/options.c
index 735b8af5f6..28e2221717 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -277,44 +277,44 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
 			break;
 
 		switch (c) {
-			case 0:
-				break;
-			case 'h':		/* --help | -h */
-				help_flag = 1;
-				break;
-			case 'v':		/* --version | -v */
-				version_flag = 1;
-				break;
-			case 'f':		/* --file | -f */
-			{
-				char *command = alloc_printf("script {%s}", optarg);
-				add_config_command(command);
-				free(command);
-				break;
-			}
-			case 's':		/* --search | -s */
-				add_script_search_dir(optarg);
-				break;
-			case 'd':		/* --debug | -d */
-			{
-				int retval = command_run_linef(cmd_ctx, "debug_level %s", optarg ? optarg : "3");
-				if (retval != ERROR_OK)
-					return retval;
-				break;
-			}
-			case 'l':		/* --log_output | -l */
-			{
-				int retval = command_run_linef(cmd_ctx, "log_output %s", optarg);
-				if (retval != ERROR_OK)
-					return retval;
-				break;
-			}
-			case 'c':		/* --command | -c */
-				add_config_command(optarg);
-				break;
-			default:  /* '?' */
-				/* getopt will emit an error message, all we have to do is bail. */
-				return ERROR_FAIL;
+		case 0:
+			break;
+		case 'h':		/* --help | -h */
+			help_flag = 1;
+			break;
+		case 'v':		/* --version | -v */
+			version_flag = 1;
+			break;
+		case 'f':		/* --file | -f */
+		{
+			char *command = alloc_printf("script {%s}", optarg);
+			add_config_command(command);
+			free(command);
+			break;
+		}
+		case 's':		/* --search | -s */
+			add_script_search_dir(optarg);
+			break;
+		case 'd':		/* --debug | -d */
+		{
+			int retval = command_run_linef(cmd_ctx, "debug_level %s", optarg ? optarg : "3");
+			if (retval != ERROR_OK)
+				return retval;
+			break;
+		}
+		case 'l':		/* --log_output | -l */
+		{
+			int retval = command_run_linef(cmd_ctx, "log_output %s", optarg);
+			if (retval != ERROR_OK)
+				return retval;
+			break;
+		}
+		case 'c':		/* --command | -c */
+			add_config_command(optarg);
+			break;
+		default:  /* '?' */
+			/* getopt will emit an error message, all we have to do is bail. */
+			return ERROR_FAIL;
 		}
 	}
 

-- 

[openocd:tickets] #439 OpenOCD failed with code (-1073741819)

[Jindrich F. <fu...@us...>]

Finally get it solved!
The problem is missing driver for WCH-Link SERIAL.
Default CDC driver from windows is not correct one. Additional driver from WCH is necessary in my case:
https://pio-ch32v.readthedocs.io/en/latest/installation.html#install-drivers-rules



---

**[tickets:#439] OpenOCD failed with code (-1073741819)**

**Status:** new
**Milestone:** 0.10.0
**Labels:** OpenOCD 
**Created:** Fri Oct 11, 2024 02:23 PM UTC by Alex
**Last Updated:** Fri Jul 25, 2025 03:28 PM UTC
**Owner:** nobody
**Attachments:**

- [image_2024_10_11T13_44_15_984Z.png](https://sourceforge.net/p/openocd/tickets/439/attachment/image_2024_10_11T13_44_15_984Z.png) (44.5 kB; image/png)


Trying to use Microchip SoftConsole 2022 on PolarFire SoC Icicle Kit to debug example application, but OpenOCD failing with message:  **OpenOCD failed with code (-1073741819).** We tried to Google but nothing comes up.  Could you tell us what that error code means?
It is a new DELL laptop running Windows 11. We use SoftConsole on other 4 PCs and no problems. The interesting part that OpenOCD detects two Embedded FlashPro6 as shown on attached image and we did not see that before.
Thank you


---

Sent from sourceforge.net because ope...@li... is subscribed to https://sourceforge.net/p/openocd/tickets/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/openocd/admin/tickets/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.

[openocd:tickets] Re: #439 OpenOCD failed with code (-1073741819)

[Tommy M. <tm...@us...>]

Yes - SDI is a WCH (proprietary?) 2-wire debug interface so presumably this OpenOCD (which is also old) is a custom/modified version from WCH or somebody else doing work with WCH RISC-V MCUs and questions about it should be directed to them. Not really sure why this was posted in an issue thread originally about Microchip SoftConsole OpenOCD? Seems completely off topic?


---

**[tickets:#439] OpenOCD failed with code (-1073741819)**

**Status:** new
**Milestone:** 0.10.0
**Labels:** OpenOCD 
**Created:** Fri Oct 11, 2024 02:23 PM UTC by Alex
**Last Updated:** Fri Jul 25, 2025 02:55 PM UTC
**Owner:** nobody
**Attachments:**

- [image_2024_10_11T13_44_15_984Z.png](https://sourceforge.net/p/openocd/tickets/439/attachment/image_2024_10_11T13_44_15_984Z.png) (44.5 kB; image/png)


Trying to use Microchip SoftConsole 2022 on PolarFire SoC Icicle Kit to debug example application, but OpenOCD failing with message:  **OpenOCD failed with code (-1073741819).** We tried to Google but nothing comes up.  Could you tell us what that error code means?
It is a new DELL laptop running Windows 11. We use SoftConsole on other 4 PCs and no problems. The interesting part that OpenOCD detects two Embedded FlashPro6 as shown on attached image and we did not see that before.
Thank you


---

Sent from sourceforge.net because ope...@li... is subscribed to https://sourceforge.net/p/openocd/tickets/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/openocd/admin/tickets/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.

[openocd:tickets] Re: #439 OpenOCD failed with code (-1073741819)

[Paul F. <da...@us...>]

Looks totally unrelated to me. You're using debug adapter which is not supported in upstream OpenOCD at all and it's unclear what "sdi" transport is. I suggest you ask whomever provides that "Open On-Chip Debugger 0.11.0+dev-02415-gfad123a16-dirty (2023-05-05-13:43)" fork (WCH?), I doubt anyone here in upstream has any idea about it.


---

**[tickets:#439] OpenOCD failed with code (-1073741819)**

**Status:** new
**Milestone:** 0.10.0
**Labels:** OpenOCD 
**Created:** Fri Oct 11, 2024 02:23 PM UTC by Alex
**Last Updated:** Fri Jul 25, 2025 01:13 PM UTC
**Owner:** nobody
**Attachments:**

- [image_2024_10_11T13_44_15_984Z.png](https://sourceforge.net/p/openocd/tickets/439/attachment/image_2024_10_11T13_44_15_984Z.png) (44.5 kB; image/png)


Trying to use Microchip SoftConsole 2022 on PolarFire SoC Icicle Kit to debug example application, but OpenOCD failing with message:  **OpenOCD failed with code (-1073741819).** We tried to Google but nothing comes up.  Could you tell us what that error code means?
It is a new DELL laptop running Windows 11. We use SoftConsole on other 4 PCs and no problems. The interesting part that OpenOCD detects two Embedded FlashPro6 as shown on attached image and we did not see that before.
Thank you


---

Sent from sourceforge.net because ope...@li... is subscribed to https://sourceforge.net/p/openocd/tickets/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/openocd/admin/tickets/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.

[openocd:tickets] #439 OpenOCD failed with code (-1073741819)

[Jindrich F. <fu...@us...>]

Hi,

I have same issue with "Arduino" one.

This is, how arduino see the problem:
~~~
"C:\Users\Jindra\AppData\Local\Arduino15\packages\WCH\tools\openocd\1.0.0/bin/openocd" -f "C:\Users\Jindra\AppData\Local\Arduino15\packages\WCH\tools\openocd\1.0.0/bin/wch-riscv.cfg" -c init -c halt -c "program {C:\Users\Jindra\AppData\Local\arduino\sketches\082CA6E126A46280AC42B2C347267422/CH32_blink.ino.elf} verify; wlink_reset_resume; exit;"
Open On-Chip Debugger 0.11.0+dev-02415-gfad123a16-dirty (2023-05-05-13:43)
Licensed under GNU GPL v2
For bug reports, read
	http://openocd.org/doc/doxygen/bugs.html
Info : only one transport option; autoselect 'sdi'
Warn : Transport "sdi" was already selected
Ready for Remote Connections
Failed uploading: uploading error: exit status 0xc0000005
~~~

I can try to run manually, with -d3 option, but no better result:
~~~
C:\Users\Jindra\AppData\Local\Arduino15\packages\WCH\tools\openocd\1.0.0\bin>"C:\Users\Jindra\AppData\Local\Arduino15\packages\WCH\tools\openocd\1.0.0/bin/openocd" -d3 -f "C:\Users\Jindra\AppData\Local\Arduino15\packages\WCH\tools\openocd\1.0.0/bin/wch-riscv.cfg" -c init -c halt -c "program {C:\Users\Jindra\AppData\Local\arduino\sketches\082CA6E126A46280AC42B2C347267422/CH32_blink.ino.elf} verify; wlink_reset_resume; exit;"
Open On-Chip Debugger 0.11.0+dev-02415-gfad123a16-dirty (2023-05-05-13:43)
Licensed under GNU GPL v2
For bug reports, read
        http://openocd.org/doc/doxygen/bugs.html
User : 3 19 options.c:63 configuration_output_handler(): debug_level: 3
User : 4 30 options.c:63 configuration_output_handler():
Debug: 5 40 options.c:244 add_default_dirs(): bindir=/home/yy/riscv-openocdnew/opout/bin
Debug: 6 40 options.c:245 add_default_dirs(): pkgdatadir=/home/yy/riscv-openocdnew/opout/share/openocd
Debug: 7 40 options.c:246 add_default_dirs(): exepath=C:/Users/Jindra/AppData/Local/Arduino15/packages/WCH/tools/openocd/1.0.0/bin
Debug: 8 50 options.c:247 add_default_dirs(): bin2data=../share/openocd
Debug: 9 50 configuration.c:44 add_script_search_dir(): adding C:/Users/Jindra/AppData/Roaming/OpenOCD
Debug: 10 61 configuration.c:44 add_script_search_dir(): adding C:/Users/Jindra/AppData/Local/Arduino15/packages/WCH/tools/openocd/1.0.0/bin/../share/openocd/site
Debug: 11 70 configuration.c:44 add_script_search_dir(): adding C:/Users/Jindra/AppData/Local/Arduino15/packages/WCH/tools/openocd/1.0.0/bin/../share/openocd/scripts
Debug: 12 70 command.c:166 script_debug(): command - ocd_find C:\Users\Jindra\AppData\Local\Arduino15\packages\WCH\tools\openocd\1.0.0/bin/wch-riscv.cfg
Debug: 13 80 configuration.c:99 find_file(): found C:\Users\Jindra\AppData\Local\Arduino15\packages\WCH\tools\openocd\1.0.0/bin/wch-riscv.cfg
Debug: 14 90 command.c:166 script_debug(): command - adapter driver wlinke
Info : 15 90 transport.c:118 allow_transports(): only one transport option; autoselect 'sdi'
Debug: 16 100 sdi.c:94 sdi_transport_select(): sdi_transport_select
Debug: 17 100 command.c:166 script_debug(): command - adapter speed 6000
Debug: 18 110 adapter.c:176 adapter_config_khz(): handle adapter khz
Debug: 19 110 adapter.c:140 adapter_khz_to_speed(): convert khz to adapter specific speed value
Debug: 20 110 adapter.c:140 adapter_khz_to_speed(): convert khz to adapter specific speed value
Debug: 21 120 command.c:166 script_debug(): command - transport select sdi
Warn : 22 120 transport.c:287 jim_transport_select(): Transport "sdi" was already selected
Debug: 23 120 command.c:166 script_debug(): command - wlink_set_address 0x00000000
Debug: 24 130 command.c:166 script_debug(): command - sdi newtap wch_riscv cpu -irlen 5 -expected-id 0x00001
Debug: 25 130 sdi.c:59 handle_sdi_newtap_command(): Creating new sdi "tap", Chip: wch_riscv, Tap: cpu, Dotted: wch_riscv.cpu
Debug: 26 140 core.c:1468 jtag_tap_init(): Created Tap: wch_riscv.cpu @ abs position 0, irlen 0, capture: 0x0 mask: 0x0
Debug: 27 140 command.c:166 script_debug(): command - target create wch_riscv.cpu.0 wch_riscv -chain-position wch_riscv.cpu
Debug: 28 150 target.c:2214 target_free_all_working_areas_restore(): freeing all working areas
Debug: 29 161 wch_riscv.c:71 wch_riscv_create_target(): wch_riscv_create_target()
Debug: 30 161 command.c:166 script_debug(): command - wch_riscv.cpu.0 configure -work-area-phys 0x20000000 -work-area-size 10000 -work-area-backup 1
Debug: 31 171 target.c:2214 target_free_all_working_areas_restore(): freeing all working areas
Debug: 32 171 target.c:2214 target_free_all_working_areas_restore(): freeing all working areas
Debug: 33 171 target.c:2214 target_free_all_working_areas_restore(): freeing all working areas
Debug: 34 181 command.c:166 script_debug(): command - flash bank wch_riscv.flash wch_riscv 0x00000000 0 0 0 wch_riscv.cpu.0
Debug: 35 191 tcl.c:1354 handle_flash_bank_command(): 'wch_riscv' driver usage field missing
Debug: 36 191 command.c:166 script_debug(): command - echo Ready for Remote Connections
User : 37 201 command.c:697 handle_echo(): Ready for Remote Connections
Debug: 38 201 command.c:166 script_debug(): command - init
Debug: 39 201 command.c:166 script_debug(): command - target init
Debug: 40 211 command.c:166 script_debug(): command - target names
Debug: 41 211 command.c:166 script_debug(): command - wch_riscv.cpu.0 cget -event gdb-flash-erase-start
Debug: 42 211 command.c:166 script_debug(): command - wch_riscv.cpu.0 configure -event gdb-flash-erase-start reset init
Debug: 43 221 command.c:166 script_debug(): command - wch_riscv.cpu.0 cget -event gdb-flash-write-end
Debug: 44 221 command.c:166 script_debug(): command - wch_riscv.cpu.0 configure -event gdb-flash-write-end reset halt
Debug: 45 231 command.c:166 script_debug(): command - wch_riscv.cpu.0 cget -event gdb-attach
Debug: 46 231 command.c:166 script_debug(): command - wch_riscv.cpu.0 configure -event gdb-attach halt 1000
Debug: 47 241 target.c:1671 handle_target_init_command(): Initializing targets...
Debug: 48 241 wch_riscv.c:84 wch_riscv_init_target(): wch_riscv_init_target()

C:\Users\Jindra\AppData\Local\Arduino15\packages\WCH\tools\openocd\1.0.0\bin>echo %errorlevel%
-1073741819
~~~



---

**[tickets:#439] OpenOCD failed with code (-1073741819)**

**Status:** new
**Milestone:** 0.10.0
**Labels:** OpenOCD 
**Created:** Fri Oct 11, 2024 02:23 PM UTC by Alex
**Last Updated:** Fri Jul 25, 2025 01:13 PM UTC
**Owner:** nobody
**Attachments:**

- [image_2024_10_11T13_44_15_984Z.png](https://sourceforge.net/p/openocd/tickets/439/attachment/image_2024_10_11T13_44_15_984Z.png) (44.5 kB; image/png)


Trying to use Microchip SoftConsole 2022 on PolarFire SoC Icicle Kit to debug example application, but OpenOCD failing with message:  **OpenOCD failed with code (-1073741819).** We tried to Google but nothing comes up.  Could you tell us what that error code means?
It is a new DELL laptop running Windows 11. We use SoftConsole on other 4 PCs and no problems. The interesting part that OpenOCD detects two Embedded FlashPro6 as shown on attached image and we did not see that before.
Thank you


---

Sent from sourceforge.net because ope...@li... is subscribed to https://sourceforge.net/p/openocd/tickets/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/openocd/admin/tickets/options.  Or, if this is a mailing list, you can unsubscribe from the mailing list.

[PATCH]: e2100e1a0b flash/stm32h7x: use BIT macro whenever possible

[<ge...@op...>]

This is an automated email from Gerrit.

"Ahmed Haoues <ahm...@st...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9012

-- gerrit

commit e2100e1a0b8049dd7daa20e851f8f32e3c8d922e
Author: HAOUES Ahmed <ahm...@st...>
Date:   Thu Jul 3 17:38:20 2025 +0100

    flash/stm32h7x: use BIT macro whenever possible
    
    
    Change-Id: Iad66e12354fc3c76c718a793eb6689258d497b00
    Signed-off-by: HAOUES Ahmed <ahm...@st...>

diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index 362b2c2d52..642adf110b 100644
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -55,45 +55,45 @@ static const uint32_t stm32h7_flash_regs[STM32_FLASH_REG_INDEX_NUM] = {
 };
 
 /* FLASH_CR register bits */
-#define FLASH_LOCK     (1 << 0)
-#define FLASH_PG       (1 << 1)
-#define FLASH_SER      (1 << 2)
-#define FLASH_BER      (1 << 3)
+#define FLASH_LOCK     BIT(0)
+#define FLASH_PG       BIT(1)
+#define FLASH_SER      BIT(2)
+#define FLASH_BER      BIT(3)
 #define FLASH_PSIZE_8  (0 << 4)
 #define FLASH_PSIZE_16 (1 << 4)
 #define FLASH_PSIZE_32 (2 << 4)
 #define FLASH_PSIZE_64 (3 << 4)
-#define FLASH_FW       (1 << 6)
-#define FLASH_START    (1 << 7)
+#define FLASH_FW       BIT(6)
+#define FLASH_START    BIT(7)
 
 /* FLASH_SR register bits */
-#define FLASH_BSY      (1 << 0)  /* Operation in progress */
-#define FLASH_QW       (1 << 2)  /* Operation queue in progress */
-#define FLASH_WRPERR   (1 << 17) /* Write protection error */
-#define FLASH_PGSERR   (1 << 18) /* Programming sequence error */
-#define FLASH_STRBERR  (1 << 19) /* Strobe error */
-#define FLASH_INCERR   (1 << 21) /* Inconsistency error */
-#define FLASH_OPERR    (1 << 22) /* Operation error */
-#define FLASH_RDPERR   (1 << 23) /* Read Protection error */
-#define FLASH_RDSERR   (1 << 24) /* Secure Protection error */
-#define FLASH_SNECCERR (1 << 25) /* Single ECC error */
-#define FLASH_DBECCERR (1 << 26) /* Double ECC error */
+#define FLASH_BSY      BIT(0)  /* Operation in progress */
+#define FLASH_QW       BIT(2)  /* Operation queue in progress */
+#define FLASH_WRPERR   BIT(17) /* Write protection error */
+#define FLASH_PGSERR   BIT(18) /* Programming sequence error */
+#define FLASH_STRBERR  BIT(19) /* Strobe error */
+#define FLASH_INCERR   BIT(21) /* Inconsistency error */
+#define FLASH_OPERR    BIT(22) /* Operation error */
+#define FLASH_RDPERR   BIT(23) /* Read Protection error */
+#define FLASH_RDSERR   BIT(24) /* Secure Protection error */
+#define FLASH_SNECCERR BIT(25) /* Single ECC error */
+#define FLASH_DBECCERR BIT(26) /* Double ECC error */
 
 #define FLASH_ERROR (FLASH_WRPERR | FLASH_PGSERR | FLASH_STRBERR | FLASH_INCERR | FLASH_OPERR | \
 					 FLASH_RDPERR | FLASH_RDSERR | FLASH_SNECCERR | FLASH_DBECCERR)
 
 /* FLASH_OPTCR register bits */
-#define OPT_LOCK       (1 << 0)
-#define OPT_START      (1 << 1)
+#define OPT_LOCK       BIT(0)
+#define OPT_START      BIT(1)
 
 /* FLASH_OPTSR register bits */
-#define OPT_BSY        (1 << 0)
+#define OPT_BSY        BIT(0)
 #define OPT_RDP_POS    8
 #define OPT_RDP_MASK   (0xff << OPT_RDP_POS)
-#define OPT_OPTCHANGEERR (1 << 30)
+#define OPT_OPTCHANGEERR BIT(30)
 
 /* FLASH_OPTCCR register bits */
-#define OPT_CLR_OPTCHANGEERR (1 << 30)
+#define OPT_CLR_OPTCHANGEERR BIT(30)
 
 /* register unlock keys */
 #define KEY1           0x45670123

-- 

[PATCH]: d05c02630b JESD Bank 17 Manufacturer Detection Issue: Fixed the core.c expression to handle one more bit

[<ge...@op...>]

This is an automated email from Gerrit.

"Name of user not set <it...@ve...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/8891

-- gerrit

commit d05c02630b75b8200a79636c5989dc7229063a95
Author: vs32support <it...@ve...>
Date:   Mon Jul 21 22:14:02 2025 +0530

    JESD Bank 17 Manufacturer Detection Issue:
    Fixed the core.c expression to handle one more bit
    
    Change-Id: Id4c71433f09ddb7b62e1fd56768e8a43a803b99d
    Signed-off-by: vs32support <it...@ve...>

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 6dd2144c63..a89116c7cc 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -1082,7 +1082,7 @@ void jtag_sleep(uint32_t us)
 
 #define JTAG_MAX_AUTO_TAPS 20
 
-#define EXTRACT_MFG(X)  (((X) & 0xffe) >> 1)
+#define EXTRACT_MFG(X)  (((X) & 0xfffe) >> 1)
 #define EXTRACT_PART(X) (((X) & 0xffff000) >> 12)
 #define EXTRACT_VER(X)  (((X) & 0xf0000000) >> 28)
 

-- 

[PATCH]: d48698a102 helper: Add string_choices.h

[<ge...@op...>]

This is an automated email from Gerrit.

"zapb <de...@za...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9006

-- gerrit

commit d48698a1028b2d554f5439b94f244a7d6b6fa381
Author: Marc Schink <de...@za...>
Date:   Sun Jul 20 11:12:57 2025 +0000

    helper: Add string_choices.h
    
    Add the helper function str_enabled_disabled() to select between the two
    strings 'enabled' and 'disabled' depending on a boolean value.
    
    Additional functions for frequently used strings can be added in the future
    if required.
    
    Change-Id: I2d8ae96b141f87966836e6e4c3a2ed6d12b71fa5
    Signed-off-by: Marc Schink <de...@za...>

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 8072124784..1a61f78719 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -32,6 +32,7 @@ noinst_LTLIBRARIES += %D%/libhelper.la
 	%D%/crc32.h \
 	%D%/time_support.h \
 	%D%/replacements.h \
+	%D%/string_choices.h \
 	%D%/fileio.h \
 	%D%/system.h \
 	%D%/jep106.h \
diff --git a/src/helper/string_choices.h b/src/helper/string_choices.h
new file mode 100644
index 0000000000..6ff5df3766
--- /dev/null
+++ b/src/helper/string_choices.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef OPENOCD_HELPER_STRING_CHOICES_H
+#define OPENOCD_HELPER_STRING_CHOICES_H
+
+/*
+ * This file contains helper functions that return one of two strings depending
+ * on a boolean value. The format of these functions is 'str_$true_$false' where
+ * $true and $false are the two corresponding strings.
+ *
+ * These helper functions are beneficial because they improve code consistency
+ * and reduce the number of hardcoded strings.
+ */
+
+static inline const char *str_enabled_disabled(bool value)
+{
+	return value ? "enabled" : "disabled";
+}
+
+#endif /* OPENOCD_HELPER_STRING_CHOICES_H */

-- 

[PATCH]: d9a192f4e3 target: Make use of str_enabled_disabled()

[<ge...@op...>]

This is an automated email from Gerrit.

"zapb <de...@za...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9007

-- gerrit

commit d9a192f4e37ea32923a4687b9514dca775292a19
Author: Marc Schink <de...@za...>
Date:   Sun Jul 20 11:33:38 2025 +0000

    target: Make use of str_enabled_disabled()
    
    The data type changes introduced in [1,2] lead to implicit casts from a
    boolean to an integer value in the string selection between "enabled" and
    "disabled".
    
    Use str_enabled_disabled() to get rid of this implicit cast.
    
    [1] https://review.openocd.org/c/openocd/+/8988
    [2] https://review.openocd.org/c/openocd/+/8992
    
    Change-Id: Ia98abdd43b42f394f5bf0aa845017dfbb0e087fd
    Signed-off-by: Marc Schink <de...@za...>

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 933b49bebc..702d6cfb10 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -14,6 +14,7 @@
 
 #include "arm720t.h"
 #include <helper/time_support.h>
+#include <helper/string_choices.h>
 #include "target_type.h"
 #include "register.h"
 #include "arm_opcodes.h"
@@ -227,14 +228,10 @@ static int arm720t_arch_state(struct target *target)
 {
 	struct arm720t_common *arm720t = target_to_arm720(target);
 
-	static const char *state[] = {
-		"disabled", "enabled"
-	};
-
 	arm_arch_state(target);
 	LOG_USER("MMU: %s, Cache: %s",
-			 state[arm720t->armv4_5_mmu.mmu_enabled],
-			 state[arm720t->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled]);
+			 str_enabled_disabled(arm720t->armv4_5_mmu.mmu_enabled),
+			 str_enabled_disabled(arm720t->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled));
 
 	return ERROR_OK;
 }
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 4dd5763539..67c212e0bf 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -12,6 +12,7 @@
 
 #include "arm920t.h"
 #include <helper/time_support.h>
+#include <helper/string_choices.h>
 #include "target_type.h"
 #include "register.h"
 #include "arm_opcodes.h"
@@ -509,10 +510,6 @@ static int arm920t_verify_pointer(struct command_invocation *cmd,
 /** Logs summary of ARM920 state for a halted target. */
 int arm920t_arch_state(struct target *target)
 {
-	static const char *state[] = {
-		"disabled", "enabled"
-	};
-
 	struct arm920t_common *arm920t = target_to_arm920(target);
 
 	if (arm920t->common_magic != ARM920T_COMMON_MAGIC) {
@@ -522,9 +519,9 @@ int arm920t_arch_state(struct target *target)
 
 	arm_arch_state(target);
 	LOG_USER("MMU: %s, D-Cache: %s, I-Cache: %s",
-		state[arm920t->armv4_5_mmu.mmu_enabled],
-		state[arm920t->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled],
-		state[arm920t->armv4_5_mmu.armv4_5_cache.i_cache_enabled]);
+		str_enabled_disabled(arm920t->armv4_5_mmu.mmu_enabled),
+		str_enabled_disabled(arm920t->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled),
+		str_enabled_disabled(arm920t->armv4_5_mmu.armv4_5_cache.i_cache_enabled));
 
 	return ERROR_OK;
 }
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 587f25061f..a3fff2ae5e 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -14,6 +14,7 @@
 
 #include "arm926ejs.h"
 #include <helper/time_support.h>
+#include <helper/string_choices.h>
 #include "target_type.h"
 #include "register.h"
 #include "arm_opcodes.h"
@@ -505,10 +506,6 @@ static int arm926ejs_verify_pointer(struct command_invocation *cmd,
 /** Logs summary of ARM926 state for a halted target. */
 int arm926ejs_arch_state(struct target *target)
 {
-	static const char *state[] = {
-		"disabled", "enabled"
-	};
-
 	struct arm926ejs_common *arm926ejs = target_to_arm926(target);
 
 	if (arm926ejs->common_magic != ARM926EJS_COMMON_MAGIC) {
@@ -518,9 +515,9 @@ int arm926ejs_arch_state(struct target *target)
 
 	arm_arch_state(target);
 	LOG_USER("MMU: %s, D-Cache: %s, I-Cache: %s",
-			 state[arm926ejs->armv4_5_mmu.mmu_enabled],
-			 state[arm926ejs->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled],
-			 state[arm926ejs->armv4_5_mmu.armv4_5_cache.i_cache_enabled]);
+			 str_enabled_disabled(arm926ejs->armv4_5_mmu.mmu_enabled),
+			 str_enabled_disabled(arm926ejs->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled),
+			 str_enabled_disabled(arm926ejs->armv4_5_mmu.armv4_5_cache.i_cache_enabled));
 
 	return ERROR_OK;
 }
diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 2bbafd420f..c5829095e5 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -18,6 +18,7 @@
 
 #include "register.h"
 #include <helper/binarybuffer.h>
+#include <helper/string_choices.h>
 #include <helper/command.h>
 
 #include <stdlib.h>
@@ -480,10 +481,6 @@ int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a)
 
 int armv7a_arch_state(struct target *target)
 {
-	static const char *state[] = {
-		"disabled", "enabled"
-	};
-
 	struct armv7a_common *armv7a = target_to_armv7a(target);
 	struct arm *arm = &armv7a->arm;
 
@@ -496,13 +493,13 @@ int armv7a_arch_state(struct target *target)
 
 	if (armv7a->is_armv7r) {
 		LOG_TARGET_USER(target, "D-Cache: %s, I-Cache: %s",
-			state[armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled],
-			state[armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled]);
+			str_enabled_disabled(armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled),
+			str_enabled_disabled(armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled));
 	} else {
 		LOG_TARGET_USER(target, "MMU: %s, D-Cache: %s, I-Cache: %s",
-			state[armv7a->armv7a_mmu.mmu_enabled],
-			state[armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled],
-			state[armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled]);
+			str_enabled_disabled(armv7a->armv7a_mmu.mmu_enabled),
+			str_enabled_disabled(armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled),
+			str_enabled_disabled(armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled));
 	}
 
 	if (arm->core_mode == ARM_MODE_ABT)
diff --git a/src/target/xscale.c b/src/target/xscale.c
index 783628b128..50e03f202e 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -22,6 +22,7 @@
 #include "arm_simulator.h"
 #include "arm_disassembler.h"
 #include <helper/time_support.h>
+#include <helper/string_choices.h>
 #include "register.h"
 #include "image.h"
 #include "arm_opcodes.h"
@@ -774,10 +775,6 @@ static int xscale_arch_state(struct target *target)
 	struct xscale_common *xscale = target_to_xscale(target);
 	struct arm *arm = &xscale->arm;
 
-	static const char *state[] = {
-		"disabled", "enabled"
-	};
-
 	static const char *arch_dbg_reason[] = {
 		"", "\n(processor reset)", "\n(trace buffer full)"
 	};
@@ -789,9 +786,9 @@ static int xscale_arch_state(struct target *target)
 
 	arm_arch_state(target);
 	LOG_USER("MMU: %s, D-Cache: %s, I-Cache: %s%s",
-		state[xscale->armv4_5_mmu.mmu_enabled],
-		state[xscale->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled],
-		state[xscale->armv4_5_mmu.armv4_5_cache.i_cache_enabled],
+		str_enabled_disabled(xscale->armv4_5_mmu.mmu_enabled),
+		str_enabled_disabled(xscale->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled),
+		str_enabled_disabled(xscale->armv4_5_mmu.armv4_5_cache.i_cache_enabled),
 		arch_dbg_reason[xscale->arch_debug_reason]);
 
 	return ERROR_OK;

--