[Openocd-development] openocd patch: 1533d9d cfi: unsupported code paths are now covered by asserts

[gerrit]

This is an automated email from Gerrit.

?yvind Harboe (oyvindhar...@gmail.com) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/133

-- gerrit

commit 1533d9d1fbb0c09e1fcc8d42a02402adaa4011ad
Author: Øyvind Harboe <oyvind.har...@zylin.com>
Date:   Fri Oct 28 17:22:32 2011 +0200

    cfi: unsupported code paths are now covered by asserts
    
    Change-Id: If7d7aca8514575d229ed0b17378bf8b1bbf347c4
    Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index f75efac..cd5b31f 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -1912,11 +1912,9 @@ static int cfi_spansion_write_block(struct flash_bank 
*bank, uint8_t *buffer,
        switch (bank->bus_width)
        {
        case 1 :
-               if(armv4_5_info.common_magic == ARM_COMMON_MAGIC) /* armv4_5 
target */
-               {
-                       target_code_src = armv4_5_word_8_code;
-                       target_code_size = sizeof(armv4_5_word_8_code);
-               }
+               assert(armv4_5_info.common_magic == ARM_COMMON_MAGIC);
+               target_code_src = armv4_5_word_8_code;
+               target_code_size = sizeof(armv4_5_word_8_code);
                break;
        case 2 :
                /* Check for DQ5 support */
@@ -1931,24 +1929,20 @@ static int cfi_spansion_write_block(struct flash_bank 
*bank, uint8_t *buffer,
                        {
                                target_code_src = armv7m_word_16_code;
                                target_code_size = sizeof(armv7m_word_16_code);
-                       }
+                       } else assert(false);
                }
                else
                {
                        /* No DQ5 support. Use DQ7 DATA# polling only. */
-                       if(armv4_5_info.common_magic == ARM_COMMON_MAGIC) // 
armv4_5 target
-                       {
-                               target_code_src = armv4_5_word_16_code_dq7only;
-                               target_code_size = 
sizeof(armv4_5_word_16_code_dq7only);
-                       }
+                       assert(armv4_5_info.common_magic == ARM_COMMON_MAGIC);
+                       target_code_src = armv4_5_word_16_code_dq7only;
+                       target_code_size = sizeof(armv4_5_word_16_code_dq7only);
                }
                break;
        case 4 :
-               if(armv4_5_info.common_magic == ARM_COMMON_MAGIC) // armv4_5 
target
-               {
-                       target_code_src = armv4_5_word_32_code;
-                       target_code_size = sizeof(armv4_5_word_32_code);
-               }
+               assert(armv4_5_info.common_magic == ARM_COMMON_MAGIC);
+               target_code_src = armv4_5_word_32_code;
+               target_code_size = sizeof(armv4_5_word_32_code);
                break;
        default:
                LOG_ERROR("Unsupported bank buswidth %d, can't do block memory 
writes", bank->bus_width);

-- 
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development