flash: reduce code duplication in stm32 flash probe

[openocd.git] / src / flash / nor / stm32lx.c

diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index fedab300619638bcb80fb19064bf2ee5795ac0a0..ab61538ffe2267321a4385f1469720b2d4ecf0b0 100644 (file)
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -463,6 +463,7 @@ static int stm32lx_probe(struct flash_bank *bank)
        struct stm32lx_flash_bank *stm32lx_info = bank->driver_priv;
        int i;
        uint16_t flash_size_in_kb;
+       uint16_t max_flash_size_in_kb;
        uint32_t device_id;
 
        stm32lx_info->probed = 0;
@@ -474,36 +475,28 @@ static int stm32lx_probe(struct flash_bank *bank)
 
        LOG_DEBUG("device id = 0x%08" PRIx32 "", device_id);
 
-       /* get flash size from target. */
-       retval = target_read_u16(target, F_SIZE, &flash_size_in_kb);
-       if (retval != ERROR_OK) {
-               LOG_WARNING("failed reading flash size, default to max target family");
-               /* failed reading flash size, default to max target family */
-               flash_size_in_kb = 0xffff;
+       /* set max flash size depending on family */
+       switch (device_id & 0xfff) {
+       case 0x416:
+               max_flash_size_in_kb = 128;
+               break;
+       case 0x436:
+               max_flash_size_in_kb = 384;
+               break;
+       default:
+               LOG_WARNING("Cannot identify target as a STM32L family.");
+               return ERROR_FAIL;
        }
 
-       /* some variants read 0 for flash size register
-        * use a max flash size as a default */
-       if (flash_size_in_kb == 0)
-               flash_size_in_kb = 0xffff;
+       /* get flash size from target. */
+       retval = target_read_u16(target, F_SIZE, &flash_size_in_kb);
 
-       if ((device_id & 0xfff) == 0x416) {
-               /* check for early silicon */
-               if (flash_size_in_kb == 0xffff) {
-                       /* number of sectors may be incorrect on early silicon */
-                       LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
-                       flash_size_in_kb = 128;
-               }
-       } else if ((device_id & 0xfff) == 0x436) {
-               /* check for early silicon */
-               if (flash_size_in_kb == 0xffff) {
-                       /* number of sectors may be incorrect on early silicon */
-                       LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 384k flash");
-                       flash_size_in_kb = 384;
-               }
-       } else {
-               LOG_WARNING("Cannot identify target as a STM32L family.");
-               return ERROR_FAIL;
+       /* failed reading flash size or flash size invalid (early silicon),
+        * default to max target family */
+       if (retval != ERROR_OK || flash_size_in_kb == 0xffff || flash_size_in_kb == 0) {
+               LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming %dk flash",
+                       max_flash_size_in_kb);
+               flash_size_in_kb = max_flash_size_in_kb;
        }
 
        /* STM32L - we have 32 sectors, 16 pages per sector -> 512 pages