openocd: src: fix incorrect SPDX tags

[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 225dc6f0752366652651e6f671aff5511198524b..fe207286547fc21c731352584a9dd7ab6197b1df 100644 (file)
--- a/src/flash/nor/kinetis_ke.c
+++ b/src/flash/nor/kinetis_ke.c
@@ -147,16 +147,23 @@ struct kinetis_ke_flash_bank {
 
 static int kinetis_ke_mdm_write_register(struct adiv5_dap *dap, unsigned reg, uint32_t value)
 {
-       int retval;
        LOG_DEBUG("MDM_REG[0x%02x] <- %08" PRIX32, reg, value);
 
-       retval = dap_queue_ap_write(dap_ap(dap, 1), reg, value);
+       struct adiv5_ap *ap = dap_get_ap(dap, 1);
+       if (!ap) {
+               LOG_DEBUG("MDM: failed to get AP");
+               return ERROR_FAIL;
+       }
+
+       int retval = dap_queue_ap_write(ap, reg, value);
        if (retval != ERROR_OK) {
                LOG_DEBUG("MDM: failed to queue a write request");
+               dap_put_ap(ap);
                return retval;
        }
 
        retval = dap_run(dap);
+       dap_put_ap(ap);
        if (retval != ERROR_OK) {
                LOG_DEBUG("MDM: dap_run failed");
                return retval;
@@ -167,14 +174,21 @@ static int kinetis_ke_mdm_write_register(struct adiv5_dap *dap, unsigned reg, ui
 
 static int kinetis_ke_mdm_read_register(struct adiv5_dap *dap, unsigned reg, uint32_t *result)
 {
-       int retval;
-       retval = dap_queue_ap_read(dap_ap(dap, 1), reg, result);
+       struct adiv5_ap *ap = dap_get_ap(dap, 1);
+       if (!ap) {
+               LOG_DEBUG("MDM: failed to get AP");
+               return ERROR_FAIL;
+       }
+
+       int retval = dap_queue_ap_read(ap, reg, result);
        if (retval != ERROR_OK) {
                LOG_DEBUG("MDM: failed to queue a read request");
+               dap_put_ap(ap);
                return retval;
        }
 
        retval = dap_run(dap);
+       dap_put_ap(ap);
        if (retval != ERROR_OK) {
                LOG_DEBUG("MDM: dap_run failed");
                return retval;
@@ -933,39 +947,6 @@ static int kinetis_ke_ftmrx_command(struct flash_bank *bank, uint8_t count,
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(kinetis_ke_securing_test)
-{
-       int result;
-       struct target *target = get_current_target(CMD_CTX);
-       struct flash_bank *bank = NULL;
-       uint32_t address;
-
-       uint8_t FCCOBIX[2], FCCOBHI[2], FCCOBLO[2], fstat;
-
-       result = get_flash_bank_by_addr(target, 0x00000000, true, &bank);
-       if (result != ERROR_OK)
-               return result;
-
-       assert(bank);
-
-       if (target->state != TARGET_HALTED) {
-               LOG_ERROR("Target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
-       address = bank->base + 0x00000400;
-
-       FCCOBIX[0] = 0;
-       FCCOBHI[0] = FTMRX_CMD_ERASESECTOR;
-       FCCOBLO[0] = address >> 16;
-
-       FCCOBIX[1] = 1;
-       FCCOBHI[1] = address >> 8;
-       FCCOBLO[1] = address;
-
-       return kinetis_ke_ftmrx_command(bank, 2, FCCOBIX, FCCOBHI, FCCOBLO, &fstat);
-}
-
 static int kinetis_ke_erase(struct flash_bank *bank, unsigned int first,
                unsigned int last)
 {
@@ -1252,13 +1233,6 @@ static const struct command_registration kinetis_ke_security_command_handlers[]
                .usage = "",
                .handler = kinetis_ke_mdm_mass_erase,
        },
-       {
-               .name = "test_securing",
-               .mode = COMMAND_EXEC,
-               .help = "",
-               .usage = "",
-               .handler = kinetis_ke_securing_test,
-       },
        COMMAND_REGISTRATION_DONE
 };