armv7m.h: relax dependency from 'arm_adi_v5.h'

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

diff --git a/src/flash/nor/kinetis_ke.c b/src/flash/nor/kinetis_ke.c
index 5aba7fc644c12db519ceef420aa7b8a16b563bd8..dc3b37ecb1c9f9de96b6606ca02039b3a4e10877 100644 (file)
--- a/src/flash/nor/kinetis_ke.c
+++ b/src/flash/nor/kinetis_ke.c
@@ -41,6 +41,7 @@
 #include "imp.h"
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
+#include <target/arm_adi_v5.h>
 #include <target/armv7m.h>
 #include <target/cortex_m.h>
 
@@ -945,7 +946,7 @@ COMMAND_HANDLER(kinetis_ke_securing_test)
        if (result != ERROR_OK)
                return result;
 
-       assert(bank != NULL);
+       assert(bank);
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
@@ -1000,8 +1001,6 @@ static int kinetis_ke_erase(struct flash_bank *bank, unsigned int first,
                        return ERROR_FLASH_OPERATION_FAILED;
                }
 
-               bank->sectors[i].is_erased = 1;
-
                if (i == 2)
                        fcf_erased = true;
        }
@@ -1046,7 +1045,7 @@ static int kinetis_ke_write(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t old_count = count;
                count = (old_count | 3) + 1;
                new_buffer = malloc(count);
-               if (new_buffer == NULL) {
+               if (!new_buffer) {
                        LOG_ERROR("odd number of bytes to write and no memory "
                                "for padding buffer");
                        return ERROR_FAIL;
@@ -1171,10 +1170,9 @@ static int kinetis_ke_auto_probe(struct flash_bank *bank)
        return kinetis_ke_probe(bank);
 }
 
-static int kinetis_ke_info(struct flash_bank *bank, char *buf, int buf_size)
+static int kinetis_ke_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
-       (void) snprintf(buf, buf_size,
-                       "%s driver for flash bank %s at " TARGET_ADDR_FMT,
+       command_print_sameline(cmd, "%s driver for flash bank %s at " TARGET_ADDR_FMT,
                        bank->driver->name,     bank->name, bank->base);
 
        return ERROR_OK;