This is an automated email from Gerrit.

Tarek BOCHKATI (tarek.bouchk...@gmail.com) just uploaded a new patch set to 
Gerrit, which you can find at http://openocd.zylin.com/5536

-- gerrit

commit 51984cd8b071a412ae621418cc5414b632d21995
Author: Tarek BOCHKATI <tarek.bouchk...@gmail.com>
Date:   Sun Mar 22 19:36:12 2020 +0100

    stm32l4x: cosmetic simplification of get_stm32l4_info
    
    Change-Id: I2542f946f64388d908b1502f869643080fce9f9e
    Signed-off-by: Tarek BOCHKATI <tarek.bouchk...@gmail.com>

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 917f466..c964382 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -1190,19 +1190,19 @@ 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") : "");
+               snprintf(buf, buf_size, "%s - Rev %s : 0x%04x",
+                               part_info->device_str, rev_str ? rev_str : 
"'unknown'", rev_id);
+
+               if (stm32l4_info->probed) {
+                       int buf_len = strlen(buf);
+                       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);

-- 


_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to