flash/nor: Factor out CFI memory read/write functions

[fw/openocd] / src / flash / nor / tms470.c

diff --git a/src/flash/nor/tms470.c b/src/flash/nor/tms470.c
index 62fe2f54b88a9b0c192d1dd39a2dd3fe97979edc..90557b8f166473c2d7ff294f72ebe5679d6f0eee 100644 (file)
--- a/src/flash/nor/tms470.c
+++ b/src/flash/nor/tms470.c
@@ -301,7 +301,7 @@ COMMAND_HANDLER(tms470_handle_flash_keyset_command)
                        int start = (0 == strncmp(CMD_ARGV[i], "0x", 2)) ? 2 : 0;
 
                        if (1 != sscanf(&CMD_ARGV[i][start], "%" SCNx32 "", &flashKeys[i])) {
-                               command_print(CMD_CTX, "could not process flash key %s",
+                               command_print(CMD, "could not process flash key %s",
                                        CMD_ARGV[i]);
                                LOG_ERROR("could not process flash key %s", CMD_ARGV[i]);
                                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -310,19 +310,19 @@ COMMAND_HANDLER(tms470_handle_flash_keyset_command)
 
                keysSet = 1;
        } else if (CMD_ARGC != 0) {
-               command_print(CMD_CTX, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
+               command_print(CMD, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        if (keysSet) {
-               command_print(CMD_CTX,
+               command_print(CMD,
                        "using flash keys 0x%08" PRIx32 ", 0x%08" PRIx32 ", 0x%08" PRIx32 ", 0x%08" PRIx32 "",
                        flashKeys[0],
                        flashKeys[1],
                        flashKeys[2],
                        flashKeys[3]);
        } else
-               command_print(CMD_CTX, "flash keys not set");
+               command_print(CMD, "flash keys not set");
 
        return ERROR_OK;
 }
@@ -352,12 +352,12 @@ COMMAND_HANDLER(tms470_handle_osc_megahertz_command)
 
        if (oscMHz <= 0) {
                LOG_ERROR("osc_megahertz must be positive and non-zero!");
-               command_print(CMD_CTX, "osc_megahertz must be positive and non-zero!");
+               command_print(CMD, "osc_megahertz must be positive and non-zero!");
                oscMHz = 12;
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       command_print(CMD_CTX, "osc_megahertz=%d", oscMHz);
+       command_print(CMD, "osc_megahertz=%d", oscMHz);
 
        return ERROR_OK;
 }
@@ -375,7 +375,7 @@ COMMAND_HANDLER(tms470_handle_plldis_command)
                plldis = plldis ? 1 : 0;
        }
 
-       command_print(CMD_CTX, "plldis=%d", plldis);
+       command_print(CMD, "plldis=%d", plldis);
 
        return ERROR_OK;
 }
@@ -1162,7 +1162,7 @@ FLASH_BANK_COMMAND_HANDLER(tms470_flash_bank_command)
        return ERROR_OK;
 }
 
-struct flash_driver tms470_flash = {
+const struct flash_driver tms470_flash = {
        .name = "tms470",
        .commands = tms470_command_handlers,
        .flash_bank_command = tms470_flash_bank_command,