Introduce ARCv2 architecture related code

[openocd.git] / src / target / stm8.c

diff --git a/src/target/stm8.c b/src/target/stm8.c
index 9a57e44908404ed6eeac192f0437bc09cef1bc5f..6b03bb5a4ecd187cf19bc8b3273bd4b25a3ee3ce 100644 (file)
--- a/src/target/stm8.c
+++ b/src/target/stm8.c
@@ -1,20 +1,20 @@
 /*
-    OpenOCD STM8 target driver
-    Copyright (C) 2017  Ake Rehnman
-    ake.rehnman(at)gmail.com
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*   OpenOCD STM8 target driver
+*   Copyright (C) 2017  Ake Rehnman
+*   ake.rehnman(at)gmail.com
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -25,6 +25,7 @@
 #include "target.h"
 #include "target_type.h"
 #include "hello.h"
+#include "jtag/interface.h"
 #include "jtag/jtag.h"
 #include "jtag/hla/hla_transport.h"
 #include "jtag/hla/hla_interface.h"
@@ -355,7 +356,7 @@ static int stm8_set_hwbreak(struct target *target,
 
        if ((comparator_list[0].type != HWBRK_EXEC)
                        && (comparator_list[1].type != HWBRK_EXEC)) {
-               if ((comparator_list[0].type != comparator_list[1].type)) {
+               if (comparator_list[0].type != comparator_list[1].type) {
                        LOG_ERROR("data hw breakpoints must be of same type");
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
                }
@@ -930,9 +931,7 @@ static int stm8_reset_assert(struct target *target)
        enum reset_types jtag_reset_config = jtag_get_reset_config();
 
        if (jtag_reset_config & RESET_HAS_SRST) {
-               jtag_add_reset(0, 1);
-               res = adapter->layout->api->assert_srst(adapter->handle, 0);
-
+               res = adapter_assert_reset();
                if (res == ERROR_OK)
                        /* hardware srst supported */
                        use_srst_fallback = false;
@@ -966,21 +965,14 @@ static int stm8_reset_assert(struct target *target)
 static int stm8_reset_deassert(struct target *target)
 {
        int res;
-       struct hl_interface_s *adapter = target_to_adapter(target);
-
        enum reset_types jtag_reset_config = jtag_get_reset_config();
 
        if (jtag_reset_config & RESET_HAS_SRST) {
-               res = adapter->layout->api->assert_srst(adapter->handle, 1);
+               res = adapter_deassert_reset();
                if ((res != ERROR_OK) && (res != ERROR_COMMAND_NOTFOUND))
                        return res;
        }
 
-       /* virtual deassert reset, we need it for the internal
-        * jtag state machine
-        */
-       jtag_add_reset(0, 0);
-
        /* The cpu should now be stalled. If halt was requested
           let poll detect the stall */
        if (target->reset_halt)
@@ -1805,6 +1797,7 @@ static int stm8_blank_check_memory(struct target *target,
        destroy_mem_param(&mem_params[0]);
        destroy_mem_param(&mem_params[1]);
        destroy_reg_param(&reg_params[0]);
+       destroy_reg_param(&reg_params[1]);
 
        target_free_working_area(target, erase_check_algorithm);
 
@@ -1889,6 +1882,8 @@ static int stm8_run_algorithm(struct target *target, int num_mem_params,
        }
 
        for (int i = 0; i < num_mem_params; i++) {
+               if (mem_params[i].direction == PARAM_IN)
+                       continue;
                retval = target_write_buffer(target, mem_params[i].address,
                                mem_params[i].size, mem_params[i].value);
                if (retval != ERROR_OK)
@@ -1896,6 +1891,9 @@ static int stm8_run_algorithm(struct target *target, int num_mem_params,
        }
 
        for (int i = 0; i < num_reg_params; i++) {
+               if (reg_params[i].direction == PARAM_IN)
+                       continue;
+
                struct reg *reg = register_get_by_name(stm8->core_cache,
                                reg_params[i].reg_name, 0);
 
@@ -2141,7 +2139,7 @@ COMMAND_HANDLER(stm8_handle_enable_step_irq_command)
                stm8->enable_step_irq = enable;
        }
        msg = stm8->enable_step_irq ? "enabled" : "disabled";
-       command_print(CMD_CTX, "enable_step_irq = %s", msg);
+       command_print(CMD, "enable_step_irq = %s", msg);
        return ERROR_OK;
 }
 
@@ -2157,7 +2155,7 @@ COMMAND_HANDLER(stm8_handle_enable_stm8l_command)
                stm8->enable_stm8l = enable;
        }
        msg = stm8->enable_stm8l ? "enabled" : "disabled";
-       command_print(CMD_CTX, "enable_stm8l = %s", msg);
+       command_print(CMD, "enable_stm8l = %s", msg);
        stm8_init_flash_regs(stm8->enable_stm8l, stm8);
        return ERROR_OK;
 }