[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1511-g726b0c592

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  726b0c592884566a7580780418ba763ffc51c745 (commit)
      from  3d736e0488bc498358e3d49d7ce728b17955c8fe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 726b0c592884566a7580780418ba763ffc51c745
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Sun Mar 22 19:36:12 2020 +0100

    stm32l4x: cosmetic simplification of get_stm32l4_info
    
    Change-Id: I2542f946f64388d908b1502f869643080fce9f9e
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5536
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Andreas Bolsch <hyp...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 2bf291368..55a8d8ff3 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -1218,19 +1218,17 @@ static int get_stm32l4_info(struct flash_bank *bank, char *buf, int buf_size)
 		for (unsigned int i = 0; i < part_info->num_revs; i++) {
 			if (rev_id == part_info->revs[i].rev) {
 				rev_str = part_info->revs[i].str;
-
-				if (rev_str != NULL) {
-					snprintf(buf, buf_size, "%s - Rev: %s%s",
-						part_info->device_str, rev_str, stm32l4_info->probed ?
-							(stm32l4_info->dual_bank_mode ? " dual-bank" : " single-bank") : "");
-					return ERROR_OK;
-				}
+				break;
 			}
 		}
 
-		snprintf(buf, buf_size, "%s - Rev: unknown (0x%04x)%s",
-			part_info->device_str, rev_id, stm32l4_info->probed ?
-				(stm32l4_info->dual_bank_mode ? " dual-bank" : " single-bank") : "");
+		int buf_len = snprintf(buf, buf_size, "%s - Rev %s : 0x%04x",
+				part_info->device_str, rev_str ? rev_str : "'unknown'", rev_id);
+
+		if (stm32l4_info->probed)
+			snprintf(buf + buf_len, buf_size - buf_len, " - %s-bank",
+					stm32l4_info->dual_bank_mode ? "Flash dual" : "Flash single");
+
 		return ERROR_OK;
 	} else {
 		snprintf(buf, buf_size, "Cannot identify target as an %s device", device_families);

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/stm32l4x.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository